Mesa (main): ci/virgl: Use deqp-runner suite support to reduce CI job count.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 3 19:19:32 UTC 2021
Module: Mesa
Branch: main
Commit: 55bd5825988ddea7a2198121da3df56b5efa9d3d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=55bd5825988ddea7a2198121da3df56b5efa9d3d
Author: Emma Anholt <emma at anholt.net>
Date: Thu Jul 22 12:56:23 2021 -0700
ci/virgl: Use deqp-runner suite support to reduce CI job count.
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12110>
---
.../drivers/virgl/ci/deqp-virgl-gl-flakes.txt | 3 ++
src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml | 49 +++++++++++++++++++
src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml | 34 +++++++++++++
src/gallium/drivers/virgl/ci/gitlab-ci.yml | 56 +++-------------------
4 files changed, 93 insertions(+), 49 deletions(-)
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt
index 72573e019f6..cc7c6b401b9 100644
--- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt
@@ -1,3 +1,6 @@
KHR-GL30.shaders30.glsl_constructors.bvec4_from_mat4x2_vs
+KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat4x3_vs
+KHR-GL30.shaders30.glsl_constructors.bvec4_from_bool_mat3_vs
+KHR-GL30.shaders30.glsl_constructors.bvec4_from_mat4x3_vs
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651
KHR-GL31.transform_feedback.capture_special_interleaved_test
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml
new file mode 100644
index 00000000000..aa06b482b1d
--- /dev/null
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml
@@ -0,0 +1,49 @@
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+timeout = 180.0
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+timeout = 180.0
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+ "/deqp/mustpass/gl30-master.txt",
+ "/deqp/mustpass/gl31-master.txt",
+ "/deqp/mustpass/gl32-master.txt",
+]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml
new file mode 100644
index 00000000000..4a012affa34
--- /dev/null
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml
@@ -0,0 +1,34 @@
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+timeout = 180.0
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-master.txt"]
+deqp_args = [
+ "--deqp-surface-width=256",
+ "--deqp-surface-height=256",
+ "--deqp-surface-type=pbuffer",
+ "--deqp-gl-config-name=rgba8888d24s8ms0",
+ "--deqp-visibility=hidden"
+]
+timeout = 180.0
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 8d5c60a0b83..04375a9c39b 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -7,15 +7,17 @@
CROSVM_GALLIUM_DRIVER: "llvmpipe"
CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true"
-virgl-gles2-on-gl:
+virgl-on-gl:
variables:
- DEQP_VER: gles2
+ DEQP_VER: gles2 # For renderer check
+ DEQP_SUITE: virgl-gl
GPU_VERSION: virgl-gl
# Don't use threads inside llvmpipe, we've already got all cores
# busy at the deqp-runner level.
LP_NUM_THREADS: 0
DEQP_EXPECTED_RENDERER: virgl
CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh"
+ parallel: 2
tags:
- kvm
script:
@@ -24,58 +26,14 @@ virgl-gles2-on-gl:
- .deqp-test
- .virgl-test
-virgl-gles3-on-gl:
- variables:
- DEQP_VER: gles3
- DEQP_RUNNER_OPTIONS: "--timeout 180"
- extends: virgl-gles2-on-gl
-
-virgl-gles31-on-gl:
- parallel: 2
- variables:
- DEQP_VER: gles31
- extends: virgl-gles3-on-gl
-
-virgl-gl30-on-gl:
- variables:
- DEQP_VER: gl30
- extends: virgl-gles2-on-gl
-
-virgl-gl31-on-gl:
- variables:
- DEQP_VER: gl31
- extends: virgl-gles2-on-gl
-
-virgl-gl32-on-gl:
- variables:
- DEQP_VER: gl32
- extends: virgl-gles2-on-gl
-
-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
-
-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
-
-virgl-gles31-on-gles:
+virgl-on-gles:
variables:
VIRGL_HOST_API: GLES
+ DEQP_SUITE: virgl-gles
GPU_VERSION: virgl-gles
CROSVM_GPU_ARGS: "gles=true,backend=virglrenderer,egl=true,surfaceless=true"
extends:
- - virgl-gles31-on-gl
+ - virgl-on-gl
- .test-manual
virgl-traces:
More information about the mesa-commit
mailing list