Mesa (main): ci/zink: Use deqp-runner suite support to reduce the CI job count.

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

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

Author: Emma Anholt <emma at anholt.net>
Date:   Fri Jul 23 11:14:16 2021 -0700

ci/zink: Use deqp-runner suite support to reduce the CI job count.

The tests were passing so quickly, and the 1/4th GLES3 subset changed on
the transition to multiple testsuites, so I promoted it to a full run.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Acked-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12110>

---

 .../drivers/zink/ci/deqp-zink-lvp-fails.txt        | 20 ++++++++++--
 src/gallium/drivers/zink/ci/deqp-zink-lvp.toml     | 37 ++++++++++++++++++++++
 src/gallium/drivers/zink/ci/gitlab-ci.yml          | 35 ++++++--------------
 3 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
index 3dfb5bd823a..3a8736cc740 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
@@ -5,19 +5,37 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_and_neg_y_n
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
 dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
 dEQP-GLES2.functional.polygon_offset.default_displacement_with_units,Fail
+dEQP-GLES3.functional.polygon_offset.default_displacement_with_units,Fail
+dEQP-GLES3.functional.polygon_offset.float32_displacement_with_units,Fail
 dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_center,Fail
+dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_corner,Fail
 dEQP-GLES3.functional.clipping.point.wide_point_clip,Fail
 dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
+dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,Fail
 dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
+dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_y,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_x,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_x,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fail
+dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
+dEQP-GLES3.functional.multisample.fbo_4_samples.proportionality_sample_coverage,Fail
 dEQP-GLES3.functional.multisample.fbo_4_samples.sample_coverage_invert,Fail
+dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverage,Fail
 dEQP-GLES3.functional.multisample.fbo_max_samples.sample_coverage_invert,Fail
+dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.lines_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail
+dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
 KHR-GL32.transform_feedback.capture_geometry_separate_test,Fail
 KHR-GL32.transform_feedback.capture_vertex_interleaved_test,Fail
 KHR-GL32.transform_feedback.capture_vertex_separate_test,Fail
@@ -35,8 +53,6 @@ dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide,Fail
 dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,Fail
 dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,Fail
 dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,Fail
-dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_corner,Fail
-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail
 KHR-GL32.packed_pixels.pbo_rectangle.r16i,Fail
 KHR-GL32.packed_pixels.pbo_rectangle.r16ui,Fail
 KHR-GL32.packed_pixels.pbo_rectangle.r32i,Fail
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml
new file mode 100644
index 00000000000..8c902ef0738
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml
@@ -0,0 +1,37 @@
+[[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"
+]
+timeout = 180.0
+
+[[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/external/openglcts/modules/glcts"
+caselists = [
+    "/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"
+]
+timeout = 180.0
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index fcbdb58e511..a4132cd75d3 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -9,17 +9,6 @@
     GALLIVM_PERF: "no_quad_lod"
     LP_NUM_THREADS: 0
 
-.zink-lvp-deqp-test:
-  extends:
-    - .test-gl
-    - .deqp-test
-    - .zink-lvp-test
-  variables:
-    GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions
-    VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set
-    DEQP_EXPECTED_RENDERER: "zink.*llvmpipe"
-    DEQP_RUNNER_OPTIONS: "--timeout 180"
-
 .zink-piglit-quick_gl:
   extends:
     - .test-gl
@@ -41,21 +30,15 @@ zink-piglit-no_timelines:
   script:
     - xvfb-run --server-args='-noreset' sh -c "ZINK_NO_TIMELINES=1 GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"
 
-zink-lvp-gles2:
+zink-lvp-deqp:
   extends:
-    - .zink-lvp-deqp-test
+    - .test-gl
+    - .deqp-test
+    - .zink-lvp-test
   variables:
+    GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions
+    VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set
+    DEQP_EXPECTED_RENDERER: "zink.*llvmpipe"
     DEQP_VER: gles2
-
-zink-lvp-gles3:
-  extends:
-    - .zink-lvp-deqp-test
-  variables:
-    DEQP_VER: gles3
-    DEQP_FRACTION: 4
-
-zink-lvp-gl:
-  extends:
-    - .zink-lvp-deqp-test
-  variables:
-    DEQP_VER: gl32
+    DEQP_SUITE: zink-lvp
+  parallel: 2

More information about the mesa-commit mailing list