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@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6971>
This commit is contained in:
Eric Anholt
Marge Bot
parent
bf576b449e
commit
2998a0b055
|
|
@ -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
|
||||
arm64_a630_gles_others:
|
||||
extends: arm64_a630_gles2
|
||||
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
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Reference in New Issue