From cc49894e34f139b72479e23fd6d5ee0350a30fda Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 14 May 2024 16:57:43 +0200
Subject: [PATCH] ci: drop dead VK_CPU option

Unused since 1eca809680d2291867ea ("ci/v3dv: test v3dv in arm64
environment"), and in the meantime other code paths have been added and
do not support this (`.gitlab-ci/common/init-stage2.sh` when starting
xorg & wayland for instance), so instead of fixing dead code, let's
remove it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29201>
---
 .gitlab-ci/common/generate-env.sh  | 1 -
 .gitlab-ci/deqp-runner.sh          | 3 ++-
 .gitlab-ci/piglit/piglit-runner.sh | 3 ++-
 .gitlab-ci/piglit/piglit-traces.sh | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 8ee1fa7606a..1bdc9fb794e 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -119,7 +119,6 @@ VARS=(
     VIRGL_HOST_API
     VIRGL_RENDER_SERVER
     WAFFLE_PLATFORM
-    VK_CPU
     VK_DRIVER
     # required by virglrender CI
     VK_DRIVER_FILES
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index dd09e349895..7f680f5cb33 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -18,7 +18,8 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
-export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
+ARCH=$(uname -m)
+export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
 
 if [ -n "$USE_ANGLE" ]; then
diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh
index b279c10078b..878d30307b2 100755
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -13,7 +13,8 @@ INSTALL="$PWD/install"
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
 export EGL_PLATFORM=surfaceless
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+ARCH=$(uname -m)
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 
 RESULTS=$PWD/${PIGLIT_RESULTS_DIR:-results}
 mkdir -p $RESULTS
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 18a4b543eb5..6efe503941d 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -54,7 +54,8 @@ if [ -n "${VK_DRIVER}" ]; then
   export DXVK_LOG="$RESULTS/dxvk"
   [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
   export DXVK_STATE_CACHE=0
-  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+  ARCH=$(uname -m)
+  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 fi
 
 # Sanity check to ensure that our environment is sufficient to make our tests