From ed4606a062b8e10ce5ecf8934d27ae677c27561e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 25 Nov 2024 13:11:31 -0500 Subject: [PATCH] radeonsi/ci: remove --slow The tests were split or reduced in glcts. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- .../drivers/radeonsi/ci/radeonsi-run-tests.py | 14 -------------- src/gallium/drivers/radeonsi/ci/skips.csv | 3 +++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py index 264da4b52a5..cb3f1c3db29 100755 --- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py +++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py @@ -86,9 +86,6 @@ parser.add_argument( parser.add_argument( "--no-deqp", dest="deqp", help="Disable dEQP tests", action="store_false" ) -parser.add_argument( - "--slow", dest="slow", help="Include slowest glcts tests", action="store_true" -) parser.add_argument( "--no-deqp-egl", dest="deqp_egl", @@ -121,7 +118,6 @@ parser.set_defaults(deqp_egl=True) parser.set_defaults(deqp_gles2=True) parser.set_defaults(deqp_gles3=True) parser.set_defaults(deqp_gles31=True) -parser.set_defaults(slow=False) parser.add_argument( "output_folder", @@ -305,16 +301,6 @@ spin = itertools.cycle("-\\|/") shutil.copy(skips_list, output_folder) skips = os.path.join(output_folder, "skips.csv") -if not args.slow: - # Exclude these 4 tests slow tests - with open(skips, "a") as f: - print("KHR-GL46.copy_image.functional", file=f) - print("KHR-GL46.texture_swizzle.smoke", file=f) - print( - "KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize", - file=f, - ) - print("KHR-Single-GL46.arrays_of_arrays_gl.AtomicUsage", file=f) def gfx_level_to_str(cl): diff --git a/src/gallium/drivers/radeonsi/ci/skips.csv b/src/gallium/drivers/radeonsi/ci/skips.csv index e46be6fd7b6..db15187f364 100644 --- a/src/gallium/drivers/radeonsi/ci/skips.csv +++ b/src/gallium/drivers/radeonsi/ci/skips.csv @@ -18,6 +18,9 @@ ext_external_obj # These create a bright green window that covers the whole screen, which can be distracting. glx@glx_arb_sync_control@timing.*fullscreen +# This one takes forever +KHR-Single-GL46.arrays_of_arrays_gl.AtomicUsage + # This might hang in release builds. We should fail to compile instead of hanging. # gfx10_ngg_calculate_subgroup_info: Assertion `max_esverts >= max_verts_per_prim && max_gsprims >= 1' failed. gs-max-output