From 4b8735cd4e2fd5fca820f91d767befaa7cf39fad Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 1 Apr 2024 16:19:37 +0100 Subject: [PATCH] ci: raise the log level threshold of spirv logs Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output: ERROR - dEQP error: SPIR-V WARNING: ERROR - dEQP error: In file ../src/compiler/spirv/spirv_to_nir.c:4779 ERROR - dEQP error: Unsupported SPIR-V capability: SpvCapabilityDrawParameters (4427) ERROR - dEQP error: 28 bytes into the SPIR-V binary Part-of: --- .gitlab-ci.yml | 2 ++ src/microsoft/ci/spirv2dxil_reference.txt | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0f628b97c5..16e401a19f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,6 +89,8 @@ variables: PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install" # Drop once deqp-runner is upgraded to > 0.18.0 MESA_VK_ABORT_ON_DEVICE_LOSS: 1 + # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output + MESA_SPIRV_LOG_LEVEL: error default: before_script: diff --git a/src/microsoft/ci/spirv2dxil_reference.txt b/src/microsoft/ci/spirv2dxil_reference.txt index 5dbaf654f4d..7cf02011031 100644 --- a/src/microsoft/ci/spirv2dxil_reference.txt +++ b/src/microsoft/ci/spirv2dxil_reference.txt @@ -931,10 +931,6 @@ Test:SpvParserTest_IEqual_SpvBinaryLogicalTest_EmitExpression_5.spvasm:main|Frag Test:SpvParserTest_Impl_GenericVulkanShader_GLSL450MemoryModel.spvasm:main|GLCompute: Pass Test:SpvParserTest_Impl_GenericVulkanShader_SimpleMemoryModel.spvasm:main|GLCompute: Pass Test:SpvParserTest_Impl_GenericVulkanShader_VulkanMemoryModel.spvasm:main|GLCompute: Fail -SPIR-V WARNING: - - Unsupported SPIR-V capability: SpvCapabilityVulkanMemoryModel (5345) - 28 bytes into the SPIR-V binary SPIR-V parsing FAILED: Vulkan memory model is unsupported by this driver