From 2e26e1e86f22fc6050917eb8a71404e4be5cc957 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 7 Aug 2025 14:24:48 +0200 Subject: [PATCH] zink+radv/ci: deduplicate zink-radv-*-skips.txt lists Part-of: --- .../zink/ci/zink-radv-cezanne-skips.txt | 28 ------------- .../zink/ci/zink-radv-gfx1201-skips.txt | 35 ---------------- .../zink/ci/zink-radv-navi10-skips.txt | 40 ------------------- .../zink/ci/zink-radv-navi31-skips.txt | 35 ---------------- .../zink/ci/zink-radv-polaris10-skips.txt | 38 ------------------ .../drivers/zink/ci/zink-radv-skips.txt | 37 +++++++++++++++++ .../zink/ci/zink-radv-vangogh-skips.txt | 36 ----------------- 7 files changed, 37 insertions(+), 212 deletions(-) create mode 100644 src/gallium/drivers/zink/ci/zink-radv-skips.txt diff --git a/src/gallium/drivers/zink/ci/zink-radv-cezanne-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-cezanne-skips.txt index 8217840602e..3d1bebd6a74 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-cezanne-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-cezanne-skips.txt @@ -1,28 +1,3 @@ -ext_texture_env.* -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -spec@egl_nok_texture_from_pixmap@basic - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - # implicit modifier selection not currently supported spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount @@ -47,6 +22,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_vyuy spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-tex-modifier - -# randomly hangs? -spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-gfx1201-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-gfx1201-skips.txt index a22b029a656..e69de29bb2d 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-gfx1201-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-gfx1201-skips.txt @@ -1,35 +0,0 @@ -ext_texture_env.* -spec@arb_shader_image_load_store.* -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -# Kopper regression -glx@glx-tfp - -spec@egl_nok_texture_from_pixmap@basic - - -# Exclude GLX tests. -glx@glx.* - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - -# This test seems to hang. -spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt index af0285abadb..fe979dbeb0a 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-skips.txt @@ -1,36 +1,3 @@ -ext_texture_env.* -spec@arb_shader_image_load_store.invalid -spec@arb_shader_image_load_store.max-size -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -# Kopper regression -glx@glx-tfp - -spec@egl_nok_texture_from_pixmap@basic - -# Exclude GLX tests. -glx@glx.* - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - # implicit modifier selection not currently supported spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer @@ -57,10 +24,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvyu spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 - -# This subset hangs since a077c14f150 ("zink: Fix resizable BAR detection logic") -# for very weird reasons, skip it completely until the issue is properly fixed. -spec@arb_shader_image_load_store.* - -# This test seems to hang. -spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi31-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-navi31-skips.txt index a22b029a656..e69de29bb2d 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi31-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi31-skips.txt @@ -1,35 +0,0 @@ -ext_texture_env.* -spec@arb_shader_image_load_store.* -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -# Kopper regression -glx@glx-tfp - -spec@egl_nok_texture_from_pixmap@basic - - -# Exclude GLX tests. -glx@glx.* - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - -# This test seems to hang. -spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-polaris10-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-polaris10-skips.txt index e69eb225112..0d83237c010 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-polaris10-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-polaris10-skips.txt @@ -1,34 +1,3 @@ -ext_texture_env.* -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -# Kopper regression -glx@glx-tfp - -spec@egl_nok_texture_from_pixmap@basic - -# Exclude GLX tests. -glx@glx.* - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - # implicit modifier selection not currently supported spec@ext_image_dma_buf_import@ext_image_dma_buf_import-ownership_transfer spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount @@ -41,10 +10,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-tex-modifier - -# This subset hangs since a077c14f150 ("zink: Fix resizable BAR detection logic") -# for very weird reasons, skip it completely until the issue is properly fixed. -spec@arb_shader_image_load_store.* - -# This test seems to hang. -spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-skips.txt new file mode 100644 index 00000000000..dc0d9ca6348 --- /dev/null +++ b/src/gallium/drivers/zink/ci/zink-radv-skips.txt @@ -0,0 +1,37 @@ +ext_texture_env.* +spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 +.*@execution@vs_in.* + +# Kopper regression +glx@glx-tfp + +# Exclude GLX tests. +glx@glx.* + +spec@egl_nok_texture_from_pixmap@basic + +# Tests below timeout most of the time. +KHR-GL46.copy_image.functional +KHR-GL46.texture_swizzle.smoke +KHR-GL46.texture_swizzle.functional +KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize + +#these need format conversions that gallium doesn't implement yet +spec@arb_texture_buffer_object@formats.*arb.* + +# These randomly hang. +spec@ext_external_objects@.* + +# These are too random. +spec@arb_shader_clock@execution@clock.* + +# These run OOM and migth hang? +spec@arb_texture_buffer_object@texture-buffer-size-clamp.* +spec@arb_uniform_buffer_object@maxuniformblocksize.* + +# This subset hangs since a077c14f150 ("zink: Fix resizable BAR detection logic") +# for very weird reasons, skip it completely until the issue is properly fixed. +spec@arb_shader_image_load_store.* + +# This test seems to hang. +spec@arb_fragment_program@fog-modes diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt index 0e52049f1fc..a5684ddca77 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-skips.txt @@ -1,36 +1,3 @@ -ext_texture_env.* -spec@arb_shader_image_load_store.* -spec@arb_gpu_shader_fp64@execution@glsl-fs-loop-unroll-mul-fp64 -.*@execution@vs_in.* - -# Kopper regression -glx@glx-tfp - -spec@egl_nok_texture_from_pixmap@basic - - -# Exclude GLX tests. -glx@glx.* - -# Tests below timeout most of the time. -KHR-GL46.copy_image.functional -KHR-GL46.texture_swizzle.smoke -KHR-GL46.texture_swizzle.functional -KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize - -#these need format conversions that gallium doesn't implement yet -spec@arb_texture_buffer_object@formats.*arb.* - -# These randomly hang. -spec@ext_external_objects@.* - -# These are too random. -spec@arb_shader_clock@execution@clock.* - -# These run OOM and migth hang? -spec@arb_texture_buffer_object@texture-buffer-size-clamp.* -spec@arb_uniform_buffer_object@maxuniformblocksize.* - # implicit modifier selection not currently supported spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010 @@ -57,6 +24,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvyu spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 - -# This test seems to hang. -spec@arb_fragment_program@fog-modes