KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci/deqp-runner: Simplify the --jobs argument setup. 

We can use the general "how parallel should we go on this runner?" env var
and save a bunch of massaging env var names.  Fixes how PIGLIT_PARALLEL
looked like it was useful but actually wasn't passed through to HW
runners.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372>
This commit is contained in:
Emma Anholt 2021-10-11 16:03:47 -07:00 committed by Marge Bot
parent 59f3a8e6b4
commit 9ddfd297e0
12 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1347,4 +1347,4 @@ debian-mingw32-x86_64:
.baremetal-deqp-test:
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_PARALLEL: 0 # Default to number of CPUs
FDO_CI_CONCURRENT: 0 # Default to number of CPUs

2
.gitlab-ci/bare-metal/arm64_a630_egl.sh
View File

@ -10,7 +10,7 @@ EXIT=0
# Run reset tests without parallelism:
if ! env \
DEQP_RESULTS_DIR=results/reset \
DEQP_PARALLEL=1 \
FDO_CI_CONCURRENT=1 \
DEQP_CASELIST_FILTER='.*reset.*' \
/install/deqp-runner.sh; then
EXIT=1

1
.gitlab-ci/common/generate-env.sh
View File

@ -26,7 +26,6 @@ for var in \
DEQP_EXPECTED_RENDERER \
DEQP_FRACTION \
DEQP_HEIGHT \
DEQP_PARALLEL \
DEQP_RESULTS_DIR \
DEQP_RUNNER_OPTIONS \
DEQP_SUITE \

12
.gitlab-ci/deqp-runner.sh
View File

@ -120,14 +120,6 @@ fi
set +e
if [ -n "$DEQP_PARALLEL" ]; then
JOB="--jobs $DEQP_PARALLEL"
elif [ -n "$FDO_CI_CONCURRENT" ]; then
JOB="--jobs $FDO_CI_CONCURRENT"
else
JOB="--jobs 4"
fi
parse_renderer() {
RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
@ -216,7 +208,7 @@ if [ -z "$DEQP_SUITE" ]; then
--skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
--flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
--testlog-to-xml /deqp/executor/testlog-to-xml \
$JOB \
--jobs ${FDO_CI_CONCURRENT:-4} \
$DEQP_RUNNER_OPTIONS \
-- \
$DEQP_OPTIONS
@ -230,7 +222,7 @@ else
--testlog-to-xml /deqp/executor/testlog-to-xml \
--fraction-start $CI_NODE_INDEX \
--fraction $CI_NODE_TOTAL \
$JOB \
--jobs ${FDO_CI_CONCURRENT:-4} \
$DEQP_RUNNER_OPTIONS
fi

2
.gitlab-ci/lava/lava-gitlab-ci.yml
View File

@ -5,7 +5,7 @@
interruptible: true
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
DEQP_PARALLEL: 6 # should be replaced by per-machine definitions
FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions
DEQP_VER: gles2
# proxy used to cache data locally
FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="

9
.gitlab-ci/piglit/piglit-runner.sh
View File

@ -53,14 +53,6 @@ fi
set +e
if [ -n "$PIGLIT_PARALLEL" ]; then
PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs $PIGLIT_PARALLEL"
elif [ -n "$FDO_CI_CONCURRENT" ]; then
PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs $FDO_CI_CONCURRENT"
else
PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --jobs 4"
fi
RESULTS_CSV=$RESULTS/results.csv
FAILURES_CSV=$RESULTS/failures.csv
@ -70,6 +62,7 @@ export LD_PRELOAD=$TEST_LD_PRELOAD
run \
--piglit-folder /piglit \
--output $RESULTS \
--jobs ${FDO_CI_CONCURRENT:-4} \
--skips $INSTALL/piglit/piglit-all-skips.txt $PIGLIT_SKIPS \
--flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \
--profile $PIGLIT_PROFILES \

2
src/amd/ci/gitlab-ci.yml
View File

@ -64,7 +64,7 @@ radv_stoney_vkcts:amd64:
variables:
DEQP_VER: vk
DEQP_FRACTION: 10
DEQP_PARALLEL: 4
FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: STONEY
DEVICE_TYPE: hp-11A-G6-EE-grunt
DTB: ""

4
src/freedreno/ci/gitlab-ci.yml
View File

@ -121,7 +121,7 @@ a530-traces:
extends:
- .freedreno-test
variables:
DEQP_PARALLEL: 10
FDO_CI_CONCURRENT: 10
BM_KERNEL: /baremetal-files/cheza-kernel
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
GPU_VERSION: freedreno-a630
@ -190,7 +190,7 @@ a630_vk_asan:
- .test-manual
variables:
DEQP_FRACTION: 100
DEQP_PARALLEL: 4 # We get OOMkills if we go too wide with asan enabled
FDO_CI_CONCURRENT: 4 # We get OOMkills if we go too wide with asan enabled
TU_DEBUG: forcebin
# Disable the leak checks, since the library gets dlclose()d and thus get
# totally useless leak reports. We can still catch buffer overflows.

2
src/gallium/drivers/lima/ci/gitlab-ci.yml
View File

@ -7,7 +7,7 @@ lima-mali450-test:arm64:
DTB: ${DEVICE_TYPE}
FDO_HTTP_CACHE_URI: ''
GPU_VERSION: lima
DEQP_PARALLEL: 4
FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: Mali450
VISIBILITY_GROUP: "mesa-ci"

6
src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
View File

@ -9,7 +9,7 @@
KERNEL_IMAGE_TYPE: ""
HWCI_KERNEL_MODULES: amdgpu
DRIVER_NAME: radeonsi
DEQP_PARALLEL: 4
FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: STONEY
HWCI_FREQ_MAX: "true"
tags:
@ -33,7 +33,7 @@ radeonsi-stoney-gles3:amd64:
parallel: 2
variables:
DEQP_VER: gles3
DEQP_PARALLEL: 4
FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: STONEY
DEQP_FRACTION: 2
@ -45,7 +45,7 @@ radeonsi-stoney-gles31:amd64:
parallel: 2
variables:
DEQP_VER: gles31
DEQP_PARALLEL: 4
FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: STONEY
DEQP_FRACTION: 2

2
src/gallium/drivers/virgl/ci/gitlab-ci.yml
View File

@ -14,7 +14,7 @@ virgl-on-gl:
GPU_VERSION: virgl-gl
# Speed rendering a bit, as crosvm is processing requests serially
LP_NUM_THREADS: 8
DEQP_PARALLEL: 3
FDO_CI_CONCURRENT: 3
DEQP_EXPECTED_RENDERER: virgl
CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh"
parallel: 6

10
src/panfrost/ci/gitlab-ci.yml
View File

@ -14,7 +14,7 @@ panfrost-t720-gles2:arm64:
DTB: $DEVICE_TYPE
GPU_VERSION: panfrost-t720
DEQP_SUITE: panfrost-t720
DEQP_PARALLEL: 6
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T720
tags:
- mesa-ci-x86-64-lava-sun50i-h6-pine-h64
@ -31,7 +31,7 @@ panfrost-t760-gles2:armhf:
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
DEQP_SUITE: panfrost-t720
DEQP_PARALLEL: 6
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T760
tags:
- mesa-ci-x86-64-lava-rk3288-veyron-jaq
@ -80,7 +80,7 @@ panfrost-t860-gl:arm64:
- .lava-test:arm64
- .lava-rk3399-gru-kevin
variables:
DEQP_PARALLEL: 6
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T860
DEQP_SUITE: panfrost-t860
@ -116,7 +116,7 @@ panfrost-g52-gl:arm64:
- .lava-test:arm64
- .lava-meson-g12b-a311d-khadas-vim3
variables:
DEQP_PARALLEL: 6
FDO_CI_CONCURRENT: 6
DEQP_SUITE: panfrost-g52
DEQP_EXPECTED_RENDERER: G52
PAN_MESA_DEBUG: "deqp,sync,indirect"
@ -176,7 +176,7 @@ panfrost-g72-gl:arm64:
DEVICE_TYPE: meson-gxm-khadas-vim2
DTB: $DEVICE_TYPE
GPU_VERSION: panfrost-t820
DEQP_PARALLEL: 6
FDO_CI_CONCURRENT: 6
DEQP_EXPECTED_RENDERER: T820
DEQP_SUITE: panfrost-t720
tags: