From 82e342888f3891a867b4fd51d35ff4ffffe98bad Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 3 Oct 2023 10:17:08 +0100 Subject: [PATCH] ci: skip dEQP-VK.api.driver_properties.conformance_version for everyone This test checks the driver's reported conformance version against the version of the CTS we're running. This check fails every few months and everyone has to go and bump the number in every driver. Running this check only makes sense while preparing a conformance submission, so skip it in the regular CI. Part-of: --- .gitlab-ci/all-skips.txt | 7 +++++++ src/amd/ci/radv-skips.txt | 3 --- src/freedreno/ci/freedreno-a618-fails.txt | 3 --- src/freedreno/ci/freedreno-a630-fails.txt | 3 --- src/freedreno/ci/freedreno-a660-fails.txt | 2 -- src/intel/ci/hasvk-hsw-fails.txt | 1 - src/microsoft/ci/warp-fails.txt | 2 -- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci/all-skips.txt b/.gitlab-ci/all-skips.txt index c2838179ed9..fcce7b3e581 100644 --- a/.gitlab-ci/all-skips.txt +++ b/.gitlab-ci/all-skips.txt @@ -2,6 +2,13 @@ # non-zero-length and not starting with '#', will regex match to # delete lines from the test list. Be careful. +# This test checks the driver's reported conformance version against the +# version of the CTS we're running. This check fails every few months +# and everyone has to go and bump the number in every driver. +# Running this check only makes sense while preparing a conformance +# submission, so skip it in the regular CI. +dEQP-VK.api.driver_properties.conformance_version + # These are tremendously slow (pushing toward a minute), and aren't # reliable to be run in parallel with other tests due to CPU-side timing. dEQP-GLES[0-9]*.functional.flush_finish.* diff --git a/src/amd/ci/radv-skips.txt b/src/amd/ci/radv-skips.txt index 503c93b99ea..8e13417273e 100644 --- a/src/amd/ci/radv-skips.txt +++ b/src/amd/ci/radv-skips.txt @@ -17,9 +17,6 @@ dEQP-VK.memory.pipeline_barrier.host_read_host_write.65536 dEQP-VK.memory.pipeline_barrier.host_write_transfer_src.1048576 dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576 -# Exclude this test which fails on all GPUS except RDNA2+. -dEQP-VK.api.driver_properties.conformance_version - # Those cases take very long. dEQP-VK.ray_tracing_pipeline.build.*1048576.* dEQP-VK.ray_tracing_pipeline.build.*65536.* diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 00ac577cf97..e6700ca6dae 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -362,9 +362,6 @@ nobin-dEQP-VK.transform_feedback.simple.lines_or_triangles_triangle_strip_3,Fail spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-01,Crash spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-02,Crash -# Debian bookworm migration -dEQP-VK.api.driver_properties.conformance_version,Fail - # After switch from 6.3.1 to 6.3.13 dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail gmem-dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 266265cb916..c42157011d5 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -363,9 +363,6 @@ spec@arb_vertex_attrib_64bit@execution@unused-sub-dvec4-02,Crash dynamic-dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_32_32.samples_2.d32_sfloat_s8_uint_separate_layouts.compatibility_depth_zero_stencil_zero_testing_stencil,Fail -# since Debian 12 (bookworm) uprev -dEQP-VK.api.driver_properties.conformance_version,Fail - dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail gmem-dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt index 011245eb8ac..620f377d0c2 100644 --- a/src/freedreno/ci/freedreno-a660-fails.txt +++ b/src/freedreno/ci/freedreno-a660-fails.txt @@ -12,8 +12,6 @@ dEQP-GLES31.functional.synchronization.inter_invocation.image_atomic_read_write, # Fails when TU_DEBUG=forcebin is set gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail -dEQP-VK.api.driver_properties.conformance_version,Fail - dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail gmem-dEQP-VK.binding_model.descriptor_buffer.basic.limits,Fail diff --git a/src/intel/ci/hasvk-hsw-fails.txt b/src/intel/ci/hasvk-hsw-fails.txt index 1fa300d1591..06cbf16b414 100644 --- a/src/intel/ci/hasvk-hsw-fails.txt +++ b/src/intel/ci/hasvk-hsw-fails.txt @@ -1,4 +1,3 @@ -dEQP-VK.api.driver_properties.conformance_version,Fail dEQP-VK.api.info.image_format_properties.2d.optimal.a8b8g8r8_sint_pack32,Fail dEQP-VK.api.info.image_format_properties.2d.optimal.r16_sint,Fail dEQP-VK.api.info.image_format_properties.2d.optimal.r16g16_sint,Fail diff --git a/src/microsoft/ci/warp-fails.txt b/src/microsoft/ci/warp-fails.txt index 680ed6ff8d9..8f5f129d496 100644 --- a/src/microsoft/ci/warp-fails.txt +++ b/src/microsoft/ci/warp-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.driver_properties.conformance_version,Fail - # DXIL does not have a way to express these yet. Hopefully incoming with shader model 6.8 # See https://github.com/microsoft/hlsl-specs/issues/30 dEQP-VK.glsl.texture_functions.texture.sampler1darrayshadow_bias_fragment,Fail