ci/tu: Generalize the subgroupclustered pre-merge skips.

This should clean up the CI flake reporting and reduce pre-merge times.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36560>
This commit is contained in:
Emma Anholt 2025-08-04 10:00:23 -07:00 committed by Marge Bot
parent 5d987de708
commit 10db448b95
5 changed files with 10 additions and 21 deletions

View file

@ -374,6 +374,3 @@ angle-dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.rg8_sno
angle-dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.rg8i_r16ui.texture2d_to_cubemap
angle-dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.rg8ui_r16i.texture2d_to_cubemap
angle-dEQP-GLES31.functional.state_query.program.tesselation_shader_state_get_programiv
# Intermittent timeouts. 94% CPU used in ir3 create_variant, but no single pass there dominating its time.
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmul_u64vec4_requiredsubgroupsize

View file

@ -55,3 +55,8 @@ spec@glsl-4.00@execution@built-in-functions@fs-refract-dvec4-dvec4-double
spec@glsl-4.10@execution@conversion@frag-conversion-implicit-mat3x4-dmat3x4-zero-sign
spec@glsl-4.20@execution@conversion@frag-conversion-implicit-mat3x4-dmat3x4-zero-sign
spec@glsl-4.20@execution@conversion@frag-conversion-implicit-mat4-dmat4-zero-sign
# Slow tests that may hit 60s timeout pre-merge, but pass otherwise. 94% CPU
# used in ir3 create_variant, but no single pass there dominating its time.
# Just use the scalar/vec2 cases, which are fast enough for CI.
dEQP-VK.subgroups.clustered.compute.subgroupclustered(min|max|mul)_[iu]64vec[34].*

View file

@ -47,15 +47,6 @@ dEQP-VK.synchronization.*_tess_ctrl.*
dEQP-VK.synchronization.*_tess_eval.*
dEQP-VK.tessellation.invariance.*
# Intermittent timeouts. 94% CPU used in ir3 create_variant, but no single pass there dominating its time.
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmax_i64vec4_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmin_u64vec4_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmul_i64vec4_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmul_u64vec3_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmul_u64vec4_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmax_i64vec3
dEQP-VK.subgroups.clustered.graphics.subgroupclusteredmul_u64vec4
# Updated by ci-collate
bypass-dEQP-VK.renderpass2.fragment_density_map.2_views.render.non_divisible_density_size.2_samples.static_subsampled_2_2_multiviewport
dEQP-VK.renderpass2.fragment_density_map.2_views.render.divisible_density_size.2_samples.static_subsampled_1_2_multiviewport

View file

@ -13,10 +13,3 @@ dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_geom
dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_tessc
dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_tesse
dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_vert
# 60s timeout (flake)
dEQP-VK.subgroups.clustered.graphics.subgroupclusteredmul_i64vec4
# timing out in a flaky manner
# seen first time on this job https://gitlab.freedesktop.org/mesa/mesa/-/jobs/76191050
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmax_u64vec4_requiredsubgroupsize

View file

@ -7,6 +7,9 @@ dEQP-VK.memory.mapping.*.full.variable.implicit_unmap*
dEQP-VK.spirv_assembly.instruction.graphics.16bit_storage.struct_mixed_types.uniform_buffer_block_vert
dEQP-VK.spirv_assembly.instruction.*.spirv_ids_abuse.lots_ids*
dEQP-VK.subgroups.arithmetic.compute.subgroupmul_i64vec4_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmax_u64vec4
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmin_u64vec2_requiredsubgroupsize
dEQP-VK.subgroups.clustered.compute.subgroupclusteredmin_uint64_t_requiredsubgroupsize
# Slow tests that may hit 60s timeout pre-merge, but pass otherwise. 94% CPU
# used in ir3 create_variant, but no single pass there dominating its time.
# Just use the scalar cases, which are fast enough for CI.
dEQP-VK.subgroups.clustered.compute.subgroupclustered(min|max|mul)_[iu]64vec[234].*