From 6cff8ec5a6230154725aa5f4d0e3dc20998d16cd Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 18 Mar 2021 15:58:04 -0400
Subject: [PATCH] ci/lavapipe: split out lavapipe ci into lavapipe dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

there's no need to run llvmpipe jobs if only lavapipe has changed

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9695>
---
 .gitlab-ci.yml                                |  1 +
 .gitlab-ci/test-source-dep.yml                | 22 ++++++++++++++++---
 src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 11 ----------
 .../lavapipe}/ci/deqp-lvp-fails.txt           |  0
 .../lavapipe}/ci/deqp-lvp-flakes.txt          |  0
 .../lavapipe}/ci/deqp-lvp-skips.txt           |  0
 .../frontends/lavapipe/ci/gitlab-ci.yml       | 10 +++++++++
 7 files changed, 30 insertions(+), 14 deletions(-)
 rename src/gallium/{drivers/llvmpipe => frontends/lavapipe}/ci/deqp-lvp-fails.txt (100%)
 rename src/gallium/{drivers/llvmpipe => frontends/lavapipe}/ci/deqp-lvp-flakes.txt (100%)
 rename src/gallium/{drivers/llvmpipe => frontends/lavapipe}/ci/deqp-lvp-skips.txt (100%)
 create mode 100644 src/gallium/frontends/lavapipe/ci/gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d33fb7e0780..a93679f3279 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ include:
   - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
   - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
+  - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
 
 stages:
   - sanity
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 3e7b91f8b1f..7d30f202290 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -98,6 +98,22 @@
         *gallium_core_file_list
       when: on_success
     - changes: &llvmpipe_file_list
+      - src/gallium/drivers/llvmpipe/**/*
+      - src/gallium/winsys/sw/**/*
+      when: on_success
+    - when: never
+
+.lavapipe-rules:
+  stage: software-renderer
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *gallium_core_file_list
+      when: on_success
+    - changes: &lavapipe_file_list
       - src/gallium/drivers/llvmpipe/**/*
       - src/gallium/frontends/lavapipe/**/*
       - src/gallium/winsys/sw/**/*
@@ -311,7 +327,7 @@
         *gallium_core_file_list
       when: on_success
     - changes:
-        *llvmpipe_file_list
+        *lavapipe_file_list
       when: on_success
     - changes:
         *vulkan_file_list
@@ -336,7 +352,7 @@
         *gallium_core_file_list
       when: on_success
     - changes:
-        *llvmpipe_file_list
+        *lavapipe_file_list
       when: on_success
     - changes:
         *vulkan_file_list
@@ -356,7 +372,7 @@
         *gallium_core_file_list
       when: on_success
     - changes:
-        *llvmpipe_file_list
+        *lavapipe_file_list
       when: on_success
     - changes:
       - src/gallium/drivers/zink/**/*
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 6bec330a984..10a591d1688 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -90,14 +90,3 @@ llvmpipe-gles2:
     - .test-gl
     - .deqp-test
     - .llvmpipe-test
-
-lavapipe-vk:
-  stage: software-renderer
-  extends:
-    - .test-vk
-    - .llvmpipe-rules
-    - .deqp-test-vk
-  variables:
-    GPU_VERSION: lvp
-    VK_DRIVER: lvp
-    DEQP_FRACTION: 10
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt
rename to src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt b/src/gallium/frontends/lavapipe/ci/deqp-lvp-flakes.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt
rename to src/gallium/frontends/lavapipe/ci/deqp-lvp-flakes.txt
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt b/src/gallium/frontends/lavapipe/ci/deqp-lvp-skips.txt
similarity index 100%
rename from src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt
rename to src/gallium/frontends/lavapipe/ci/deqp-lvp-skips.txt
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
new file mode 100644
index 00000000000..9fc4e3eea3a
--- /dev/null
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -0,0 +1,10 @@
+lavapipe-vk:
+  stage: software-renderer
+  extends:
+    - .test-vk
+    - .lavapipe-rules
+    - .deqp-test-vk
+  variables:
+    GPU_VERSION: lvp
+    VK_DRIVER: lvp
+    DEQP_FRACTION: 10