From a8c77451097c6d68f543dd3ada312f6d6dc2f48e Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Mon, 25 Oct 2021 10:27:10 -0700
Subject: [PATCH] ci/deqp-runner: Rename the deqp-drivername-*.txt files to
 drivername-*.txt

We have two testsuites with the same format for fails/flakes/skips files,
and test names that are definitely unique.  As I'm about to add a third
testsuite (gtest for libva-utils), so let's have just one file each for
fails/flakes/skips instead of one per type of testsuite.  This starts the
move with just the bulk rename of deqp.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13517>
(cherry picked from commit 38dff02bfb1f237ded1e2075e560ec06b52fadcf)
---
 .../{deqp-all-skips.txt => all-skips.txt}     |  0
 .gitlab-ci/deqp-runner.sh                     | 34 +++++++++----------
 .gitlab-ci/prepare-artifacts.sh               |  2 +-
 .pick_status.json                             |  2 +-
 ...o-fails.txt => radv-bonaire-aco-fails.txt} |  0
 ...o-skips.txt => radv-bonaire-aco-skips.txt} |  0
 ...-aco-fails.txt => radv-fiji-aco-fails.txt} |  0
 ...co-fails.txt => radv-hawaii-aco-fails.txt} |  0
 ...co-skips.txt => radv-hawaii-aco-skips.txt} |  0
 ...co-fails.txt => radv-navi10-aco-fails.txt} |  0
 ...co-fails.txt => radv-navi14-aco-fails.txt} |  0
 ...aco-fails.txt => radv-oland-aco-fails.txt} |  0
 ...-fails.txt => radv-pitcairn-aco-fails.txt} |  0
 ...fails.txt => radv-polaris10-aco-fails.txt} |  0
 ...aco-fails.txt => radv-raven-aco-fails.txt} |  0
 ...o-flakes.txt => radv-raven-aco-flakes.txt} |  0
 ...aco-skips.txt => radv-raven-aco-skips.txt} |  0
 ...co-fails.txt => radv-renoir-aco-fails.txt} |  0
 ...-flakes.txt => radv-renoir-aco-flakes.txt} |  0
 ....txt => radv-sienna_cichlid-aco-fails.txt} |  0
 .../{deqp-radv-skips.txt => radv-skips.txt}   |  0
 ...co-fails.txt => radv-stoney-aco-fails.txt} |  0
 ...-flakes.txt => radv-stoney-aco-flakes.txt} |  0
 ...co-skips.txt => radv-stoney-aco-skips.txt} |  0
 ...o-fails.txt => radv-vangogh-aco-fails.txt} |  0
 ...co-fails.txt => radv-vega10-aco-fails.txt} |  0
 ...-flakes.txt => radv-vega10-aco-flakes.txt} |  0
 ...-v3d-rpi4-fails.txt => v3d-rpi4-fails.txt} |  0
 ...3d-rpi4-flakes.txt => v3d-rpi4-flakes.txt} |  0
 ...v-rpi4-flakes.txt => v3dv-rpi4-flakes.txt} |  0
 ...3dv-rpi4-skips.txt => v3dv-rpi4-skips.txt} |  0
 ...-vc4-rpi3-fails.txt => vc4-rpi3-fails.txt} |  0
 ...c4-rpi3-flakes.txt => vc4-rpi3-flakes.txt} |  0
 ...-vc4-rpi3-skips.txt => vc4-rpi3-skips.txt} |  0
 ...000-fails.txt => etnaviv-gc2000-fails.txt} |  0
 ...0-flakes.txt => etnaviv-gc2000-flakes.txt} |  0
 src/freedreno/ci/deqp-freedreno-a630-vk.toml  |  6 ++--
 src/freedreno/ci/deqp-freedreno-a630.toml     | 26 +++++++-------
 ...307-fails.txt => freedreno-a307-fails.txt} |  0
 ...7-flakes.txt => freedreno-a307-flakes.txt} |  0
 ...530-fails.txt => freedreno-a530-fails.txt} |  0
 ...0-flakes.txt => freedreno-a530-flakes.txt} |  0
 ...530-skips.txt => freedreno-a530-skips.txt} |  0
 ...ails.txt => freedreno-a630-asan-fails.txt} |  0
 ...s.txt => freedreno-a630-bypass-flakes.txt} |  0
 ...630-fails.txt => freedreno-a630-fails.txt} |  0
 ...0-flakes.txt => freedreno-a630-flakes.txt} |  0
 ....txt => freedreno-a630-premerge-skips.txt} |  0
 ...630-skips.txt => freedreno-a630-skips.txt} |  0
 ...-i915-g33-fails.txt => i915-g33-fails.txt} |  0
 ...-i915-g33-skips.txt => i915-g33-skips.txt} |  0
 .../drivers/iris/ci/deqp-iris-amly.toml       | 16 ++++-----
 .../drivers/iris/ci/deqp-iris-apl.toml        | 16 ++++-----
 .../drivers/iris/ci/deqp-iris-cml.toml        | 16 ++++-----
 .../drivers/iris/ci/deqp-iris-glk.toml        | 16 ++++-----
 .../drivers/iris/ci/deqp-iris-kbl.toml        | 16 ++++-----
 .../drivers/iris/ci/deqp-iris-whl.toml        | 16 ++++-----
 ...ris-amly-fails.txt => iris-amly-fails.txt} |  0
 ...-iris-apl-fails.txt => iris-apl-fails.txt} |  0
 ...-iris-cml-fails.txt => iris-cml-fails.txt} |  0
 ...-iris-glk-fails.txt => iris-glk-fails.txt} |  0
 ...ris-glk-flakes.txt => iris-glk-flakes.txt} |  0
 ...-iris-kbl-fails.txt => iris-kbl-fails.txt} |  0
 .../{deqp-iris-skips.txt => iris-skips.txt}   |  0
 ...-iris-whl-fails.txt => iris-whl-fails.txt} |  0
 .../{deqp-lima-fails.txt => lima-fails.txt}   |  0
 .../{deqp-lima-skips.txt => lima-skips.txt}   |  0
 .../llvmpipe/ci/deqp-llvmpipe-asan.toml       |  2 +-
 ...-llvmpipe-fails.txt => llvmpipe-fails.txt} |  0
 ...lvmpipe-flakes.txt => llvmpipe-flakes.txt} |  0
 ...-llvmpipe-skips.txt => llvmpipe-skips.txt} |  0
 ...ey-fails.txt => radeonsi-stoney-fails.txt} |  0
 ...asan-fails.txt => softpipe-asan-fails.txt} |  0
 ...-softpipe-fails.txt => softpipe-fails.txt} |  0
 ...oftpipe-flakes.txt => softpipe-flakes.txt} |  0
 ...-softpipe-skips.txt => softpipe-skips.txt} |  0
 ...-virgl-gl-fails.txt => virgl-gl-fails.txt} |  0
 ...irgl-gl-flakes.txt => virgl-gl-flakes.txt} |  0
 ...-virgl-gl-skips.txt => virgl-gl-skips.txt} |  0
 ...gl-gles-fails.txt => virgl-gles-fails.txt} |  0
 ...-zink-lvp-fails.txt => zink-lvp-fails.txt} |  0
 ...ink-lvp-flakes.txt => zink-lvp-flakes.txt} |  0
 ...-zink-lvp-skips.txt => zink-lvp-skips.txt} |  0
 ...-lvp-asan-fails.txt => lvp-asan-fails.txt} |  0
 ...-lvp-asan-skips.txt => lvp-asan-skips.txt} |  0
 .../ci/{deqp-lvp-fails.txt => lvp-fails.txt}  |  0
 .../{deqp-lvp-flakes.txt => lvp-flakes.txt}   |  0
 .../ci/{deqp-lvp-skips.txt => lvp-skips.txt}  |  0
 ...t-g52-fails.txt => panfrost-g52-fails.txt} |  0
 ...g52-flakes.txt => panfrost-g52-flakes.txt} |  0
 ...t-g52-skips.txt => panfrost-g52-skips.txt} |  0
 ...t-g72-fails.txt => panfrost-g72-fails.txt} |  0
 ...g72-flakes.txt => panfrost-g72-flakes.txt} |  0
 ...t720-fails.txt => panfrost-t720-fails.txt} |  0
 ...20-flakes.txt => panfrost-t720-flakes.txt} |  0
 ...t720-skips.txt => panfrost-t720-skips.txt} |  0
 ...t760-fails.txt => panfrost-t760-fails.txt} |  0
 ...60-flakes.txt => panfrost-t760-flakes.txt} |  0
 ...t820-fails.txt => panfrost-t820-fails.txt} |  0
 ...t860-fails.txt => panfrost-t860-fails.txt} |  0
 ...60-flakes.txt => panfrost-t860-flakes.txt} |  0
 ...t860-skips.txt => panfrost-t860-skips.txt} |  0
 102 files changed, 84 insertions(+), 84 deletions(-)
 rename .gitlab-ci/{deqp-all-skips.txt => all-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-bonaire-aco-fails.txt => radv-bonaire-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-bonaire-aco-skips.txt => radv-bonaire-aco-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-fiji-aco-fails.txt => radv-fiji-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-hawaii-aco-fails.txt => radv-hawaii-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-hawaii-aco-skips.txt => radv-hawaii-aco-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-navi10-aco-fails.txt => radv-navi10-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-navi14-aco-fails.txt => radv-navi14-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-oland-aco-fails.txt => radv-oland-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-pitcairn-aco-fails.txt => radv-pitcairn-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-polaris10-aco-fails.txt => radv-polaris10-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-raven-aco-fails.txt => radv-raven-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-raven-aco-flakes.txt => radv-raven-aco-flakes.txt} (100%)
 rename src/amd/ci/{deqp-radv-raven-aco-skips.txt => radv-raven-aco-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-renoir-aco-fails.txt => radv-renoir-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-renoir-aco-flakes.txt => radv-renoir-aco-flakes.txt} (100%)
 rename src/amd/ci/{deqp-radv-sienna_cichlid-aco-fails.txt => radv-sienna_cichlid-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-skips.txt => radv-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-stoney-aco-fails.txt => radv-stoney-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-stoney-aco-flakes.txt => radv-stoney-aco-flakes.txt} (100%)
 rename src/amd/ci/{deqp-radv-stoney-aco-skips.txt => radv-stoney-aco-skips.txt} (100%)
 rename src/amd/ci/{deqp-radv-vangogh-aco-fails.txt => radv-vangogh-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-vega10-aco-fails.txt => radv-vega10-aco-fails.txt} (100%)
 rename src/amd/ci/{deqp-radv-vega10-aco-flakes.txt => radv-vega10-aco-flakes.txt} (100%)
 rename src/broadcom/ci/{deqp-v3d-rpi4-fails.txt => v3d-rpi4-fails.txt} (100%)
 rename src/broadcom/ci/{deqp-v3d-rpi4-flakes.txt => v3d-rpi4-flakes.txt} (100%)
 rename src/broadcom/ci/{deqp-v3dv-rpi4-flakes.txt => v3dv-rpi4-flakes.txt} (100%)
 rename src/broadcom/ci/{deqp-v3dv-rpi4-skips.txt => v3dv-rpi4-skips.txt} (100%)
 rename src/broadcom/ci/{deqp-vc4-rpi3-fails.txt => vc4-rpi3-fails.txt} (100%)
 rename src/broadcom/ci/{deqp-vc4-rpi3-flakes.txt => vc4-rpi3-flakes.txt} (100%)
 rename src/broadcom/ci/{deqp-vc4-rpi3-skips.txt => vc4-rpi3-skips.txt} (100%)
 rename src/etnaviv/ci/{deqp-etnaviv-gc2000-fails.txt => etnaviv-gc2000-fails.txt} (100%)
 rename src/etnaviv/ci/{deqp-etnaviv-gc2000-flakes.txt => etnaviv-gc2000-flakes.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a307-fails.txt => freedreno-a307-fails.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a307-flakes.txt => freedreno-a307-flakes.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a530-fails.txt => freedreno-a530-fails.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a530-flakes.txt => freedreno-a530-flakes.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a530-skips.txt => freedreno-a530-skips.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-asan-fails.txt => freedreno-a630-asan-fails.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-bypass-flakes.txt => freedreno-a630-bypass-flakes.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-fails.txt => freedreno-a630-fails.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-flakes.txt => freedreno-a630-flakes.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-premerge-skips.txt => freedreno-a630-premerge-skips.txt} (100%)
 rename src/freedreno/ci/{deqp-freedreno-a630-skips.txt => freedreno-a630-skips.txt} (100%)
 rename src/gallium/drivers/i915/ci/{deqp-i915-g33-fails.txt => i915-g33-fails.txt} (100%)
 rename src/gallium/drivers/i915/ci/{deqp-i915-g33-skips.txt => i915-g33-skips.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-amly-fails.txt => iris-amly-fails.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-apl-fails.txt => iris-apl-fails.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-cml-fails.txt => iris-cml-fails.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-glk-fails.txt => iris-glk-fails.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-glk-flakes.txt => iris-glk-flakes.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-kbl-fails.txt => iris-kbl-fails.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-skips.txt => iris-skips.txt} (100%)
 rename src/gallium/drivers/iris/ci/{deqp-iris-whl-fails.txt => iris-whl-fails.txt} (100%)
 rename src/gallium/drivers/lima/ci/{deqp-lima-fails.txt => lima-fails.txt} (100%)
 rename src/gallium/drivers/lima/ci/{deqp-lima-skips.txt => lima-skips.txt} (100%)
 rename src/gallium/drivers/llvmpipe/ci/{deqp-llvmpipe-fails.txt => llvmpipe-fails.txt} (100%)
 rename src/gallium/drivers/llvmpipe/ci/{deqp-llvmpipe-flakes.txt => llvmpipe-flakes.txt} (100%)
 rename src/gallium/drivers/llvmpipe/ci/{deqp-llvmpipe-skips.txt => llvmpipe-skips.txt} (100%)
 rename src/gallium/drivers/radeonsi/ci/{deqp-radeonsi-stoney-fails.txt => radeonsi-stoney-fails.txt} (100%)
 rename src/gallium/drivers/softpipe/ci/{deqp-softpipe-asan-fails.txt => softpipe-asan-fails.txt} (100%)
 rename src/gallium/drivers/softpipe/ci/{deqp-softpipe-fails.txt => softpipe-fails.txt} (100%)
 rename src/gallium/drivers/softpipe/ci/{deqp-softpipe-flakes.txt => softpipe-flakes.txt} (100%)
 rename src/gallium/drivers/softpipe/ci/{deqp-softpipe-skips.txt => softpipe-skips.txt} (100%)
 rename src/gallium/drivers/virgl/ci/{deqp-virgl-gl-fails.txt => virgl-gl-fails.txt} (100%)
 rename src/gallium/drivers/virgl/ci/{deqp-virgl-gl-flakes.txt => virgl-gl-flakes.txt} (100%)
 rename src/gallium/drivers/virgl/ci/{deqp-virgl-gl-skips.txt => virgl-gl-skips.txt} (100%)
 rename src/gallium/drivers/virgl/ci/{deqp-virgl-gles-fails.txt => virgl-gles-fails.txt} (100%)
 rename src/gallium/drivers/zink/ci/{deqp-zink-lvp-fails.txt => zink-lvp-fails.txt} (100%)
 rename src/gallium/drivers/zink/ci/{deqp-zink-lvp-flakes.txt => zink-lvp-flakes.txt} (100%)
 rename src/gallium/drivers/zink/ci/{deqp-zink-lvp-skips.txt => zink-lvp-skips.txt} (100%)
 rename src/gallium/frontends/lavapipe/ci/{deqp-lvp-asan-fails.txt => lvp-asan-fails.txt} (100%)
 rename src/gallium/frontends/lavapipe/ci/{deqp-lvp-asan-skips.txt => lvp-asan-skips.txt} (100%)
 rename src/gallium/frontends/lavapipe/ci/{deqp-lvp-fails.txt => lvp-fails.txt} (100%)
 rename src/gallium/frontends/lavapipe/ci/{deqp-lvp-flakes.txt => lvp-flakes.txt} (100%)
 rename src/gallium/frontends/lavapipe/ci/{deqp-lvp-skips.txt => lvp-skips.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-g52-fails.txt => panfrost-g52-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-g52-flakes.txt => panfrost-g52-flakes.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-g52-skips.txt => panfrost-g52-skips.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-g72-fails.txt => panfrost-g72-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-g72-flakes.txt => panfrost-g72-flakes.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t720-fails.txt => panfrost-t720-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t720-flakes.txt => panfrost-t720-flakes.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t720-skips.txt => panfrost-t720-skips.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t760-fails.txt => panfrost-t760-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t760-flakes.txt => panfrost-t760-flakes.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t820-fails.txt => panfrost-t820-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t860-fails.txt => panfrost-t860-fails.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t860-flakes.txt => panfrost-t860-flakes.txt} (100%)
 rename src/panfrost/ci/{deqp-panfrost-t860-skips.txt => panfrost-t860-skips.txt} (100%)

diff --git a/.gitlab-ci/deqp-all-skips.txt b/.gitlab-ci/all-skips.txt
similarity index 100%
rename from .gitlab-ci/deqp-all-skips.txt
rename to .gitlab-ci/all-skips.txt
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 983ca54d51f..ea1b8156430 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -3,7 +3,7 @@
 set -ex
 
 if [ -z "$GPU_VERSION" ]; then
-   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/deqp-gpu-version-*.txt)'
+   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/gpu-version-*.txt)'
    exit 1
 fi
 
@@ -85,28 +85,28 @@ if [ -z "$DEQP_SUITE" ]; then
     fi
 fi
 
-if [ -e "$INSTALL/deqp-$GPU_VERSION-fails.txt" ]; then
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --baseline $INSTALL/deqp-$GPU_VERSION-fails.txt"
+if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
+    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --baseline $INSTALL/$GPU_VERSION-fails.txt"
 fi
 
 # Default to an empty known flakes file if it doesn't exist.
-touch $INSTALL/deqp-$GPU_VERSION-flakes.txt
+touch $INSTALL/$GPU_VERSION-flakes.txt
 
 
-if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/deqp-$VK_DRIVER-skips.txt" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$VK_DRIVER-skips.txt"
+if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/$VK_DRIVER-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$VK_DRIVER-skips.txt"
 fi
 
-if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/deqp-$GALLIUM_DRIVER-skips.txt" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GALLIUM_DRIVER-skips.txt"
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/$GALLIUM_DRIVER-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GALLIUM_DRIVER-skips.txt"
 fi
 
-if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/deqp-$DRIVER_NAME-skips.txt" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$DRIVER_NAME-skips.txt"
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/$DRIVER_NAME-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$DRIVER_NAME-skips.txt"
 fi
 
-if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GPU_VERSION-skips.txt"
+if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
+    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
 fi
 
 set +e
@@ -152,8 +152,8 @@ if [ -z "$DEQP_SUITE" ]; then
         --deqp $DEQP \
         --output $RESULTS \
         --caselist /tmp/case-list.txt \
-        --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
-        --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
+        --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
         --testlog-to-xml /deqp/executor/testlog-to-xml \
         --jobs ${FDO_CI_CONCURRENT:-4} \
 	$DEQP_RUNNER_OPTIONS \
@@ -164,8 +164,8 @@ else
         suite \
         --suite $INSTALL/deqp-$DEQP_SUITE.toml \
         --output $RESULTS \
-        --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \
-        --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
+        --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
         --testlog-to-xml /deqp/executor/testlog-to-xml \
         --fraction-start $CI_NODE_INDEX \
         --fraction $CI_NODE_TOTAL \
@@ -202,7 +202,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
          --host irc.oftc.net \
          --port 6667 \
          --results $RESULTS/results.csv \
-         --known-flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \
+         --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
          --channel "$FLAKES_CHANNEL" \
          --runner "$CI_RUNNER_DESCRIPTION" \
          --job "$CI_JOB_ID" \
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index bbc37ef1419..04c4c7ab24f 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -34,7 +34,7 @@ cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/deqp-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-init.sh install/
-cp -Rp .gitlab-ci/deqp-*.txt install/
+cp -Rp .gitlab-ci/*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 find . -path \*/ci/\*.txt \
diff --git a/.pick_status.json b/.pick_status.json
index c9f4f1fbc28..8f2f2e64085 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3964,7 +3964,7 @@
         "description": "ci/deqp-runner: Rename the deqp-drivername-*.txt files to drivername-*.txt",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/ci/deqp-radv-bonaire-aco-fails.txt b/src/amd/ci/radv-bonaire-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-bonaire-aco-fails.txt
rename to src/amd/ci/radv-bonaire-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-bonaire-aco-skips.txt b/src/amd/ci/radv-bonaire-aco-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-bonaire-aco-skips.txt
rename to src/amd/ci/radv-bonaire-aco-skips.txt
diff --git a/src/amd/ci/deqp-radv-fiji-aco-fails.txt b/src/amd/ci/radv-fiji-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-fiji-aco-fails.txt
rename to src/amd/ci/radv-fiji-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-hawaii-aco-fails.txt b/src/amd/ci/radv-hawaii-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-hawaii-aco-fails.txt
rename to src/amd/ci/radv-hawaii-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-hawaii-aco-skips.txt b/src/amd/ci/radv-hawaii-aco-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-hawaii-aco-skips.txt
rename to src/amd/ci/radv-hawaii-aco-skips.txt
diff --git a/src/amd/ci/deqp-radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-navi10-aco-fails.txt
rename to src/amd/ci/radv-navi10-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-navi14-aco-fails.txt b/src/amd/ci/radv-navi14-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-navi14-aco-fails.txt
rename to src/amd/ci/radv-navi14-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-oland-aco-fails.txt b/src/amd/ci/radv-oland-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-oland-aco-fails.txt
rename to src/amd/ci/radv-oland-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt b/src/amd/ci/radv-pitcairn-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-pitcairn-aco-fails.txt
rename to src/amd/ci/radv-pitcairn-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-polaris10-aco-fails.txt b/src/amd/ci/radv-polaris10-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-polaris10-aco-fails.txt
rename to src/amd/ci/radv-polaris10-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-raven-aco-fails.txt b/src/amd/ci/radv-raven-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-raven-aco-fails.txt
rename to src/amd/ci/radv-raven-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-raven-aco-flakes.txt b/src/amd/ci/radv-raven-aco-flakes.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-raven-aco-flakes.txt
rename to src/amd/ci/radv-raven-aco-flakes.txt
diff --git a/src/amd/ci/deqp-radv-raven-aco-skips.txt b/src/amd/ci/radv-raven-aco-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-raven-aco-skips.txt
rename to src/amd/ci/radv-raven-aco-skips.txt
diff --git a/src/amd/ci/deqp-radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-renoir-aco-fails.txt
rename to src/amd/ci/radv-renoir-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-renoir-aco-flakes.txt b/src/amd/ci/radv-renoir-aco-flakes.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-renoir-aco-flakes.txt
rename to src/amd/ci/radv-renoir-aco-flakes.txt
diff --git a/src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt b/src/amd/ci/radv-sienna_cichlid-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt
rename to src/amd/ci/radv-sienna_cichlid-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-skips.txt b/src/amd/ci/radv-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-skips.txt
rename to src/amd/ci/radv-skips.txt
diff --git a/src/amd/ci/deqp-radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-stoney-aco-fails.txt
rename to src/amd/ci/radv-stoney-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-stoney-aco-flakes.txt b/src/amd/ci/radv-stoney-aco-flakes.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-stoney-aco-flakes.txt
rename to src/amd/ci/radv-stoney-aco-flakes.txt
diff --git a/src/amd/ci/deqp-radv-stoney-aco-skips.txt b/src/amd/ci/radv-stoney-aco-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-stoney-aco-skips.txt
rename to src/amd/ci/radv-stoney-aco-skips.txt
diff --git a/src/amd/ci/deqp-radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-vangogh-aco-fails.txt
rename to src/amd/ci/radv-vangogh-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-vega10-aco-fails.txt b/src/amd/ci/radv-vega10-aco-fails.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-vega10-aco-fails.txt
rename to src/amd/ci/radv-vega10-aco-fails.txt
diff --git a/src/amd/ci/deqp-radv-vega10-aco-flakes.txt b/src/amd/ci/radv-vega10-aco-flakes.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-vega10-aco-flakes.txt
rename to src/amd/ci/radv-vega10-aco-flakes.txt
diff --git a/src/broadcom/ci/deqp-v3d-rpi4-fails.txt b/src/broadcom/ci/v3d-rpi4-fails.txt
similarity index 100%
rename from src/broadcom/ci/deqp-v3d-rpi4-fails.txt
rename to src/broadcom/ci/v3d-rpi4-fails.txt
diff --git a/src/broadcom/ci/deqp-v3d-rpi4-flakes.txt b/src/broadcom/ci/v3d-rpi4-flakes.txt
similarity index 100%
rename from src/broadcom/ci/deqp-v3d-rpi4-flakes.txt
rename to src/broadcom/ci/v3d-rpi4-flakes.txt
diff --git a/src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt b/src/broadcom/ci/v3dv-rpi4-flakes.txt
similarity index 100%
rename from src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
rename to src/broadcom/ci/v3dv-rpi4-flakes.txt
diff --git a/src/broadcom/ci/deqp-v3dv-rpi4-skips.txt b/src/broadcom/ci/v3dv-rpi4-skips.txt
similarity index 100%
rename from src/broadcom/ci/deqp-v3dv-rpi4-skips.txt
rename to src/broadcom/ci/v3dv-rpi4-skips.txt
diff --git a/src/broadcom/ci/deqp-vc4-rpi3-fails.txt b/src/broadcom/ci/vc4-rpi3-fails.txt
similarity index 100%
rename from src/broadcom/ci/deqp-vc4-rpi3-fails.txt
rename to src/broadcom/ci/vc4-rpi3-fails.txt
diff --git a/src/broadcom/ci/deqp-vc4-rpi3-flakes.txt b/src/broadcom/ci/vc4-rpi3-flakes.txt
similarity index 100%
rename from src/broadcom/ci/deqp-vc4-rpi3-flakes.txt
rename to src/broadcom/ci/vc4-rpi3-flakes.txt
diff --git a/src/broadcom/ci/deqp-vc4-rpi3-skips.txt b/src/broadcom/ci/vc4-rpi3-skips.txt
similarity index 100%
rename from src/broadcom/ci/deqp-vc4-rpi3-skips.txt
rename to src/broadcom/ci/vc4-rpi3-skips.txt
diff --git a/src/etnaviv/ci/deqp-etnaviv-gc2000-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-fails.txt
similarity index 100%
rename from src/etnaviv/ci/deqp-etnaviv-gc2000-fails.txt
rename to src/etnaviv/ci/etnaviv-gc2000-fails.txt
diff --git a/src/etnaviv/ci/deqp-etnaviv-gc2000-flakes.txt b/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
similarity index 100%
rename from src/etnaviv/ci/deqp-etnaviv-gc2000-flakes.txt
rename to src/etnaviv/ci/etnaviv-gc2000-flakes.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk.toml b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
index a952787cc0d..43e2872f9a9 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 fraction = 3
 renderer_check = "Turnip Adreno .* 630"
 [deqp.env]
@@ -15,7 +15,7 @@ TU_DEBUG = "forcebin"
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 include = ["dEQP-VK.renderpass.*"]
 prefix = "bypass-"
 fraction = 15
@@ -25,7 +25,7 @@ TU_DEBUG = "sysmem"
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 include = ["dEQP-VK.graphicsfuzz.*"]
 prefix = "spill-"
 [deqp.env]
diff --git a/src/freedreno/ci/deqp-freedreno-a630.toml b/src/freedreno/ci/deqp-freedreno-a630.toml
index 4229229cd4f..28dd128fd55 100644
--- a/src/freedreno/ci/deqp-freedreno-a630.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -14,7 +14,7 @@ renderer_check = "FD630"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -24,7 +24,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -42,7 +42,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl33-master.txt",
 ]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -54,7 +54,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -70,14 +70,14 @@ FD_MESA_DEBUG = "nobypass"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 # note that this is in addition to normal flakes
-flakes = ["install/deqp-freedreno-a630-bypass-flakes.txt"]
+flakes = ["install/freedreno-a630-bypass-flakes.txt"]
 fraction = 5
 prefix = "bypass-"
 [deqp.env]
@@ -88,7 +88,7 @@ FD_MESA_DEBUG = "nogmem"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 include = ["functional.*ubo"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
@@ -104,7 +104,7 @@ IR3_SHADER_DEBUG = "nouboopt"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -115,7 +115,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -127,7 +127,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -138,7 +138,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -150,7 +150,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["install/deqp-freedreno-a630-premerge-skips.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
 include = ["functional.shaders"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
diff --git a/src/freedreno/ci/deqp-freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a307-fails.txt
rename to src/freedreno/ci/freedreno-a307-fails.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a307-flakes.txt b/src/freedreno/ci/freedreno-a307-flakes.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a307-flakes.txt
rename to src/freedreno/ci/freedreno-a307-flakes.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a530-fails.txt
rename to src/freedreno/ci/freedreno-a530-fails.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a530-flakes.txt b/src/freedreno/ci/freedreno-a530-flakes.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a530-flakes.txt
rename to src/freedreno/ci/freedreno-a530-flakes.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a530-skips.txt b/src/freedreno/ci/freedreno-a530-skips.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a530-skips.txt
rename to src/freedreno/ci/freedreno-a530-skips.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt b/src/freedreno/ci/freedreno-a630-asan-fails.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt
rename to src/freedreno/ci/freedreno-a630-asan-fails.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt b/src/freedreno/ci/freedreno-a630-bypass-flakes.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt
rename to src/freedreno/ci/freedreno-a630-bypass-flakes.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-fails.txt
rename to src/freedreno/ci/freedreno-a630-fails.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-flakes.txt
rename to src/freedreno/ci/freedreno-a630-flakes.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-premerge-skips.txt b/src/freedreno/ci/freedreno-a630-premerge-skips.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-premerge-skips.txt
rename to src/freedreno/ci/freedreno-a630-premerge-skips.txt
diff --git a/src/freedreno/ci/deqp-freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt
similarity index 100%
rename from src/freedreno/ci/deqp-freedreno-a630-skips.txt
rename to src/freedreno/ci/freedreno-a630-skips.txt
diff --git a/src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/i915-g33-fails.txt
similarity index 100%
rename from src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt
rename to src/gallium/drivers/i915/ci/i915-g33-fails.txt
diff --git a/src/gallium/drivers/i915/ci/deqp-i915-g33-skips.txt b/src/gallium/drivers/i915/ci/i915-g33-skips.txt
similarity index 100%
rename from src/gallium/drivers/i915/ci/deqp-i915-g33-skips.txt
rename to src/gallium/drivers/i915/ci/i915-g33-skips.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly.toml b/src/gallium/drivers/iris/ci/deqp-iris-amly.toml
index 28688cfa32f..4bb9f548ed8 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-amly.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-amly.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -14,7 +14,7 @@ renderer_check = "AML"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -24,7 +24,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -42,7 +42,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -53,7 +53,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -64,7 +64,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -76,7 +76,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -87,7 +87,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl.toml b/src/gallium/drivers/iris/ci/deqp-iris-apl.toml
index d945d8f59fe..bf1c808641a 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-apl.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-apl.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -14,7 +14,7 @@ renderer_check = "APL"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -25,7 +25,7 @@ fraction = 3
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -44,7 +44,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -55,7 +55,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -66,7 +66,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -78,7 +78,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -89,7 +89,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-cml.toml b/src/gallium/drivers/iris/ci/deqp-iris-cml.toml
index 313fb6fb570..82f658ecf77 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-cml.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-cml.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -15,7 +15,7 @@ renderer_check = "CML"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -26,7 +26,7 @@ fraction = 2
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -45,7 +45,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -56,7 +56,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -67,7 +67,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -79,7 +79,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -90,7 +90,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk.toml b/src/gallium/drivers/iris/ci/deqp-iris-glk.toml
index 34f02b4ac51..5d5de55c4ee 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-glk.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-glk.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -15,7 +15,7 @@ renderer_check = "GLK"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -26,7 +26,7 @@ fraction = 4
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -45,7 +45,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -56,7 +56,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -67,7 +67,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -79,7 +79,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -90,7 +90,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml b/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml
index e78ddf4374f..3db9ecb6d58 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-kbl.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -14,7 +14,7 @@ renderer_check = "KBL"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -24,7 +24,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -42,7 +42,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -53,7 +53,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -64,7 +64,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -76,7 +76,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -87,7 +87,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl.toml b/src/gallium/drivers/iris/ci/deqp-iris-whl.toml
index 4304b0094c0..dd5d178d77c 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-whl.toml
+++ b/src/gallium/drivers/iris/ci/deqp-iris-whl.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
 caselists = ["/deqp/mustpass/gles2-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -15,7 +15,7 @@ renderer_check = "WHL"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -26,7 +26,7 @@ fraction = 8
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -45,7 +45,7 @@ caselists = [
     "/deqp/mustpass/gles31-khr-master.txt",
     "/deqp/mustpass/gl46-master.txt",
 ]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -56,7 +56,7 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -67,7 +67,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -79,7 +79,7 @@ prefix = "565-nozs-"
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
 caselists = ["/deqp/mustpass/gles3-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
@@ -90,7 +90,7 @@ prefix = "multisample-"
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-multisample.txt"]
-skips = ["/install/deqp-iris-skips.txt"]
+skips = ["/install/iris-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt b/src/gallium/drivers/iris/ci/iris-amly-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-amly-fails.txt
rename to src/gallium/drivers/iris/ci/iris-amly-fails.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt b/src/gallium/drivers/iris/ci/iris-apl-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-apl-fails.txt
rename to src/gallium/drivers/iris/ci/iris-apl-fails.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt b/src/gallium/drivers/iris/ci/iris-cml-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-cml-fails.txt
rename to src/gallium/drivers/iris/ci/iris-cml-fails.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt b/src/gallium/drivers/iris/ci/iris-glk-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt
rename to src/gallium/drivers/iris/ci/iris-glk-fails.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-flakes.txt b/src/gallium/drivers/iris/ci/iris-glk-flakes.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-glk-flakes.txt
rename to src/gallium/drivers/iris/ci/iris-glk-flakes.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt b/src/gallium/drivers/iris/ci/iris-kbl-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-kbl-fails.txt
rename to src/gallium/drivers/iris/ci/iris-kbl-fails.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-skips.txt b/src/gallium/drivers/iris/ci/iris-skips.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-skips.txt
rename to src/gallium/drivers/iris/ci/iris-skips.txt
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt b/src/gallium/drivers/iris/ci/iris-whl-fails.txt
similarity index 100%
rename from src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt
rename to src/gallium/drivers/iris/ci/iris-whl-fails.txt
diff --git a/src/gallium/drivers/lima/ci/deqp-lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt
similarity index 100%
rename from src/gallium/drivers/lima/ci/deqp-lima-fails.txt
rename to src/gallium/drivers/lima/ci/lima-fails.txt
diff --git a/src/gallium/drivers/lima/ci/deqp-lima-skips.txt b/src/gallium/drivers/lima/ci/lima-skips.txt
similarity index 100%
rename from src/gallium/drivers/lima/ci/deqp-lima-skips.txt
rename to src/gallium/drivers/lima/ci/lima-skips.txt
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml
index a8d09ed1627..9fa34aca24e 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-asan.toml
@@ -2,7 +2,7 @@
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
 caselists = ["/deqp/mustpass/gles31-master.txt"]
-skips = ["install/deqp-llvmpipe-skips.txt"]
+skips = ["install/llvmpipe-skips.txt"]
 deqp_args = [
     "--deqp-surface-width=256", "--deqp-surface-height=256",
     "--deqp-surface-type=pbuffer", "--deqp-gl-config-name=rgba8888d24s8ms0", "--deqp-visibility=hidden"
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-flakes.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-flakes.txt
rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-flakes.txt
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-skips.txt
rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-skips.txt
diff --git a/src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-fails.txt b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt
similarity index 100%
rename from src/gallium/drivers/radeonsi/ci/deqp-radeonsi-stoney-fails.txt
rename to src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-asan-fails.txt
similarity index 100%
rename from src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt
rename to src/gallium/drivers/softpipe/ci/softpipe-asan-fails.txt
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt
similarity index 100%
rename from src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
rename to src/gallium/drivers/softpipe/ci/softpipe-fails.txt
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt
similarity index 100%
rename from src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
rename to src/gallium/drivers/softpipe/ci/softpipe-flakes.txt
diff --git a/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt b/src/gallium/drivers/softpipe/ci/softpipe-skips.txt
similarity index 100%
rename from src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
rename to src/gallium/drivers/softpipe/ci/softpipe-skips.txt
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt
similarity index 100%
rename from src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
rename to src/gallium/drivers/virgl/ci/virgl-gl-fails.txt
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt b/src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt
similarity index 100%
rename from src/gallium/drivers/virgl/ci/deqp-virgl-gl-flakes.txt
rename to src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt b/src/gallium/drivers/virgl/ci/virgl-gl-skips.txt
similarity index 100%
rename from src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt
rename to src/gallium/drivers/virgl/ci/virgl-gl-skips.txt
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
similarity index 100%
rename from src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
rename to src/gallium/drivers/virgl/ci/virgl-gles-fails.txt
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
similarity index 100%
rename from src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
rename to src/gallium/drivers/zink/ci/zink-lvp-fails.txt
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
similarity index 100%
rename from src/gallium/drivers/zink/ci/deqp-zink-lvp-flakes.txt
rename to src/gallium/drivers/zink/ci/zink-lvp-flakes.txt
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt
similarity index 100%
rename from src/gallium/drivers/zink/ci/deqp-zink-lvp-skips.txt
rename to src/gallium/drivers/zink/ci/zink-lvp-skips.txt
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-asan-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt
similarity index 100%
rename from src/gallium/frontends/lavapipe/ci/deqp-lvp-asan-fails.txt
rename to src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-asan-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt
similarity index 100%
rename from src/gallium/frontends/lavapipe/ci/deqp-lvp-asan-skips.txt
rename to src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
similarity index 100%
rename from src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt
rename to src/gallium/frontends/lavapipe/ci/lvp-fails.txt
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-flakes.txt b/src/gallium/frontends/lavapipe/ci/lvp-flakes.txt
similarity index 100%
rename from src/gallium/frontends/lavapipe/ci/deqp-lvp-flakes.txt
rename to src/gallium/frontends/lavapipe/ci/lvp-flakes.txt
diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
similarity index 100%
rename from src/gallium/frontends/lavapipe/ci/deqp-lvp-skips.txt
rename to src/gallium/frontends/lavapipe/ci/lvp-skips.txt
diff --git a/src/panfrost/ci/deqp-panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-g52-fails.txt
rename to src/panfrost/ci/panfrost-g52-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-g52-flakes.txt b/src/panfrost/ci/panfrost-g52-flakes.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-g52-flakes.txt
rename to src/panfrost/ci/panfrost-g52-flakes.txt
diff --git a/src/panfrost/ci/deqp-panfrost-g52-skips.txt b/src/panfrost/ci/panfrost-g52-skips.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-g52-skips.txt
rename to src/panfrost/ci/panfrost-g52-skips.txt
diff --git a/src/panfrost/ci/deqp-panfrost-g72-fails.txt b/src/panfrost/ci/panfrost-g72-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-g72-fails.txt
rename to src/panfrost/ci/panfrost-g72-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-g72-flakes.txt b/src/panfrost/ci/panfrost-g72-flakes.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-g72-flakes.txt
rename to src/panfrost/ci/panfrost-g72-flakes.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t720-fails.txt b/src/panfrost/ci/panfrost-t720-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t720-fails.txt
rename to src/panfrost/ci/panfrost-t720-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t720-flakes.txt b/src/panfrost/ci/panfrost-t720-flakes.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t720-flakes.txt
rename to src/panfrost/ci/panfrost-t720-flakes.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t720-skips.txt b/src/panfrost/ci/panfrost-t720-skips.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t720-skips.txt
rename to src/panfrost/ci/panfrost-t720-skips.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t760-fails.txt b/src/panfrost/ci/panfrost-t760-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t760-fails.txt
rename to src/panfrost/ci/panfrost-t760-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t760-flakes.txt b/src/panfrost/ci/panfrost-t760-flakes.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t760-flakes.txt
rename to src/panfrost/ci/panfrost-t760-flakes.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t820-fails.txt b/src/panfrost/ci/panfrost-t820-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t820-fails.txt
rename to src/panfrost/ci/panfrost-t820-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t860-fails.txt b/src/panfrost/ci/panfrost-t860-fails.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t860-fails.txt
rename to src/panfrost/ci/panfrost-t860-fails.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t860-flakes.txt b/src/panfrost/ci/panfrost-t860-flakes.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t860-flakes.txt
rename to src/panfrost/ci/panfrost-t860-flakes.txt
diff --git a/src/panfrost/ci/deqp-panfrost-t860-skips.txt b/src/panfrost/ci/panfrost-t860-skips.txt
similarity index 100%
rename from src/panfrost/ci/deqp-panfrost-t860-skips.txt
rename to src/panfrost/ci/panfrost-t860-skips.txt