Mesa (main): ci/llvmpipe: Use the deqp-runner suite support to consolidate jobs.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Aug 3 19:19:32 UTC 2021 

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

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Jul 21 16:40:02 2021 -0700

ci/llvmpipe: Use the deqp-runner suite support to consolidate jobs.

5 jobs become 2, plus we add KHR-GLES3 and 31 to the test set since
it's cheap.

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/llvmpipe/ci/deqp-llvmpipe-fails.txt    | 66 ++++++++++++++++++++++
 .../drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt    |  1 +
 src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml | 56 ++++++++++++++++++
 src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml      | 37 ++----------
 4 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
index 508c8ebda3e..b8feb3afc62 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
@@ -69,3 +69,69 @@ KHR-GL45.transform_feedback.draw_xfb_instanced_test,Crash
 KHR-GL45.transform_feedback.draw_xfb_stream_instanced_test,Crash
 KHR-GL45.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL45.transform_feedback.query_vertex_separate_test,Fail
+KHR-GLES31.core.compute_shader.resource-image,Crash
+KHR-GLES31.core.geometry_shader.limits.max_texture_units,Fail
+KHR-GLES31.core.texture_gather.offset-gather-int-2darray,Crash
+KHR-GLES31.core.texture_gather.offset-gather-int-2d,Crash
+KHR-GLES31.core.texture_gather.offset-gather-uint-2darray,Crash
+KHR-GLES31.core.texture_gather.offset-gather-uint-2d,Crash
+KHR-GLES31.core.texture_gather.plain-gather-int-2darray,Crash
+KHR-GLES31.core.texture_gather.plain-gather-int-2d,Crash
+KHR-GLES31.core.texture_gather.plain-gather-int-cube-rgba,Crash
+KHR-GLES31.core.texture_gather.plain-gather-uint-2darray,Crash
+KHR-GLES31.core.texture_gather.plain-gather-uint-2d,Crash
+KHR-GLES31.core.texture_gather.plain-gather-uint-cube,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_clamp_to_edge,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_mirrored_repeat,Crash
+KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_repeat,Crash
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
index 6d96c79af06..3c65d9546f9 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
@@ -13,3 +13,4 @@ KHR-GL45.copy_image.functional
 KHR-GL45.texture_size_promotion.functional
 KHR-GL45.texture_swizzle.functional
 KHR-GL45.texture_swizzle.smoke
+KHR-GLES31.core.arrays_of_arrays.InteractionFunctionCalls2
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
new file mode 100644
index 00000000000..9a5286a5be7
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
@@ -0,0 +1,56 @@
+[[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"
+]
+
+[[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"
+]
+  [deqp.env]
+  # Stress test NIR clone/serialization for GLES3.1 (which should cover most of the featureset).
+  # Costs about 30% extra runtime.
+  NIR_TEST_CLONE = "true"
+  NIR_TEST_SERIALIZE = "true"
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gles2-khr-master.txt",
+    "/deqp/mustpass/gles3-khr-master.txt",
+    "/deqp/mustpass/gles31-khr-master.txt",
+    "/deqp/mustpass/gl45-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/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index ee2f4f0eb6d..8dfd0404706 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -90,39 +90,12 @@ llvmpipe-traces:
     - .deqp-test
     - .llvmpipe-test
 
-llvmpipe-gles2:
+llvmpipe-deqp:
   variables:
-    DEQP_VER: gles2
-  extends:
-    - .llvmpipe-deqp-test
-
-llvmpipe-gles3:
-  variables:
-    DEQP_VER: gles3
-  extends:
-    - .llvmpipe-deqp-test
-
-llvmpipe-gles31:
-  variables:
-    DEQP_VER: gles31
-    # Stress test NIR clone/serialization with significant shaders enabled.
-    # Costs about 30% extra runtime.
-    NIR_TEST_CLONE: "true"
-    NIR_TEST_SERIALIZE: "true"
-  extends:
-    - .llvmpipe-deqp-test
-
-llvmpipe-gl:
-  variables:
-    DEQP_VER: gl45
-  extends:
-    - .llvmpipe-deqp-test
-
-llvmpipe-khr-gles2:
-  variables:
-    DEQP_VER: gles2-khr
-  extends:
-    - .llvmpipe-deqp-test
+    DEQP_VER: gles2 # for the renderer check
+    DEQP_SUITE: llvmpipe
+  parallel: 2
+  extends: .llvmpipe-deqp-test
 
 llvmpipe-egl:
   variables:

More information about the mesa-commit mailing list