Mesa (master): ci/freedreno: Group the short a630 dEQP runs into one test job.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 11 17:41:17 UTC 2020
Module: Mesa
Branch: master
Commit: 2998a0b05525640dfcde7cfc0ecfc3ee39993388
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2998a0b05525640dfcde7cfc0ecfc3ee39993388
Author: Eric Anholt <eric at anholt.net>
Date: Fri Nov 6 14:06:26 2020 -0800
ci/freedreno: Group the short a630 dEQP runs into one test job.
This saves the minute and a half boot time on each of these minute-or-less
test jobs. The whole job was 3.5 minutes in my last run.
Acked-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6971>
---
.gitlab-ci.yml | 61 +---------------
.gitlab-ci/bare-metal/arm64_a630_gles_others.sh | 83 ++++++++++++++++++++++
.gitlab-ci/deqp-freedreno-a630-565nozs-fails.txt | 0
.../deqp-freedreno-a630-multisample-fails.txt | 0
4 files changed, 86 insertions(+), 58 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ad2268d7d5..932f9e0f698 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1257,26 +1257,6 @@ arm64_a630_gles3:
variables:
DEQP_VER: gles3
-# We almost always manage to lower UBOs back to constant uploads in
-# the test suite, so get a little testing for it here.
-arm64_a630_noubo:
- extends: arm64_a630_gles31
- variables:
- DEQP_VER: gles31
- IR3_SHADER_DEBUG: nouboopt
- DEQP_CASELIST_FILTER: "functional.*ubo"
-
-# The driver does some guessing as to whether to render using gmem
-# or bypass, and some GLES3.1 features interact with either one.
-# Do a little testing with gmem and bypass forced.
-arm64_a630_bypass:
- extends: arm64_a630_gles31
- variables:
- CI_NODE_INDEX: 1
- CI_NODE_TOTAL: 5
- FD_MESA_DEBUG: nogmem
- DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
-
arm64_a630_traces:
extends:
- arm64_a630_gles2
@@ -1294,50 +1274,15 @@ arm64_a630_traces:
reports:
junit: results/junit.xml
-# Along with checking gmem path, check that we don't get obvious nir
-# validation failures (though it's too expensive to have it on for the
-# full CTS)
-arm64_a630_gmem:
- extends: arm64_a630_gles31
- variables:
- CI_NODE_INDEX: 1
- CI_NODE_TOTAL: 5
- FD_MESA_DEBUG: nobypass
-
arm64_a630_gl:
extends: arm64_a630_gles2
variables:
DEQP_VER: gl30
-# disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-.arm64_a630_gles3_multisample:
- extends: arm64_a630_gles3
- variables:
- DEQP_CONFIG: rgba8888d24s8ms4
- DEQP_VARIANT: multisample
- DEQP_EXPECTED_FAILS: deqp-freedreno-a630-multisample-fails.txt
-
-# disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-.arm64_a630_gles31_multisample:
- extends: arm64_a630_gles31
- variables:
- DEQP_CONFIG: rgba8888d24s8ms4
- DEQP_VARIANT: multisample
- DEQP_EXPECTED_FAILS: deqp-freedreno-a630-multisample-fails.txt
-
-arm64_a630_gles3_565nozs:
- extends: arm64_a630_gles3
- variables:
- DEQP_CONFIG: rgb565d0s0ms0
- DEQP_VARIANT: 565-no-depth-no-stencil
- DEQP_EXPECTED_FAILS: deqp-freedreno-a630-565nozs-fails.txt
-
-arm64_a630_gles31_565nozs:
- extends: arm64_a630_gles31
+arm64_a630_gles_others:
+ extends: arm64_a630_gles2
variables:
- DEQP_CONFIG: rgb565d0s0ms0
- DEQP_VARIANT: 565-no-depth-no-stencil
- DEQP_EXPECTED_FAILS: deqp-freedreno-a630-565nozs-fails.txt
+ BARE_METAL_TEST_SCRIPT: "/install/bare-metal/arm64_a630_gles_others.sh"
arm64_a630_vk:
extends: arm64_a630_gles2
diff --git a/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh b/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh
new file mode 100755
index 00000000000..c10d4b5bd58
--- /dev/null
+++ b/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# This test script groups together a bunch of fast dEQP variant runs
+# to amortize the cost of rebooting the board.
+
+set -ex
+
+EXIT=0
+
+# Test rendering with the gmem path forced when possible (~1 minute)
+if ! env \
+ DEQP_RESULTS_DIR=results/gmem \
+ DEQP_VER=gles31 \
+ CI_NODE_INDEX=1 \
+ CI_NODE_TOTAL=5 \
+ FD_MESA_DEBUG=nobypass \
+ /install/deqp-runner.sh; then
+ EXIT=1
+fi
+
+# Test rendering with the bypass path forced when possible (~1 minute)
+if ! env \
+ DEQP_RESULTS_DIR=results/bypass \
+ DEQP_VER=gles31 \
+ CI_NODE_INDEX=1 \
+ CI_NODE_TOTAL=5 \
+ FD_MESA_DEBUG=nogmem \
+ DEQP_EXPECTED_FAILS=deqp-freedreno-a630-bypass-fails.txt \
+ /install/deqp-runner.sh; then
+ EXIT=1
+fi
+
+# Test rendering with the UBO-to-constants optimization disabled (~1 minute)
+if ! env \
+ DEQP_RESULTS_DIR=results/nouboopt \
+ DEQP_VER=gles31 \
+ IR3_SHADER_DEBUG=nouboopt \
+ DEQP_CASELIST_FILTER="functional.*ubo" \
+ /install/deqp-runner.sh; then
+ EXIT=1
+fi
+
+# gles3-565nozs mustpass (~20s)
+if ! env \
+ DEQP_RESULTS_DIR=results/gles3-565nozs \
+ DEQP_VER=gles3 \
+ DEQP_CONFIG="rgb565d0s0ms0" \
+ DEQP_VARIANT="565-no-depth-no-stencil" \
+ /install/deqp-runner.sh; then
+ EXIT=1
+fi
+
+# gles31-565nozs mustpass (~1s)
+if ! env \
+ DEQP_RESULTS_DIR=results/gles31-565nozs \
+ DEQP_VER=gles31 \
+ DEQP_CONFIG="rgb565d0s0ms0" \
+ DEQP_VARIANT="565-no-depth-no-stencil" \
+ /install/deqp-runner.sh; then
+ EXIT=1
+fi
+
+# gles3-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
+# if ! env \
+# DEQP_RESULTS_DIR=results/gles3-multisample \
+# DEQP_VER=gles3 \
+# DEQP_CONFIG="rgba8888d24s8ms4" \
+# DEQP_VARIANT="multisample" \
+# /install/deqp-runner.sh; then
+# EXIT=1
+# fi
+
+# gles31-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
+# if ! env \
+# DEQP_RESULTS_DIR=results/gles31-multisample \
+# DEQP_VER=gles31 \
+# DEQP_CONFIG="rgba8888d24s8ms4" \
+# DEQP_VARIANT="multisample" \
+# /install/deqp-runner.sh; then
+# EXIT=1
+# fi
+
+exit $EXIT
diff --git a/.gitlab-ci/deqp-freedreno-a630-565nozs-fails.txt b/.gitlab-ci/deqp-freedreno-a630-565nozs-fails.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.gitlab-ci/deqp-freedreno-a630-multisample-fails.txt b/.gitlab-ci/deqp-freedreno-a630-multisample-fails.txt
deleted file mode 100644
index e69de29bb2d..00000000000
More information about the mesa-commit
mailing list