ci: Test RadeonSI with piglit's quick_gl

And do some job refactoring to share more lines between job definitions.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10139>

.gitlab-ci/lava-gitlab-ci.yml

@@ -151,6 +151,8 @@ kernel+rootfs_armhf:
     - meson-testing
 
 .lava-traces-base:
+  variables:
+    LAVA_TEST_SCRIPT: "/install/piglit/run.sh"
   artifacts:
     reports:
       junit: results/junit.xml
@@ -158,7 +160,7 @@ kernel+rootfs_armhf:
 .lava-piglit:
   variables:
     TEST_SUITE: "piglit"
-    LAVA_TEST_SCRIPT: "/install/piglit/run.sh"
+    LAVA_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
 
 .lava-piglit-traces:amd64:
   extends:
@@ -177,3 +179,8 @@ kernel+rootfs_armhf:
     - .lava-test:arm64
     - .lava-piglit
     - .lava-traces-base
+
+.lava-piglit:amd64:
+  extends:
+    - .lava-test:amd64
+    - .lava-piglit

src/gallium/drivers/radeonsi/ci/gitlab-ci.yml

@@ -1,6 +1,5 @@
-radeonsi-stoney-gles2:amd64:
+.radeonsi-stoney-test:amd64:
   extends:
-    - .lava-test:amd64
     - .radeonsi-rules
   variables:
     DEVICE_TYPE: hp-11A-G6-EE-grunt
@@ -8,21 +7,35 @@ radeonsi-stoney-gles2:amd64:
     GPU_VERSION: radeonsi-stoney
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
+    DRIVER_NAME: radeonsi
     ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY"
   tags:
     - mesa-ci-aarch64-lava-collabora
 
-.radeonsi-stoney-gles3:amd64:
+.radeonsi-stoney-deqp:amd64:
   extends:
-    - radeonsi-stoney-gles2:amd64
+    - .lava-test:amd64
+    - .radeonsi-stoney-test:amd64
+
+radeonsi-stoney-gles2:amd64:
+  extends:
+    - .radeonsi-stoney-deqp:amd64
+  variables:
+    DEQP_VERSION: gles2
+
+# Run two jobs in parallel each running 1/4th of the test suite
+radeonsi-stoney-gles3:amd64:
+  extends:
+    - .radeonsi-stoney-deqp:amd64
   parallel: 2
   variables:
     DEQP_VERSION: gles3
     ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY DEQP_FRACTION=2"
 
+# Run two jobs in parallel each running 1/4th of the test suite
 radeonsi-stoney-gles31:amd64:
   extends:
-    - radeonsi-stoney-gles2:amd64
+    - .radeonsi-stoney-deqp:amd64
   parallel: 2
   variables:
     DEQP_VERSION: gles31
@@ -31,14 +44,15 @@ radeonsi-stoney-gles31:amd64:
 radeonsi-stoney-traces:amd64:
   extends:
     - .lava-piglit-traces:amd64
-    - .radeonsi-rules
+    - .radeonsi-stoney-test:amd64
   variables:
-    DEVICE_TYPE: hp-11A-G6-EE-grunt
-    DTB: ""
-    GPU_VERSION: radeonsi-stoney
-    DRIVER_NAME: radeonsi
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
     ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
   tags:
     - mesa-ci-aarch64-lava-collabora
+
+radeonsi-stoney-piglit-gl:amd64:
+  extends:
+    - .lava-piglit:amd64
+    - .radeonsi-stoney-test:amd64
+  variables:
+    ENV_VARS: "PIGLIT_FRACTION=4 PIGLIT_PLATFORM=mixed_glx_egl PIGLIT_PROFILES=quick_gl PIGLIT_JUNIT_RESULTS=1 LAVA_START_XORG=1"

src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt

@@ -0,0 +1,21 @@
+glx@glx-visuals-stencil -pixmap,Crash
+glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
+glx@glx_ext_import_context@get context id,Fail
+glx@glx_ext_import_context@import context- single process,Fail
+spec@arb_es2_compatibility@texwrap formats bordercolor-swizzled,Fail
+spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail
+spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail
+spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail
+spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail
+spec@egl_khr_surfaceless_context@viewport,Fail
+spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail
+spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail
+spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail
+spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail
+wgl@wgl-sanity,Fail
+

src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-skips.txt

@@ -0,0 +1,29 @@
+# From https://github.com/marekolsak/marek-build/blob/master/run-piglit.sh#L36
+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
+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
+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