fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: performance traces: make use of no-perf label

Browse source 
Traces with label `no-perf` will be skipped in performance testing.

This commit adds the yq tool, which preprocesses the traces.yml file
before sending it to the piglit.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18329>
This commit is contained in:
David Heidelberg 2022-09-03 20:54:40 +02:00 • committed by Marge Bot
parent 2b8a14e076
commit f2649b93e2
6 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci/container/create-rootfs.sh
View file

@ -105,6 +105,9 @@ apt-get -y install --no-install-recommends \
# MinIO and doesn't depend on git # MinIO and doesn't depend on git
pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
# Needed for manipulation with traces yaml files.
pip3 install yq
apt-get purge -y \ apt-get purge -y \
$INSTALL_CI_FAIRY_PACKAGES $INSTALL_CI_FAIRY_PACKAGES

3
.gitlab-ci/container/debian/x86_test-base.sh
View file

@ -114,6 +114,9 @@ mkdir -p /lava-files/
# and doesn't depend on git # and doesn't depend on git
pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
# Needed for manipulation with traces yaml files.
pip3 install yq
############### Build libdrm ############### Build libdrm
. .gitlab-ci/container/build-libdrm.sh . .gitlab-ci/container/build-libdrm.sh

7
.gitlab-ci/piglit/piglit-traces.sh
View file

@ -8,6 +8,11 @@ MINIO_ARGS="--credentials=/tmp/.minio_credentials"
RESULTS=$(realpath -s "$PWD"/results) RESULTS=$(realpath -s "$PWD"/results)
mkdir -p "$RESULTS" mkdir -p "$RESULTS"
if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
yq -i -Y '. | del(.traces[][] | select(.label[0,1,2,3,4,5,6,7,8,9] == "no-perf"))' \
"$PIGLIT_REPLAY_DESCRIPTION_FILE" # label positions are a bit hack
fi
# WINE # WINE
PATH="/opt/wine-stable/bin/:$PATH" # WineHQ path PATH="/opt/wine-stable/bin/:$PATH" # WineHQ path
export WINEPREFIX="/dxvk-wine64" # hardcode DXVK for now export WINEPREFIX="/dxvk-wine64" # hardcode DXVK for now
@ -186,7 +191,7 @@ __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
__MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
__MINIO_TRACES_PREFIX="traces" __MINIO_TRACES_PREFIX="traces"
if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then if [ "$PIGLIT_REPLAY_SUBCOMMAND" != "profile" ]; then
quiet replay_minio_upload_images quiet replay_minio_upload_images
fi fi

2
src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
View file

@ -225,7 +225,7 @@ traces:
Assertion `attrib->_EffRelativeOffset < binding->Stride' failed. Assertion `attrib->_EffRelativeOffset < binding->Stride' failed.
nheko/nheko-colors.trace: nheko/nheko-colors.trace:
gl-virgl: gl-virgl:
label: [skip, no-perf] label: [no-perf]
checksum: 9877fc41ce761c9ce15561b12ef77c27 checksum: 9877fc41ce761c9ce15561b12ef77c27
warzone2100/warzone2100-default.trace: warzone2100/warzone2100-default.trace:
gl-virgl: gl-virgl:

2
src/gallium/drivers/virgl/ci/traces-virgl.yml
View file

@ -219,7 +219,7 @@ traces:
Assertion `attrib->_EffRelativeOffset < binding->Stride' failed. Assertion `attrib->_EffRelativeOffset < binding->Stride' failed.
nheko/nheko-colors.trace: nheko/nheko-colors.trace:
gl-virgl: gl-virgl:
label: [skip, no-perf] label: [no-perf]
checksum: 3a12c08087e16cfae4729f4e9d6c9387 checksum: 3a12c08087e16cfae4729f4e9d6c9387
warzone2100/warzone2100-default.trace: warzone2100/warzone2100-default.trace:
gl-virgl: gl-virgl:

12
src/intel/ci/traces-iris.yml
View file

@ -900,23 +900,23 @@ traces:
checksum: 3d419f45bc5ce210a7df583e92143089 checksum: 3d419f45bc5ce210a7df583e92143089
blender/blender-demo-cube_diorama.trace: blender/blender-demo-cube_diorama.trace:
gl-intel-apl: gl-intel-apl:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
text: causes intermittent timeouts text: causes intermittent timeouts
gl-intel-glx: gl-intel-glx:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
gl-intel-amly: gl-intel-amly:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
gl-intel-kbl: gl-intel-kbl:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
gl-intel-whl: gl-intel-whl:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
gl-intel-cml: gl-intel-cml:
label: [skip, no-perf] label: [no-perf]
checksum: 6a0e17d98eca33e80810b6158e998aa1 checksum: 6a0e17d98eca33e80810b6158e998aa1
blender/blender-demo-ellie_pose.trace: blender/blender-demo-ellie_pose.trace:
gl-intel-apl: gl-intel-apl: