Mesa (main): ci/piglit: Skip glx_arb_sync_control at timing.* on all systems.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jun 14 19:47:33 UTC 2021 

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

Author: Emma Anholt <emma at anholt.net>
Date:   Fri Jun 11 14:40:06 2021 -0700

ci/piglit: Skip glx_arb_sync_control at timing.* on all systems.

The test involves timestamping to figure out how long a swap actually
takes, but if anything ends up rescheduling the process you can end up
spuriously failing.  I could easily reproduce flakiness by just running a
loop accessing the filesystem in parallel with a loop running the test.
So, it's certainly not usable on a CI system with other piglit tests
running in parallel, and we don't want to run it if it's going to just
produce flake noise.

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/piglit/piglit-all-skips.txt                       |  4 ++++
 src/broadcom/ci/piglit-v3d-rpi4-flakes.txt                   | 12 ------------
 src/broadcom/ci/piglit-vc4-rpi3-flakes.txt                   | 10 ----------
 .../drivers/freedreno/ci/piglit-freedreno-a530-fails.txt     | 12 ------------
 .../drivers/freedreno/ci/piglit-freedreno-a630-fails.txt     |  4 ----
 .../drivers/freedreno/ci/piglit-freedreno-a630-flakes.txt    | 12 ------------
 src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt        | 12 ------------
 src/gallium/drivers/iris/ci/piglit-iris-amly-fails.txt       |  8 --------
 src/gallium/drivers/iris/ci/piglit-iris-amly-flakes.txt      |  2 --
 .../drivers/radeonsi/ci/piglit-radeonsi-stoney-flakes.txt    |  1 -
 10 files changed, 4 insertions(+), 73 deletions(-)

diff --git a/.gitlab-ci/piglit/piglit-all-skips.txt b/.gitlab-ci/piglit/piglit-all-skips.txt
index 7c802d9f526..e102ac6cf41 100644
--- a/.gitlab-ci/piglit/piglit-all-skips.txt
+++ b/.gitlab-ci/piglit/piglit-all-skips.txt
@@ -1,2 +1,6 @@
 # WGL is Windows-only
 wgl at .*
+
+# These are sensitive to CPU timing, and would need to be run in isolation
+# on the system rather than in parallel with other tests.
+glx at glx_arb_sync_control@timing.*
diff --git a/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt b/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
index 54110488cea..fb0f05ad546 100644
--- a/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
+++ b/src/broadcom/ci/piglit-v3d-rpi4-flakes.txt
@@ -1,16 +1,4 @@
 glx at glx_arb_sync_control@swapbuffersmsc-divisor-zero
-glx at glx_arb_sync_control@timing
-glx at glx_arb_sync_control@timing -divisor 1
-glx at glx_arb_sync_control@timing -divisor 2
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 2
-glx at glx_arb_sync_control@timing -msc-delta 1
-glx at glx_arb_sync_control@timing -msc-delta 2
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1
-glx at glx_arb_sync_control@timing -waitformsc -divisor 2
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 1
 glx at glx_arb_sync_control@waitformsc
 spec@!opengl 1.1 at depthstencil-default_fb-drawpixels-24_8 samples=4
 spec@!opengl 1.1 at depthstencil-default_fb-drawpixels-float-and-ushort samples=4
diff --git a/src/broadcom/ci/piglit-vc4-rpi3-flakes.txt b/src/broadcom/ci/piglit-vc4-rpi3-flakes.txt
index 8c5283f43c5..55639eeb1e2 100644
--- a/src/broadcom/ci/piglit-vc4-rpi3-flakes.txt
+++ b/src/broadcom/ci/piglit-vc4-rpi3-flakes.txt
@@ -1,14 +1,4 @@
 glx at glx-multi-window-single-context
-glx at glx_arb_sync_control@timing
-glx at glx_arb_sync_control@timing -divisor 1
-glx at glx_arb_sync_control@timing -divisor 2
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 2
-glx at glx_arb_sync_control@timing -msc-delta 2
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1
-glx at glx_arb_sync_control@timing -waitformsc -divisor 2
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 2
 shaders at glsl-vs-loop
 shaders at glsl-vs-loop-nested
 spec at arb_framebuffer_srgb@blit renderbuffer srgb single_sampled enabled clear
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
index 6517efcfb91..e0c2d7d79b3 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
@@ -9,18 +9,6 @@ glx at glx-visuals-stencil -pixmap,Crash
 glx at glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 glx at glx_arb_create_context_robustness@invalid reset notification strategy,Fail
 glx at glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail
-glx at glx_arb_sync_control@timing -divisor 1,Fail
-glx at glx_arb_sync_control@timing -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 2,Fail
-glx at glx_arb_sync_control@timing -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -msc-delta 2,Fail
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -divisor 2,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 2,Fail
 glx at glx_arb_sync_control@waitformsc,Fail
 glx at glx_ext_import_context@free context,Fail
 glx at glx_ext_import_context@get context id,Fail
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
index 06dcde2a8ea..62b342b55c8 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
@@ -1,9 +1,5 @@
 glx at glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 glx at glx_arb_create_context_robustness@invalid reset notification strategy,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 2,Fail
 glx at glx-copy-sub-buffer samples=2,Fail
 glx at glx_ext_import_context@free context,Fail
 glx at glx_ext_import_context@get context id,Fail
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-flakes.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-flakes.txt
index e775abcde6f..cb7849221a6 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-flakes.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-flakes.txt
@@ -1,16 +1,4 @@
 glx at glx_arb_sync_control@swapbuffersmsc-divisor-zero
-glx at glx_arb_sync_control@timing -divisor 1
-glx at glx_arb_sync_control@timing -divisor 2
-glx at glx_arb_sync_control@timing -msc-delta 1
-glx at glx_arb_sync_control@timing -msc-delta 2
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 2
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1
-glx at glx_arb_sync_control@timing -waitformsc -divisor 2
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 1
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 2
 glx at glx_arb_sync_control@waitformsc
 glx at glx-copy-sub-buffer.*
 glx at glx-swap-copy
diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index 24812b68a92..3200ee36f5d 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -93,18 +93,6 @@ glx at glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail
 glx at glx_arb_sync_control@swapbuffersmsc-return,Fail
 glx at glx_arb_sync_control@swapbuffersmsc-return swap_interval 0,Fail
 glx at glx_arb_sync_control@swapbuffersmsc-return swap_interval 1,Fail
-glx at glx_arb_sync_control@timing -divisor 1,Fail
-glx at glx_arb_sync_control@timing -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 2,Fail
-glx at glx_arb_sync_control@timing -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -msc-delta 2,Fail
-glx at glx_arb_sync_control@timing -waitformsc -divisor 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -divisor 2,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 2,Fail
 glx at glx_arb_sync_control@waitformsc,Fail
 glx at glx_ext_import_context@free context,Fail
 glx at glx_ext_import_context@get context id,Fail
diff --git a/src/gallium/drivers/iris/ci/piglit-iris-amly-fails.txt b/src/gallium/drivers/iris/ci/piglit-iris-amly-fails.txt
index 8820474bf87..78b888c76d6 100644
--- a/src/gallium/drivers/iris/ci/piglit-iris-amly-fails.txt
+++ b/src/gallium/drivers/iris/ci/piglit-iris-amly-fails.txt
@@ -32,14 +32,6 @@ glx at glx_arb_create_context_robustness@invalid reset notification strategy,Fail
 # Version = 3.3
 glx at glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 
-# piglit: error: Test timed out.
-glx at glx_arb_sync_control@timing -divisor 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 1,Fail
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2,Fail
-glx at glx_arb_sync_control@timing -fullscreen -msc-delta 1,Fail
-glx at glx_arb_sync_control@timing -msc-delta 2,Fail
-glx at glx_arb_sync_control@timing -waitformsc -msc-delta 1,Fail
-
 # Xorg has disabled indirect rendering contexts.
 glx at glx_ext_import_context@free context,Fail
 glx at glx_ext_import_context@get context id,Fail
diff --git a/src/gallium/drivers/iris/ci/piglit-iris-amly-flakes.txt b/src/gallium/drivers/iris/ci/piglit-iris-amly-flakes.txt
index 595613d6412..3aba3691a2e 100644
--- a/src/gallium/drivers/iris/ci/piglit-iris-amly-flakes.txt
+++ b/src/gallium/drivers/iris/ci/piglit-iris-amly-flakes.txt
@@ -1,5 +1,3 @@
-glx at glx_arb_sync_control@timing.*
-
 # Some flaky tests found:
 #   spec at arb_query_buffer_object@qbo at query-GL_ANY_SAMPLES_PASSED-SYNC-GL_INT
 #   spec at arb_query_buffer_object@qbo at query-GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED-ASYNC-GL_UNSIGNED_INT64_ARB
diff --git a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-flakes.txt b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-flakes.txt
deleted file mode 100644
index 8c103bc5162..00000000000
--- a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-flakes.txt
+++ /dev/null
@@ -1 +0,0 @@
-glx at glx_arb_sync_control@timing -fullscreen -divisor 2

More information about the mesa-commit mailing list