ci/vkd3d: use GPU_VERSION to identify the list of failures, unifying with deqp-runner.sh

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30413>

.gitlab-ci/common/generate-env.sh

@@ -120,7 +120,6 @@ VARS=(
     VIRGL_RENDER_SERVER
     WAFFLE_PLATFORM
     VK_DRIVER
-    VKD3D_PROTON_RESULTS
     VKD3D_TEST_EXCLUDE
     ZINK_DESCRIPTORS
     ZINK_DEBUG

.gitlab-ci/vkd3d-runner.sh

@@ -47,7 +47,7 @@ if ! /vkd3d-proton-tests/x64/bin/d3d12 &> "$RESULTS/vkd3d-proton-log.txt"; then
     fi
 
     # Collect all the failures
-    RESULTSFILE="$RESULTS/$VKD3D_PROTON_RESULTS.txt"
+    RESULTSFILE="$RESULTS/$GPU_VERSION.txt"
     mkdir -p .gitlab-ci/vkd3d-proton
     if ! grep "Test failed" "$RESULTS"/vkd3d-proton-log.txt > "$RESULTSFILE"; then
       error "Failed to get the list of failing tests, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"
@@ -55,16 +55,16 @@ if ! /vkd3d-proton-tests/x64/bin/d3d12 &> "$RESULTS/vkd3d-proton-log.txt"; then
     fi
 
     # Gather the list expected failures
-    if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" ]; then
-        cp "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" \
-           ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
+    if [ -f "$INSTALL/$GPU_VERSION-vkd3d.txt" ]; then
+        cp "$INSTALL/$GPU_VERSION-vkd3d.txt" \
+           ".gitlab-ci/vkd3d-proton/$GPU_VERSION.txt.baseline"
     else
-        printf "%s\n" "$VKD3D_PROTON_RESULTS-vkd3d.txt not found, assuming a \"no failures\" baseline."
-        touch ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
+        printf "%s\n" "$GPU_VERSION-vkd3d.txt not found, assuming a \"no failures\" baseline."
+        touch ".gitlab-ci/vkd3d-proton/$GPU_VERSION.txt.baseline"
     fi
 
     # Make sure that the failures found in this run match the current expectation
-    if ! diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
+    if ! diff --color=always -u ".gitlab-ci/vkd3d-proton/$GPU_VERSION.txt.baseline" "$RESULTSFILE"; then
         error "Changes found, see ${ARTIFACTS_BASE_URL}/results/vkd3d-proton-log.txt"
         exit 1
     fi

src/amd/ci/gitlab-ci-inc.yml

@@ -14,7 +14,7 @@
         - src/amd/ci/$GPU_VERSION-flakes.txt
         - src/amd/ci/$GPU_VERSION-skips.txt
         - src/amd/ci/$PIGLIT_TRACES_FILE
-        - src/amd/ci/$VKD3D_PROTON_RESULTS-vkd3d.txt
+        - src/amd/ci/$GPU_VERSION-vkd3d.txt
         - src/amd/common/**/*
         - src/amd/llvm/**/*
         - src/amd/registers/**/*
@@ -396,4 +396,4 @@
     - .kabini-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-kabini
+    GPU_VERSION: radv-kabini

src/amd/ci/gitlab-ci.yml

@@ -321,7 +321,7 @@ vkd3d-tahiti-valve:
     - .tahiti-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-tahiti
+    GPU_VERSION: radv-tahiti
     # These vkd3d-proton tests are skipped because they trigger GPU hangs.
     VKD3D_TEST_EXCLUDE: test_execute_indirect_state,test_execute_indirect_state_predication,test_undefined_descriptor_heap_mismatch_types
 
@@ -332,7 +332,7 @@ vkd3d-polaris10-valve:
     - .polaris10-test-valve-kws
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-polaris10
+    GPU_VERSION: radv-polaris10
 
 vkd3d-vega10-valve:
   extends:
@@ -341,7 +341,7 @@ vkd3d-vega10-valve:
     - .vega10-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-vega10
+    GPU_VERSION: radv-vega10
 
 vkd3d-renoir-valve:
   extends:
@@ -350,7 +350,7 @@ vkd3d-renoir-valve:
     - .renoir-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-renoir
+    GPU_VERSION: radv-renoir
 
 vkd3d-navi10-valve:
   extends:
@@ -359,7 +359,7 @@ vkd3d-navi10-valve:
     - .navi10-test-valve-mupuf
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi10
+    GPU_VERSION: radv-navi10
 
 vkd3d-navi21-valve:
   extends:
@@ -368,7 +368,7 @@ vkd3d-navi21-valve:
     - .navi21-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi21
+    GPU_VERSION: radv-navi21
 
 vkd3d-vangogh-valve:
   extends:
@@ -377,7 +377,7 @@ vkd3d-vangogh-valve:
     - .vangogh-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-vangogh
+    GPU_VERSION: radv-vangogh
 
 vkd3d-navi31-valve:
   extends:
@@ -386,4 +386,4 @@ vkd3d-navi31-valve:
     - .navi31-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi31
+    GPU_VERSION: radv-navi31