gitlab-ci: Test Virgl with traces

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dd5e6e40a627d31c18b041cfd630ed78eeeaab7..1087a734e4e7ef70f027c74d19396cbd793a1b53 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -931,3 +931,14 @@ radv-polaris10-traces:
     DEVICE_NAME: "vk-amd-polaris10"
   tags:
     - polaris10
+
+virgl-traces:
+  extends:
+    - .traces-test-gl
+    - .virgl-rules
+  variables:
+    LIBGL_ALWAYS_SOFTWARE: "true"
+    GALLIUM_DRIVER: "virpipe"
+    DEVICE_NAME: "gl-virgl"
+    MESA_GLES_VERSION_OVERRIDE: "3.1"
+    MESA_GLSL_VERSION_OVERRIDE: "310"

diff --git a/.gitlab-ci/traces.yml b/.gitlab-ci/traces.yml
index 70a7d1a1bb002c5a29eeb958fd6259fa1225fc99..0f756899f1a3d11f431dfca11bd72addfdfc3565 100644 (file)
--- a/.gitlab-ci/traces.yml
+++ b/.gitlab-ci/traces.yml
@@ -7,14 +7,20 @@ traces:
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 8867f3a41f180626d0d4b7661ff5c0f4
+      - device: gl-virgl
+        checksum: 8867f3a41f180626d0d4b7661ff5c0f4
   - path: glmark2/jellyfish.rdc
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: e0fe979fee129c0ed42a3059d1a4e1c9
+      - device: gl-virgl
+        checksum: e0fe979fee129c0ed42a3059d1a4e1c9
   - path: glxgears/glxgears.trace
     expectations:
       - device: gl-vmware-llvmpipe
         checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd
+      - device: gl-virgl
+        checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd
   - path: KhronosGroup-Vulkan-Tools/vkcube.gfxr
     expectations:
       - device: vk-amd-polaris10

diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh
index 1c329c9cbe0ee1ed4f85e83904ca55ff3bd2ce65..a8dc8206d054449caab82ee40a3c35825cb8c276 100755 (executable)
--- a/.gitlab-ci/tracie-runner-gl.sh
+++ b/.gitlab-ci/tracie-runner-gl.sh
@@ -22,9 +22,25 @@ export EGL_PLATFORM="surfaceless"
 export DISPLAY=
 export WAFFLE_PLATFORM="surfaceless_egl"
 
+RESULTS=`pwd`/results
+mkdir -p $RESULTS
+
 # Perform a self-test to ensure tracie is working properly.
 "$INSTALL/tracie/tests/test.sh"
 
+if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
+    # tracie is to use virpipe, and virgl_test_server llvmpipe
+    export GALLIUM_DRIVER="$GALLIUM_DRIVER"
+
+    GALLIUM_DRIVER=llvmpipe \
+    GALLIVM_PERF="nopt,no_filter_hacks" \
+    VTEST_USE_EGL_SURFACELESS=1 \
+    VTEST_USE_GLES=1 \
+    virgl_test_server >$RESULTS/vtest-log.txt 2>&1 &
+
+    sleep 1
+fi
+
 # Sanity check to ensure that our environment is sufficient to make our tests
 # run against the Mesa built by CI, rather than any installed distro version.
 MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')