From 906b2b36eead995bdd9573340e9d6c892d86da82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 4 Jun 2025 10:59:19 -0400 Subject: [PATCH] radeonsi: don't refer to removed GTF CTS tests Reviewed-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv | 4 ---- src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-flakes.csv | 5 ----- src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv | 6 ------ src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv | 2 -- src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-flakes.csv | 2 -- src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv | 3 --- src/gallium/drivers/radeonsi/ci/gfx6-tahiti-flakes.csv | 3 --- src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv | 4 ---- src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv | 4 ---- src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv | 4 ---- src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv | 4 ---- src/gallium/drivers/radeonsi/si_barrier.c | 1 - 12 files changed, 42 deletions(-) diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index 1c4f1a231be..10639fd775c 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -26,10 +26,6 @@ spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp@sRGB decode full precision,Fail -# These are GLCTS bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361 -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_accessing_info_for_block_with_an_instance_array,Fail -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_getactiveuniformblockiv,Fail - # escts failures KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreCS,Fail KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreVS,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-flakes.csv index eb3f15680eb..5d0c0c50210 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-flakes.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-flakes.csv @@ -10,11 +10,6 @@ spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked # Random: ../src/util/hash_table.c:311: hash_table_search: Assertion `!key_pointer_is_reserved(ht, key)' failed. spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount-multithread -# Random -# Mostly reported by "Some new flakes found:" and most of them never appear in the failures -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_clamping -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_draw - dEQP-GLES3.functional.occlusion_query.all_occluders dEQP-GLES3.functional.occlusion_query.conservative_all_occluders dEQP-GLES3.functional.occlusion_query.conservative_depth_clear diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv index 078a9b08946..88a5b96dcde 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv @@ -27,12 +27,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful # This is caused by lowering mediump before linking: spec@glsl-es-1.00@linker@glsl-mismatched-uniform-precision-unused,Fail -# glcts failures -# glGetUniform returns mediump uniforms rounded to FP16 precision because we only store them as FP16. -# The test could be changed to allow this behavior because there is no point in storing FP32 values -# in the driver only for glGetUniform. -GTF-GL46.gtf21.GL2Tests.glGetUniform.glGetUniform,Fail - KHR-GL46.shaders.uniform_block.random.nested_structs_instance_arrays.0,Fail ## Fail because GFX10+ removed MS texture support (see si_get_sparse_texture_virtual_page_size) KHR-GL46.sparse_texture2_tests.SparseTexture2Allocation_texture_2d_multisample_array_r11f_g11f_b10f,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv index c42869410ca..c4d87ec2285 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-flakes.csv @@ -19,8 +19,6 @@ spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag # Random # Mostly reported by "Some new flakes found:" and most of them never appear in the failures -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_clamping -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_draw KHR-GL46.geometry_shader.primitive_counter.triangles_to_line_strip_rp KHR-GLES31.core.geometry_shader.primitive_counter.lines_to_line_strip diff --git a/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-flakes.csv index d8e727b5072..21a339ff3da 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-flakes.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-flakes.csv @@ -18,8 +18,6 @@ spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag # Random # Mostly reported by "Some new flakes found:" and most of them never appear in the failures -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_clamping -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_draw KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip KHR-GL46.geometry_shader.primitive_counter.lines_to_line_strip_rp KHR-GL46.geometry_shader.primitive_counter.points_to_line_strip diff --git a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv index 47d73d97d48..a5bb1d57416 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv @@ -143,9 +143,6 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail -GTF-GL46.gtf32.GL3Tests.packed_pixels.packed_pixels,Fail -GTF-GL46.gtf32.GL3Tests.packed_pixels.packed_pixels_pbo,Fail -GTF-GL46.gtf32.GL3Tests.packed_pixels.packed_pixels_pixelstore,Fail KHR-GL46.direct_state_access.framebuffers_texture_layer_attachment,Fail KHR-GL46.ext_texture_shadow_lod.texturelod.samplercubeshadow_fragment,Fail KHR-GL46.ext_texture_shadow_lod.texture.samplercubearrayshadow_bias_fragment,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-flakes.csv b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-flakes.csv index f76c5492ef7..5c8f9befc38 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-flakes.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-flakes.csv @@ -15,9 +15,6 @@ spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag # Random # Mostly reported by "Some new flakes found:" and most of them never appear in the failures -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_clamping -GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_draw - KHR-GL46.ext_texture_shadow_lod.texture.samplercubearrayshadow_fragment KHR-GL46.ext_texture_shadow_lod.texturelod.samplercubearrayshadow_fragment KHR-GL46.ext_texture_shadow_lod.texturelod.samplercubeshadow_vertex diff --git a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv index 0780b883881..7746b0000e1 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv @@ -155,10 +155,6 @@ KHR-GL46.shader_image_load_store.advanced-sso-subroutine,Fail KHR-GL46.shader_image_load_store.basic-allTargets-atomic,Fail KHR-GL46.texture_cube_map_array.sampling,Fail -# These are GLCTS bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361 -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_accessing_info_for_block_with_an_instance_array,Fail -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_getactiveuniformblockiv,Fail - # escts failures KHR-GLES31.core.geometry_shader.layered_rendering_fbo_no_attachment.layered_rendering_fbo_no_attachment,Fail KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreCS,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index ef37f4b6124..4c6c49561ad 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -138,9 +138,5 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail -# These are GLCTS bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361 -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_accessing_info_for_block_with_an_instance_array,Fail -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_getactiveuniformblockiv,Fail - # escts failures KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreCS,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 2e3baea2697..39bbb0a08fd 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -50,7 +50,3 @@ KHR-GL46.geometry_shader.rendering.rendering.triangles_with_adjacency_input_tria KHR-GL46.shader_ballot_tests.ShaderBallotFunctionRead,Fail KHR-GL46.shader_ballot_tests.ShaderBallotBitmasks,Fail KHR-GL46.sparse_buffer_tests.BufferStorageTest,Fail - -# These are GLCTS bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361 -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_accessing_info_for_block_with_an_instance_array,Fail -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_getactiveuniformblockiv,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index 3beffc6461f..71d9fe4cc50 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -59,10 +59,6 @@ KHR-GL46.shader_image_load_store.basic-allTargets-atomic,Fail # AMD_DEBUG=nodcc fixes this KHR-GL46.texture_view.view_classes,Fail -# These are GLCTS bugs. See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10361 -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_accessing_info_for_block_with_an_instance_array,Fail -GTF-GL46.gtf31.GL3Tests.uniform_buffer_object.uniform_buffer_object_getactiveuniformblockiv,Fail - # escts failures KHR-GLES31.core.geometry_shader.rendering.rendering.triangles_with_adjacency_input_line_strip_output_triangle_strip_adjacency_drawcall,Fail KHR-GLES31.core.geometry_shader.rendering.rendering.triangles_with_adjacency_input_triangle_strip_output_triangle_strip_adjacency_drawcall,Fail diff --git a/src/gallium/drivers/radeonsi/si_barrier.c b/src/gallium/drivers/radeonsi/si_barrier.c index 3375bc9c3b8..6a24e08ab5e 100644 --- a/src/gallium/drivers/radeonsi/si_barrier.c +++ b/src/gallium/drivers/radeonsi/si_barrier.c @@ -799,7 +799,6 @@ void si_fb_barrier_after_rendering(struct si_context *sctx, unsigned flags) /* TODO: some failures related to hyperz appeared after 969ed851 on nv33: * - piglit tex-miplevel-selection * - KHR-GL46.direct_state_access.framebuffers_texture_attachment - * - GTF-GL46.gtf30.GL3Tests.blend_minmax.blend_minmax_draw * - KHR-GL46.direct_state_access.framebuffers_texture_layer_attachment * * This seems to fix them: