Mesa (main): ci/lavapipe: Test 1/3 of lavapipe on the shared 64-core google runners.

[GitLab Mirror]

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

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Feb  8 13:12:42 2022 -0800

ci/lavapipe: Test 1/3 of lavapipe on the shared 64-core google runners.

Now we can get through 1/3 of the testsuite in about 3:30, while
previously we did 1/10th.

Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14962>

---

 src/gallium/frontends/lavapipe/ci/deqp-lvp.toml  | 15 +++++++++++++++
 src/gallium/frontends/lavapipe/ci/gitlab-ci.yml  | 15 +++++----------
 src/gallium/frontends/lavapipe/ci/lvp-fails.txt  |  5 +++++
 src/gallium/frontends/lavapipe/ci/lvp-flakes.txt |  3 +++
 src/gallium/frontends/lavapipe/ci/lvp-skips.txt  | 13 ++++++++-----
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp.toml b/src/gallium/frontends/lavapipe/ci/deqp-lvp.toml
new file mode 100644
index 00000000000..188d00b8006
--- /dev/null
+++ b/src/gallium/frontends/lavapipe/ci/deqp-lvp.toml
@@ -0,0 +1,15 @@
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+renderer_check = "llvmpipe"
+fraction = 3
+
+# Do some nir clone/serialize validation, but not on the whole run.
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+renderer_check = "llvmpipe"
+fraction = 100
+prefix = "nir-stress="
+  [deqp.env]
+  NIR_DEBUG = "clone,serialize"
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 5fe45d8bafa..51616030a90 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -9,19 +9,14 @@
     VK_DRIVER: lvp
     DEQP_EXPECTED_RENDERER: llvmpipe
 
-lavapipe-vk:
-  stage: software-renderer
-  extends:
-    - .lavapipe-test
+lavapipe:
+  tags:
+    - mesa-swrast
   variables:
-    DEQP_FRACTION: 10
-
-lavapipe-nir-stress:
+    DEQP_SUITE: lvp
+  stage: software-renderer
   extends:
     - .lavapipe-test
-  variables:
-    DEQP_FRACTION: 100
-    NIR_DEBUG: "clone,serialize"
 
 lavapipe-vk-asan:
   extends:
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
index 7e4c536dade..a803bdceebf 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
@@ -8,3 +8,8 @@ dEQP-VK.rasterization.provoking_vertex.transform_feedback.per_pipeline.triangle_
 # VK-GL-CTS 1.3.1.0 uprev:
 dEQP-VK.glsl.crash_test.divbyzero_comp,Crash
 dEQP-VK.glsl.texture_functions.query.texturequerylod.isamplercube_zero_uv_width_fragment,Fail
+dEQP-VK.glsl.texture_functions.query.texturequerylod.samplercube_float_zero_uv_width_fragment,Fail
+dEQP-VK.glsl.texture_functions.query.texturequerylod.samplercubeshadow_zero_uv_width_fragment,Fail
+dEQP-VK.glsl.texture_functions.query.texturequerylod.usamplercube_zero_uv_width_fragment,Fail
+
+dEQP-VK.graphicsfuzz.spv-stable-mergesort-flatten-selection-dead-continues,Fail
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-flakes.txt b/src/gallium/frontends/lavapipe/ci/lvp-flakes.txt
index b6441e2cc58..6cffcb67e73 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-flakes.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-flakes.txt
@@ -1,4 +1,7 @@
+# "smooth produced different results (Fail)"
 dEQP-VK.draw.dynamic_rendering.multiple_interpolation.structured.no_sample_decoration.4_samples
+nir-stress=dEQP-VK.draw.dynamic_rendering.multiple_interpolation.structured.no_sample_decoration.4_samples
+
 dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing
 dEQP-VK.rasterization.provoking_vertex.transform_feedback.first.line_strip_with_adjacency
 dEQP-VK.rasterization.provoking_vertex.transform_feedback.per_pipeline.triangle_strip_with_adjacency
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
index e65b29da39d..3df5c492fd6 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
@@ -5,14 +5,20 @@
 # TODO: fix me
 dEQP-VK.texture.filtering.3d.sizes.3x7x5.linear_mipmap_linear
 
-# Timeouts (VK-GL-CTS 1.2.7.0)
 dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing
+dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_odd_spacing
 dEQP-VK.graphicsfuzz.spv-stable-pillars-O-op-select-to-op-phi
 dEQP-VK.graphicsfuzz.spv-stable-pillars-volatile-nontemporal-store
 dEQP-VK.graphicsfuzz.spv-composites
+
 dEQP-VK.ssbo.layout.random.16bit.all_shared_buffer.40
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
 dEQP-VK.ssbo.phys.layout.random.all_shared_buffer.47
+
+dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_u8vec4
+dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bvec4
+dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_i64vec4
+
 dEQP-VK.tessellation.invariance.outer_edge_division.quads_equal_spacing
 dEQP-VK.tessellation.invariance.outer_triangle_set.quads_equal_spacing
 dEQP-VK.tessellation.invariance.outer_triangle_set.quads_fractional_even_spacing
@@ -21,8 +27,5 @@ dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_equal_spacing
 dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_even_spacing
 dEQP-VK.tessellation.invariance.outer_triangle_set.triangles_fractional_odd_spacing
 
-# Timeouts (VK-GL-CTS 1.2.8.0)
-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_i64vec4
+dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
 dEQP-VK.graphicsfuzz.cov-int-initialize-from-multiple-large-arrays
-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_u8vec4
-dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_bvec4