Mesa (main): ci/deqp: Skip flush_finish on all CI jobs.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 14 19:47:33 UTC 2021
Module: Mesa
Branch: main
Commit: 9cc1f089196f2f5c695dbf5f42b947b9970b8965
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cc1f089196f2f5c695dbf5f42b947b9970b8965
Author: Emma Anholt <emma at anholt.net>
Date: Fri Jun 11 14:03:37 2021 -0700
ci/deqp: Skip flush_finish on all CI jobs.
They're too slow to run in CI even on non-tiled renderers, they don't
block conformance (unless you crash), and provide unreliable warning
results unless you isolate them from other activity on the system.
This means that the following jobs now skip these tests:
- deqp-iris-*
- deqp-llvmpipe (you know, the one mentioned in the comment!)
- deqp-virgl-gl
- deqp-zink-lvp
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11333>
---
.gitlab-ci/{deqp-default-skips.txt => deqp-all-skips.txt} | 3 ++-
.gitlab-ci/deqp-runner.sh | 5 ++---
src/broadcom/ci/deqp-vc4-rpi3-skips.txt | 3 ---
src/freedreno/ci/deqp-freedreno-a530-skips.txt | 3 ---
src/freedreno/ci/deqp-freedreno-a630-skips.txt | 3 ---
src/gallium/drivers/lima/ci/deqp-lima-skips.txt | 3 ---
src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt | 3 ---
src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt | 3 ---
src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-skips.txt | 7 -------
src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-skips.txt | 6 ------
src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-skips.txt | 7 -------
src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt | 4 ----
12 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/.gitlab-ci/deqp-default-skips.txt b/.gitlab-ci/deqp-all-skips.txt
similarity index 60%
rename from .gitlab-ci/deqp-default-skips.txt
rename to .gitlab-ci/deqp-all-skips.txt
index de86b640c48..c4d71cb5178 100644
--- a/.gitlab-ci/deqp-default-skips.txt
+++ b/.gitlab-ci/deqp-all-skips.txt
@@ -2,5 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
+# These are tremendously slow (pushing toward a minute), and aren't
+# reliable to be run in parallel with other tests due to CPU-side timing.
dEQP-GLES[0-9]*.functional.flush_finish.*
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 98c6e1d5f12..b3d0bd93953 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -98,9 +98,7 @@ fi
touch $INSTALL/deqp-$GPU_VERSION-flakes.txt
if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then
- DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-$GPU_VERSION-skips.txt"
-else
- DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-default-skips.txt"
+ DEQP_SKIPS="$INSTALL/deqp-$GPU_VERSION-skips.txt"
fi
set +e
@@ -127,6 +125,7 @@ run_cts() {
--deqp $deqp \
--output $RESULTS \
--caselist $caselist \
+ --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
--flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
--testlog-to-xml /deqp/executor/testlog-to-xml \
$JOB \
diff --git a/src/broadcom/ci/deqp-vc4-rpi3-skips.txt b/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
index a90863c1d9c..62d4d939d2d 100644
--- a/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
+++ b/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# This is causing a binning memory overflow problem
dEQP-GLES2.functional.fragment_ops.scissor.outside_render_line
diff --git a/src/freedreno/ci/deqp-freedreno-a530-skips.txt b/src/freedreno/ci/deqp-freedreno-a530-skips.txt
index 0268bbddce7..dc4c488cb0f 100644
--- a/src/freedreno/ci/deqp-freedreno-a530-skips.txt
+++ b/src/freedreno/ci/deqp-freedreno-a530-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# Times out
dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.36
diff --git a/src/freedreno/ci/deqp-freedreno-a630-skips.txt b/src/freedreno/ci/deqp-freedreno-a630-skips.txt
index 50c8cadf1dc..5f711ab691c 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-skips.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# Timeouts, passes otherwise
KHR-GL33.texture_swizzle.smoke
diff --git a/src/gallium/drivers/lima/ci/deqp-lima-skips.txt b/src/gallium/drivers/lima/ci/deqp-lima-skips.txt
index ac83b8a2f20..da2fc83984a 100644
--- a/src/gallium/drivers/lima/ci/deqp-lima-skips.txt
+++ b/src/gallium/drivers/lima/ci/deqp-lima-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish
-
# These tests fail on GLES2 drivers due to dEQP bug, see
# https://github.com/KhronosGroup/VK-GL-CTS/pull/241
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.r8
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
index 0fc34fc7968..1147d8f739d 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-g52-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# Some compute jobs take more 0.5s, the maximum allowed by the
# kernel driver
dEQP-GLES31.functional.draw_indirect.compute_interop.large.*
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt
index 834f7564a0e..5ec2c169100 100644
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt
+++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t720-skips.txt
@@ -2,9 +2,6 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# Needs investigation
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgb565_depth_component16
dEQP-GLES2.functional.fbo.render.shared_colorbuffer.tex2d_rgba_depth_component16
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-skips.txt
deleted file mode 100644
index 50a2283ed0c..00000000000
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t760-skips.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list. Be careful.
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-skips.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-skips.txt
deleted file mode 100644
index de86b640c48..00000000000
--- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t820-skips.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list. Be careful.
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
diff --git a/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-skips.txt b/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-skips.txt
deleted file mode 100644
index 50a2283ed0c..00000000000
--- a/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-skips.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list. Be careful.
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
index 724d869270b..8d44847dd53 100644
--- a/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
@@ -1,10 +1,6 @@
# Note: skips lists for CI are just a list of lines that, when
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
# Random failures
dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask
dEQP-GLES31.functional.fbo.no_attachments.maximums.all
More information about the mesa-commit
mailing list