Module: Mesa Branch: main Commit: 546c40cd661c93d340063c89f2609bafdb7f7f61 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=546c40cd661c93d340063c89f2609bafdb7f7f61
Author: Emma Anholt <[email protected]> Date: Thu Sep 15 10:48:49 2022 -0700 ci/turnip: Move some 15-second-ish test skips to pre-merge skips. We run with a longer timeout for the full runs, so let's enable the coverage there. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18620> --- src/freedreno/ci/freedreno-a618-premerge-skips.txt | 18 ++++++++++++++++++ src/freedreno/ci/freedreno-a618-skips.txt | 20 -------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-premerge-skips.txt b/src/freedreno/ci/freedreno-a618-premerge-skips.txt index 8c8c1c7932c..82badfe0999 100644 --- a/src/freedreno/ci/freedreno-a618-premerge-skips.txt +++ b/src/freedreno/ci/freedreno-a618-premerge-skips.txt @@ -5,5 +5,23 @@ # Timeouts, passes otherwise KHR-GL33.texture_swizzle.smoke +# These generally take near 15 seconds. The time is spent inside dEQP. +dEQP-VK.tessellation.invariance.inner_triangle_set.quads_equal_spacing +dEQP-VK.tessellation.invariance.inner_triangle_set.triangles_fractional_even_spacing +dEQP-VK.tessellation.invariance.outer_edge_division.quads_equal_spacing +dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing +dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing +dEQP-VK.tessellation.invariance.outer_edge_symmetry.quads_fractional_even_spacing_cw +dEQP-VK.tessellation.invariance.outer_triangle_set.quads_equal_spacing +dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_even_spacing +dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing +dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_equal_spacing +dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_even_spacing +dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_odd_spacing + # Spends its time in nir_validate, timing out in CI sometimes. dEQP-VK.spirv_assembly.instruction.*.spirv_ids_abuse.lots_ids.* + +# Spending all its time in nir_compare_deref_paths() (approximately 15 seconds) +# https://gitlab.freedesktop.org/mesa/mesa/-/issues/5152 +dEQP-VK.ubo.random.all_shared_buffer.48 diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt index 01c299dd5c6..8df5a64416c 100644 --- a/src/freedreno/ci/freedreno-a618-skips.txt +++ b/src/freedreno/ci/freedreno-a618-skips.txt @@ -2,26 +2,6 @@ # non-zero-length and not starting with '#', will regex match to # delete lines from the test list. Be careful. -# Timeouts in CI even after 5 minutes -dEQP-VK.tessellation.invariance.inner_triangle_set.quads_equal_spacing -dEQP-VK.tessellation.invariance.inner_triangle_set.triangles_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_equal_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_equal_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_odd_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_equal_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_even_spacing -dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_odd_spacing - -# timeout in pre-merge CI -dEQP-VK.tessellation.invariance.outer_edge_symmetry.quads_fractional_even_spacing_cw - -# timeout, spending all its time in nir_compare_deref_paths() -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/5152 -dEQP-VK.ubo.random.all_shared_buffer.48 - # Still running after 3 hours, time is spent in batch_draw_tracking(). KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs
