From 68244ee819c5098e146b3aaffaf5883851309e1c Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 17 Jun 2025 10:35:20 +0200
Subject: [PATCH] anv/ci: Add a pre-merge vkd3d job on ADL

Introduce a new, pre-merge vkd3d-proton job on Alder Lake, and move the
VK_DRIVER variables to the .anv-test template.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35574>
---
 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml |  4 ----
 src/intel/ci/anv-adl-vkd3d-fails.txt          |  7 +++++++
 src/intel/ci/gitlab-ci-inc.yml                |  1 +
 src/intel/ci/gitlab-ci.yml                    | 13 ++++++++++---
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 src/intel/ci/anv-adl-vkd3d-fails.txt

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 10a05816441..f29e4ce3a3e 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -190,7 +190,6 @@
     - .zink-anv-rules
     - .zink-test
   variables:
-    VK_DRIVER: intel
     GPU_VERSION: zink-anv-adl
 
 .zink-anv-adl-trace-test:
@@ -201,7 +200,6 @@
     - .zink-anv-rules
     - .zink-trace-test
   variables:
-    VK_DRIVER: intel
     GPU_VERSION: zink-anv-adl
 
 .zink-anv-tgl-test:
@@ -212,7 +210,6 @@
     - .zink-anv-rules
     - .zink-test
   variables:
-    VK_DRIVER: intel
     GPU_VERSION: zink-anv-tgl
 
 .zink-anv-tgl-trace-test:
@@ -223,7 +220,6 @@
     - .zink-anv-rules
     - .zink-trace-test
   variables:
-    VK_DRIVER: intel
     GPU_VERSION: zink-anv-tgl
 
 .zink-nvk-test-valve:
diff --git a/src/intel/ci/anv-adl-vkd3d-fails.txt b/src/intel/ci/anv-adl-vkd3d-fails.txt
new file mode 100644
index 00000000000..9b983235fb1
--- /dev/null
+++ b/src/intel/ci/anv-adl-vkd3d-fails.txt
@@ -0,0 +1,7 @@
+test_fence_wait_robustness,Crash
+test_planar_video_formats,Crash
+test_sampler_feedback_min_mip_level_array,Fail
+test_sampler_rounding,Fail
+test_sm67_dynamic_texture_offset,Fail
+test_undefined_read_typed_buffer_as_untyped_dxbc,Fail
+test_undefined_read_typed_buffer_as_untyped_dxil,Fail
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index 4f5133e7d95..25b58cfecf6 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -351,6 +351,7 @@
     - .anv-rules
   variables:
     DRIVER_NAME: anv
+    VK_DRIVER: intel
     ANV_DEBUG: "video-decode,video-encode"
 
 .iris-test:
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index 771e534aacc..54494ab7faf 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -8,7 +8,6 @@ anv-jsl-vk:
     - .lava-acer-cb317-1h-c3z6-dedede:x86_64
   variables:
     DEQP_SUITE: anv-jsl
-    VK_DRIVER: intel
   parallel: 5
 
 anv-jsl-vk-full:
@@ -27,7 +26,6 @@ anv-adl-vk:
     - .lava-acer-cbv514-1h-34uz-brya:x86_64
   variables:
     DEQP_SUITE: anv-adl
-    VK_DRIVER: intel
   timeout: 30m
   parallel: 4
 
@@ -47,7 +45,6 @@ anv-tgl-vk:
     - .lava-acer-cp514-2h-1160g7-volteer:x86_64
   variables:
     DEQP_SUITE: anv-tgl
-    VK_DRIVER: intel
   parallel: 5  # 5 - 5 # -1 for zink, but it's disabled now
 
 anv-tgl-vk-full:
@@ -122,6 +119,16 @@ anv-tgl-angle:
     GPU_VERSION: angle-anv-tgl
   parallel: 2
 
+anv-adl-vkd3d:
+  extends:
+    - .lava-x86_64-test-vk
+    - .anv-test
+    - .test-vkd3d-proton
+    - .lava-acer-n20q11-r856ltn-p1s2-nissa:x86_64
+  variables:
+    # Random tests fail/crash when trying to run them in parallel
+    FDO_CI_CONCURRENT: 1
+
 anv-tgl-angle-full:
   extends:
     - anv-tgl-angle