ci: Re-enable some swrast testing using fd.o's shared runners for now.

I'm not planning to stand mesa-swrast back up until we get Kata set up, so
turn the testing back on at a reduced fraction on so that
venus/llvmpipe/etc. dev can still get some coverage.

I haven't turned lavapipe back on, because it is now unstable in memory
model / atomics tests.

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

diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 545058e..fef30e7 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -61,13 +61,12 @@ llvmpipe-traces:
     - .deqp-test
     - .llvmpipe-test
 
-.llvmpipe:
-  tags:
-    - mesa-swrast
+llvmpipe:
   variables:
     DEQP_SUITE: llvmpipe
     XDG_RUNTIME_DIR: /run/user
     XVFB_SCRIPT: "install/deqp-runner.sh"
+    DEQP_FRACTION: 4
   extends: .llvmpipe-deqp-test
   script: |
     . "$SCRIPTS_DIR"/setup-test-env.sh

diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
index 0e596c7..8877938 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -218,16 +218,6 @@ spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152
 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail
 
-# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
-# eglCreatePixmapSurface(0, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
-# // 0x0000000000000000 returned
-# eglCreatePixmapSurface(0xffffffffffffffff, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
-# // 0x0000000000000000 returned
-# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
-# eglCreatePixmapSurface(0x5592c982cf90, 0xffffffffffffffff, 0x0000000000000000, { EGL_NONE });
-# // 0x0000000000000000 returned
-# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
-wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail
 # [...]
 # Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3
 # Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3

diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
index b24dce8..40554a7 100644 (file)
--- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
@@ -15,12 +15,11 @@
   variables:
     DEQP_EXPECTED_RENDERER: softpipe
 
-.softpipe:
-  tags:
-    - mesa-swrast
+softpipe:
   variables:
     DEQP_SUITE: softpipe
     XVFB_SCRIPT: "install/deqp-runner.sh"
+    DEQP_FRACTION: 4
   extends: .softpipe-deqp-test
   script: |
     . "$SCRIPTS_DIR"/setup-test-env.sh

diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 054a43c..ccbc19d 100644 (file)
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -8,7 +8,7 @@
   script:
     - xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && GALLIUM_DRIVER=virpipe install/deqp-runner.sh"
 
-.virpipe-on-gl:
+virpipe-on-gl:
   extends:
     - .deqp-test
     - .virpipe-test
@@ -16,8 +16,7 @@
     DEQP_SUITE: virpipe-gl
     GPU_VERSION: virpipe-gl
     PIGLIT_PLATFORM: x11_egl
-  tags:
-    - mesa-swrast
+    DEQP_FRACTION: 4
 
 .virgl-test:
   extends:

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 9f493c1..2b9fc9f 100644 (file)
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -27,15 +27,14 @@
     # Fix non-conformant llvmpipe filter defaults
     GALLIVM_PERF: "no_quad_lod"
 
-.zink-lvp:
-  tags:
-    - mesa-swrast
+zink-lvp:
   extends:
     - .test-gl
     - .deqp-test
     - .zink-lvp-test
   variables:
     DEQP_SUITE: zink-lvp
+    DEQP_FRACTION: 4
     PIGLIT_NO_WINDOW: 1
     # Enable validation (except for on piglit, see deqp-zink-lvp.toml), logging
     # to stdout and aborting on unknown failures.

diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml
index 78f7abd..0d2e8d1 100644 (file)
--- a/src/virtio/ci/gitlab-ci.yml
+++ b/src/virtio/ci/gitlab-ci.yml
@@ -8,7 +8,7 @@
     CROSVM_VK_DRIVER: "lvp"
     CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true"
 
-.venus-lavapipe:
+venus-lavapipe:
   extends:
     - .deqp-test-vk
     - .venus-lavapipe-test
@@ -20,5 +20,3 @@
     FDO_CI_CONCURRENT: 32 # Seems to be the fastest value, more gets actually slower
     CROSVM_MEMORY: 3072
     FLAKES_CHANNEL: "#virgl-ci"
-  tags:
-    - mesa-swrast