ci/radeonsi: sort and dedup stoney skips

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22193>

diff --git a/src/amd/ci/radeonsi-stoney-skips.txt b/src/amd/ci/radeonsi-stoney-skips.txt
index abf0dde..cc948ad 100644 (file)
--- a/src/amd/ci/radeonsi-stoney-skips.txt
+++ b/src/amd/ci/radeonsi-stoney-skips.txt
@@ -1,7 +1,5 @@
 # From https://github.com/marekolsak/marek-build/blob/master/run-piglit.sh#L36
 spec@!opengl 1.0@gl-1.0-blend-func
-spec@!opengl 1.2@tex3d-maxsize
-spec@ext_framebuffer_object@fbo-maxsize
 spec@!opengl 1.1@max-texture-size
 spec@!opengl 1.1@max-texture-size-level
 spec@!opengl 1.2@tex3d-maxsize
@@ -11,64 +9,32 @@ spec@ext_framebuffer_object@fbo-maxsize
 # times out
 spec@arb_compute_shader@local-id-explosion
 
-spec@arb_uniform_buffer_object@maxuniformblocksize@vs
-spec@arb_uniform_buffer_object@maxuniformblocksize@vsexceed
-spec@arb_uniform_buffer_object@maxuniformblocksize@fs
-spec@arb_uniform_buffer_object@maxuniformblocksize@fsexceed
+# most of these just allocate way too much memory
+spec@arb_shader_image_load_store@max-size
 spec@arb_shader_storage_buffer_object@max-ssbo-size@fs
-spec@arb_shader_storage_buffer_object@max-ssbo-size@vsexceed
-spec@arb_shader_storage_buffer_object@max-ssbo-size@vs
 spec@arb_shader_storage_buffer_object@max-ssbo-size@fsexceed
-spec@arb_shader_image_load_store@max-size
-spec@ext_external_objects@semaphore-api-errors
-spec@ext_external_objects@vk-image-display-overwrite
-spec@ext_external_objects@memory-object-api-errors
-spec@ext_external_objects@vk-image-overwrite
-spec@ext_external_objects@vk-image-display
-spec@ext_external_objects@vk-vert-buf-update-errors
-spec@ext_external_objects@vk-buf-exchange
-spec@ext_external_objects@vk-depth-display
-spec@ext_external_objects@vk-pix-buf-update-errors
-spec@ext_external_objects_fd@semaphore-api-errors
-spec@ext_external_objects_fd@memory-object-api-errors
-spec@ext_external_objects@vk-vert-buf-reuse
-
-# From https://github.com/marekolsak/marek-build/blob/master/run-piglit.sh#L36
-spec@!opengl 1.0@gl-1.0-blend-func
-spec@!opengl 1.2@tex3d-maxsize
-spec@ext_framebuffer_object@fbo-maxsize
-spec@!opengl 1.1@max-texture-size
-spec@!opengl 1.1@max-texture-size-level
-spec@!opengl 1.2@tex3d-maxsize
-spec@arb_texture_buffer_object@max-size
-spec@ext_framebuffer_object@fbo-maxsize
-
-# times out
-spec@arb_compute_shader@local-id-explosion
-
-spec@arb_uniform_buffer_object@maxuniformblocksize@vs
-spec@arb_uniform_buffer_object@maxuniformblocksize@vsexceed
+spec@arb_shader_storage_buffer_object@max-ssbo-size@vs
+spec@arb_shader_storage_buffer_object@max-ssbo-size@vsexceed
 spec@arb_uniform_buffer_object@maxuniformblocksize@fs
 spec@arb_uniform_buffer_object@maxuniformblocksize@fsexceed
-spec@arb_shader_storage_buffer_object@max-ssbo-size@fs
-spec@arb_shader_storage_buffer_object@max-ssbo-size@vsexceed
-spec@arb_shader_storage_buffer_object@max-ssbo-size@vs
-spec@arb_shader_storage_buffer_object@max-ssbo-size@fsexceed
-spec@arb_shader_image_load_store@max-size
-spec@ext_external_objects@semaphore-api-errors
-spec@ext_external_objects@vk-image-display-overwrite
+spec@arb_uniform_buffer_object@maxuniformblocksize@vs
+spec@arb_uniform_buffer_object@maxuniformblocksize@vsexceed
+
+# these are timeout-prone
 spec@ext_external_objects@memory-object-api-errors
-spec@ext_external_objects@vk-image-overwrite
-spec@ext_external_objects@vk-image-display
-spec@ext_external_objects@vk-vert-buf-update-errors
+spec@ext_external_objects@semaphore-api-errors
 spec@ext_external_objects@vk-buf-exchange
 spec@ext_external_objects@vk-depth-display
+spec@ext_external_objects@vk-image-display
+spec@ext_external_objects@vk-image-display-overwrite
+spec@ext_external_objects@vk-image-overwrite
 spec@ext_external_objects@vk-pix-buf-update-errors
-spec@ext_external_objects_fd@semaphore-api-errors
-spec@ext_external_objects_fd@memory-object-api-errors
 spec@ext_external_objects@vk-vert-buf-reuse
+spec@ext_external_objects@vk-vert-buf-update-errors
+spec@ext_external_objects_fd@memory-object-api-errors
+spec@ext_external_objects_fd@semaphore-api-errors
 
-# More time outs
+# most GLX tests are pretty broken
 glx@glx-swap-event_async
 glx@glx-swap-event_interval
 glx@glx-copy-sub-buffer