From 76db69047f5c32a87c8e6679360693a0e8c9372d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 27 Jun 2024 14:30:53 +0200
Subject: [PATCH] panfrost/ci: split gl & vk jobs rules

No need to run all the gl jobs on vk changes, and vice-versa.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29942>
---
 src/panfrost/ci/gitlab-ci.yml | 49 ++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index b835f97a9ea..80b2f1f062b 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -41,12 +41,11 @@
         - src/panfrost/midgard/**/*
       when: manual
 
-.panfrost-bifrost-rules:
+.panfrost-bifrost-gl-rules:
   stage: arm
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-farm-rules, rules]
-    - !reference [.vulkan-rules, rules]
     - !reference [.gl-rules, rules]
     - changes:
         *panfrost_common_file_list
@@ -54,6 +53,36 @@
     - changes:
         *panfrost_gallium_file_list
       when: on_success
+    - changes: &panfrost_bifrost_file_list
+        - src/panfrost/compiler/**/*
+      when: on_success
+
+.panfrost-bifrost-gl-manual-rules:
+  stage: arm
+  retry: !reference [.scheduled_pipeline-rules, retry]
+  rules:
+    - !reference [.test, rules]
+    - !reference [.collabora-farm-manual-rules, rules]
+    - !reference [.gl-manual-rules, rules]
+    - changes:
+        *panfrost_common_file_list
+      when: manual
+    - changes:
+        *panfrost_gallium_file_list
+      when: manual
+    - changes:
+        *panfrost_bifrost_file_list
+      when: manual
+
+.panfrost-bifrost-vk-rules:
+  stage: arm
+  rules:
+    - !reference [.test, rules]
+    - !reference [.collabora-farm-rules, rules]
+    - !reference [.vulkan-rules, rules]
+    - changes:
+        *panfrost_common_file_list
+      when: on_success
     - changes: &panfrost_vulkan_file_list
         - src/panfrost/vulkan/**/*
       when: on_success
@@ -61,20 +90,16 @@
         - src/panfrost/compiler/**/*
       when: on_success
 
-.panfrost-bifrost-manual-rules:
+.panfrost-bifrost-vk-manual-rules:
   stage: arm
   retry: !reference [.scheduled_pipeline-rules, retry]
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-farm-manual-rules, rules]
     - !reference [.vulkan-manual-rules, rules]
-    - !reference [.gl-manual-rules, rules]
     - changes:
         *panfrost_common_file_list
       when: manual
-    - changes:
-        *panfrost_gallium_file_list
-      when: manual
     - changes:
         *panfrost_vulkan_file_list
       when: manual
@@ -230,7 +255,7 @@ panfrost-g52-gl:arm64:
   parallel: 3
   extends:
     - .lava-test-deqp:arm64
-    - .panfrost-bifrost-rules
+    - .panfrost-bifrost-gl-rules
     - .panfrost-test
     - .lava-meson-g12b-a311d-khadas-vim3:arm64
   variables:
@@ -244,7 +269,7 @@ panfrost-g52-vk:arm64:
     - .lava-test-deqp:arm64
     - .panfrost-test
     - .lava-meson-g12b-a311d-khadas-vim3:arm64
-    - .panfrost-bifrost-manual-rules
+    - .panfrost-bifrost-vk-manual-rules
   variables:
     MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
     PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
@@ -255,7 +280,7 @@ panfrost-g52-vk:arm64:
 panfrost-g52-piglit-gles2:arm64:
   extends:
     - .lava-piglit:arm64
-    - .panfrost-bifrost-rules
+    - .panfrost-bifrost-gl-rules
     - .panfrost-test
     - .lava-meson-g12b-a311d-khadas-vim3:arm64
   variables:
@@ -267,7 +292,7 @@ panfrost-g72-gl:arm64:
   parallel: 3
   extends:
     - .lava-test-deqp:arm64
-    - .panfrost-bifrost-rules
+    - .panfrost-bifrost-gl-rules
     - .panfrost-test
     - .lava-mt8183-kukui-jacuzzi-juniper-sku16:arm64
   variables:
@@ -276,7 +301,7 @@ panfrost-g72-gl:arm64:
 panfrost-g57-gl:arm64:
   extends:
     - .lava-test-deqp:arm64
-    - .panfrost-bifrost-rules
+    - .panfrost-bifrost-gl-rules
     - .panfrost-test
     - .lava-mt8192-asurada-spherion-r0:arm64
   parallel: 6