Mesa (main): ci: Use crosvm to run dEQP tests for virgl

[GitLab Mirror]

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

Author: Corentin Noël <corentin.noel at collabora.com>
Date:   Thu Jun  3 16:32:54 2021 +0200

ci: Use crosvm to run dEQP tests for virgl

Allows to use virtio-gpu to actually test the virgl driver.

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

---

 .gitlab-ci/crosvm-runner.sh                            |  2 +-
 src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt   |  2 ++
 src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt |  2 ++
 src/gallium/drivers/virgl/ci/gitlab-ci.yml             | 15 +++++++++++----
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
index 32811643ac0..ca5cce4ee7a 100755
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -31,7 +31,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 syslogd > /dev/null
 
 crosvm run \
-  --gpu gles=false,backend=virglrenderer,egl=true,surfaceless=true \
+  --gpu "$CROSVM_GPU_ARGS" \
   -m 4096 \
   -c 4 \
   --disable-sandbox \
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
index ef32b17892b..3aaf1c4139f 100644
--- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
@@ -42,6 +42,8 @@ dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail
+dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12,Fail
+dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_32,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
index 4cf80681dec..002a1cdbd09 100644
--- a/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
@@ -42,6 +42,8 @@ dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail
 dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail
+dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12,Fail
+dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_32,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail
 dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 9109d587b66..3898c28dac2 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -3,7 +3,9 @@
     - .test-gl
     - .virgl-rules
   variables:
-    GALLIUM_DRIVER: "virpipe"
+    GALLIUM_DRIVER: "virgl"
+    CROSVM_GALLIUM_DRIVER: "llvmpipe"
+    CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true"
 
 virgl-gles2-on-gl:
   variables:
@@ -15,7 +17,11 @@ virgl-gles2-on-gl:
     LP_NUM_THREADS: 0
     DEQP_OPTIONS: "--deqp-log-images=disable"
     DEQP_EXPECTED_RENDERER: virgl
-    LIBGL_ALWAYS_SOFTWARE: "true"
+    CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh"
+  tags:
+    - kvm
+  script:
+    - install/crosvm-runner.sh
   extends:
     - .deqp-test
     - .virgl-test
@@ -51,6 +57,7 @@ virgl-gles2-on-gles:
   variables:
     VIRGL_HOST_API: GLES
     GPU_VERSION: virgl-gles
+    CROSVM_GPU_ARGS: "gles=true,backend=virglrenderer,egl=true,surfaceless=true"
   extends:
     - virgl-gles2-on-gl
     - .test-manual
@@ -59,6 +66,7 @@ virgl-gles3-on-gles:
   variables:
     VIRGL_HOST_API: GLES
     GPU_VERSION: virgl-gles
+    CROSVM_GPU_ARGS: "gles=true,backend=virglrenderer,egl=true,surfaceless=true"
   extends:
     - virgl-gles3-on-gl
     - .test-manual
@@ -67,6 +75,7 @@ virgl-gles31-on-gles:
   variables:
     VIRGL_HOST_API: GLES
     GPU_VERSION: virgl-gles
+    CROSVM_GPU_ARGS: "gles=true,backend=virglrenderer,egl=true,surfaceless=true"
   extends:
     - virgl-gles31-on-gl
     - .test-manual
@@ -82,9 +91,7 @@ virgl-traces:
     PIGLIT_RESULTS: "virgl-replay"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
-    GALLIUM_DRIVER: "virgl"
     CROSVM_TEST_SCRIPT: "/install/piglit/run.sh"
-    CROSVM_GALLIUM_DRIVER: "llvmpipe"
   tags:
     - kvm
   script: