From 58186df32c813c9bdfb54a3977efc046f67565f9 Mon Sep 17 00:00:00 2001 From: Charlie Turner Date: Mon, 10 Jan 2022 18:45:40 +0000 Subject: [PATCH] amd, ci: Drop log level in SPIRV -> NIR code generator. See 786fa3435c for the rationale of this variable, but the point is to avoid many error reports for conformance conformance issues within the VK-CTS shaders. Acked-by: Samuel Pitoiset Reviewed-by: Martin Roukala Part-of: --- .gitlab-ci/common/generate-env.sh | 1 + src/amd/ci/gitlab-ci.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 2a332d29375..dfbc84b2b15 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -79,6 +79,7 @@ for var in \ MESA_IMAGE_TAG \ MESA_TEMPLATES_COMMIT \ MESA_VK_IGNORE_CONFORMANCE_WARNING \ + MESA_SPIRV_LOG_LEVEL \ MINIO_HOST \ NIR_DEBUG \ PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \ diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 3441fc3dc15..3bc49a26d27 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -5,6 +5,12 @@ variables: VK_DRIVER: radeon DRIVER_NAME: radv + # The SPIRV -> NIR code generator generates so many harmless + # warnings on the shaders in VK-CTS that jobs fail due to the log + # size getting too big. Since it doesn't seem feasible right now + # to fix these shaders in the CTS, instead, ignore warnings from + # the code generator. + MESA_SPIRV_LOG_LEVEL: error ACO_DEBUG: validateir,validatera MESA_VK_IGNORE_CONFORMANCE_WARNING: 1