Mesa (main): ci: actually run piglit tests with virgl

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 18fa8205063b5dc07d1e253806070ba008793e1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18fa8205063b5dc07d1e253806070ba008793e1b

Author: Corentin Noël <corentin.noel at collabora.com>
Date:   Wed Jul 21 08:50:01 2021 +0200

ci: actually run piglit tests with virgl

Make sure that the host is using llvmpipe while the guest is using virgl as driver.

Note that the neverball/neverball.trace trace actually regressed in a way that the
foreground is missing.

Fixes: f1b952fa ("ci: Run tests inside Crosvm")

Signed-off-by: Corentin Noël <corentin.noel at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11986>

---

 .gitlab-ci/crosvm-runner.sh                   |  2 ++
 src/gallium/drivers/virgl/ci/gitlab-ci.yml    |  5 +++--
 src/gallium/drivers/virgl/ci/traces-virgl.yml | 29 ++++++++++++++-------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
index 25009b80e1f..cafa2c3f505 100755
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -8,6 +8,8 @@ export LD_LIBRARY_PATH=$CI_PROJECT_DIR/install/lib/
 export EGL_PLATFORM=surfaceless
 
 export -p > /crosvm-env.sh
+export GALLIUM_DRIVER="$CROSVM_GALLIUM_DRIVER"
+export LIBGL_ALWAYS_SOFTWARE="true"
 
 CROSVM_KERNEL_ARGS="root=my_root rw rootfstype=virtiofs loglevel=3 init=$CI_PROJECT_DIR/install/crosvm-init.sh ip=192.168.30.2::192.168.30.1:255.255.255.0:crosvm:eth0"
 
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index f2b146c94ca..9109d587b66 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -3,7 +3,6 @@
     - .test-gl
     - .virgl-rules
   variables:
-    LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "virpipe"
 
 virgl-gles2-on-gl:
@@ -16,6 +15,7 @@ virgl-gles2-on-gl:
     LP_NUM_THREADS: 0
     DEQP_OPTIONS: "--deqp-log-images=disable"
     DEQP_EXPECTED_RENDERER: virgl
+    LIBGL_ALWAYS_SOFTWARE: "true"
   extends:
     - .deqp-test
     - .virgl-test
@@ -82,8 +82,9 @@ virgl-traces:
     PIGLIT_RESULTS: "virgl-replay"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
-    GALLIUM_DRIVER: "llvmpipe"
+    GALLIUM_DRIVER: "virgl"
     CROSVM_TEST_SCRIPT: "/install/piglit/run.sh"
+    CROSVM_GALLIUM_DRIVER: "llvmpipe"
   tags:
     - kvm
   script:
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 2367f71e193..f85f046efba 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml
@@ -17,11 +17,11 @@ traces:
   - path: gputest/furmark.trace
     expectations:
       - device: gl-virgl
-        checksum: 901e1b360463aa9dfe62fdda0eb8008c
+        checksum: 1d3233c101df0aa984b22ee2037f52b0
   - path: gputest/pixmark-piano.trace
     expectations:
       - device: gl-virgl
-        checksum: 3bb42312c7d7d694f7e186b480e16314
+        checksum: fcbef51c12090119897449c75be6aef7
   - path: gputest/triangle.trace
     expectations:
       - device: gl-virgl
@@ -29,11 +29,11 @@ traces:
   - path: humus/Portals.trace
     expectations:
       - device: gl-virgl
-        checksum: e46ba031e63d55209469f20019657baa
+        checksum: 80e88e6be47138c18370d84c6426544f
   - path: 0ad/0ad.trace
     expectations:
       - device: gl-virgl
-        checksum: ae565e00821619d8a0462312ca0fecac
+        checksum: 9a430898b88ae9d2faff8f1d1027bf36
   - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc
     expectations:
       - device: gl-virgl
@@ -180,7 +180,7 @@ traces:
   - path: gputest/plot3d.trace
     expectations:
       - device: gl-virgl
-        checksum: 09e49ca9a988fe86c8b26f2a73d5bc08
+        checksum: 6ff8d55ffa270a9682ddd7c934b93ec8
 # Crash
 #  - path: gputest/tessmark.trace
 #    expectations:
@@ -189,36 +189,37 @@ traces:
   - path: humus/AmbientAperture.trace
     expectations:
       - device: gl-virgl
-        checksum: 967cc502f7361cdfb936977951ffe0cb
+        checksum: 8097a71098d20aa029ca99868a8f5303
   - path: humus/CelShading.trace
     expectations:
       - device: gl-virgl
-        checksum: f426204fdf37ea12a9510ca8f205cd3a
+        checksum: da817304110f4fb7fdbcdf3f83fe184d
   - path: humus/DynamicBranching3.trace
     expectations:
       - device: gl-virgl
-        checksum: aeed4be37af042f3986e9a6c8914c5a4
+        checksum: 82c6b38f49b6a5d26d00ee64cf6e3fa6
   - path: humus/HDR.trace
     expectations:
       - device: gl-virgl
-        checksum: 31e668d7c119d327fbefc4973f87bf41
+        checksum: 40cae3617b7fe872939125ee574b50f0
   - path: humus/RaytracedShadows.trace
     expectations:
       - device: gl-virgl
-        checksum: 81db70518812f372c8e29bdc19043191
+        checksum: 0e1096159db72b650d43f134c3ccaf79
   - path: humus/VolumetricFogging2.trace
     expectations:
       - device: gl-virgl
-        checksum: 0e806f844049a45a4bcb0c9149cb0e8e
+        checksum: 02027b453508e7ba02c289c14167469a
 # Crash
 #  - path: itoral-gl-terrain-demo/demo.trace
 #    expectations:
 #      - device: gl-virgl
 #        checksum: 9571117bf4eab6fe29b12f6c3d42d865
+# The neverball foreground is actually missing
   - path: neverball/neverball.trace
     expectations:
       - device: gl-virgl
-        checksum: 6936cde5edab2b3fd02115ef36015cde
+        checksum: aa91b3f52d233ecded7d5979351b6859
 # Crash
 #  - path: pathfinder/canvas_moire.trace
 #    expectations:
@@ -237,7 +238,7 @@ traces:
   - path: supertuxkart/supertuxkart-mansion-egl-gles.trace
     expectations:
       - device: gl-virgl
-        checksum: 7e478a9cca2686531370e91ece6b3afc
+        checksum: 9ec60b51cf869b383fd5602e02f9b1ee
 # Sometimes crashes
 #  - path: xonotic/xonotic-keybench-high.trace
 #    expectations:
@@ -246,7 +247,7 @@ traces:
   - path: valve/counterstrike.trace
     expectations:
       - device: gl-virgl
-        checksum: 6435cdace910ed659a8b78603a32cd19
+        checksum: e27507899c353b2ff0b8a033070ac2a5
 # Piglit times-out when trying to run these two
 #  - path: valve/counterstrike-source.trace
 #    expectations: