From 3ddda935b133bc6927890381824cd42d84f5c260 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 12 May 2022 13:07:13 -0400
Subject: [PATCH] zink: add an anv-tgl ci job

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16497>
---
 .gitlab-ci/test-source-dep.yml                     | 21 ++++++++
 src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml | 58 ++++++++++++++++++++++
 src/gallium/drivers/zink/ci/gitlab-ci.yml          | 13 +++++
 src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt |  3 ++
 4 files changed, 95 insertions(+)
 create mode 100644 src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml
 create mode 100644 src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index fab77d6..1322164 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -607,6 +607,27 @@
       when: on_success
     - when: never
 
+.zink-anv-rules:
+  stage: layered-backends
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes:
+        *vulkan_file_list
+      when: on_success
+    - changes:
+      - src/intel/**/*
+      when: on_success
+    - changes: &zink_file_list
+      - src/gallium/drivers/zink/**/*
+      when: on_success
+    - when: never
+
 # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
 # rules duplication manually
 .windows-build-rules:
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml
new file mode 100644
index 0000000..c94f49d
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml
@@ -0,0 +1,58 @@
+#[[deqp]]
+#deqp = "/deqp/modules/gles2/deqp-gles2"
+#caselists = ["/deqp/mustpass/gles2-master.txt"]
+#deqp_args = [
+#    "--deqp-surface-width=256",
+#    "--deqp-surface-height=256",
+#    "--deqp-surface-type=pbuffer",
+#    "--deqp-gl-config-name=rgba8888d24s8ms0",
+#    "--deqp-visibility=hidden"
+#]
+#timeout = 180.0
+#version_check = "GL ES 3.2.*git"
+#renderer_check = "zink.*Intel.*"
+#
+#[[deqp]]
+#deqp = "/deqp/modules/gles3/deqp-gles3"
+#caselists = ["/deqp/mustpass/gles3-master.txt"]
+#deqp_args = [
+#    "--deqp-surface-width=256",
+#    "--deqp-surface-height=256",
+#    "--deqp-surface-type=pbuffer",
+#    "--deqp-gl-config-name=rgba8888d24s8ms0",
+#    "--deqp-visibility=hidden"
+#]
+#timeout = 180.0
+#
+#[[deqp]]
+#deqp = "/deqp/modules/gles31/deqp-gles31"
+#caselists = ["/deqp/mustpass/gles31-master.txt"]
+#deqp_args = [
+#    "--deqp-surface-width=256",
+#    "--deqp-surface-height=256",
+#    "--deqp-surface-type=pbuffer",
+#    "--deqp-gl-config-name=rgba8888d24s8ms0",
+#    "--deqp-visibility=hidden"
+#]
+#timeout = 180.0
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gl46-master.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+timeout = 180.0
+
+#[[piglit]]
+#piglit_folder = "/piglit"
+#profile = "gpu"
+#process_isolation = true
+#timeout = 180.0
+#  [piglit.env]
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 57a0380..2eabbb7 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -22,3 +22,16 @@ zink:
     PIGLIT_NO_WINDOW: 1
   script:
     - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh"
+
+zink-anv-tgl:
+  extends:
+    - .anv-tgl-test
+    - .zink-anv-rules
+  variables:
+    FLAKES_CHANNEL: "#zink-ci"
+    MESA_LOADER_DRIVER_OVERRIDE: "zink"
+    DEQP_SUITE: zink-anv-tgl
+    PIGLIT_NO_WINDOW: 1
+    VK_DRIVER: intel
+    HWCI_START_XORG: 1
+    GPU_VERSION: zink-anv-tgl
diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt
new file mode 100644
index 0000000..ee29883
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-skips.txt
@@ -0,0 +1,3 @@
+#these take too long to finish in ci
+KHR-GL46.texture_swizzle.smoke
+KHR-GL46.copy_image.functional
-- 
2.7.4