panvk/ci: Move the fractions out of suites

The only difference between the -full and regular suites was the fraction. By moving the fractions out of the suites and into DEQP_FRACTION, we can reuse the same suite definitions. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32725>
2024-12-19 11:40:52 +01:00
parent 0c43ddd3e4
commit 7198bfc590
5 changed files with 4 additions and 12 deletions
@@ -1,4 +0,0 @@
-[[deqp]]
-deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
-caselists = ["/deqp-vk/mustpass/vk-main.txt"]
-renderer_check = "Mali-G52"
@@ -2,4 +2,3 @@
 deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 renderer_check = "Mali-G52"
-fraction = 32
@@ -1,4 +0,0 @@
-[[deqp]]
-deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
-caselists = ["/deqp-vk/mustpass/vk-main.txt"]
-renderer_check = "Mali-G610"
@@ -2,4 +2,3 @@
 deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 renderer_check = "Mali-G610"
-fraction = 4
@@ -343,6 +343,7 @@ panfrost-g52-vk:arm64:
    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
    PANVK_DEBUG: "no_known_warn,sync"
    DEQP_SUITE: panfrost-g52-vk
+    DEQP_FRACTION: 32
    HWCI_START_WESTON: 1

 panfrost-g52-vk-full:arm64:
@@ -352,7 +353,7 @@ panfrost-g52-vk-full:arm64:
    - .panfrost-vk-manual-rules
  timeout: 3h
  variables:
-    DEQP_SUITE: panfrost-g52-vk-full
+    DEQP_FRACTION: 1

 panfrost-g52-piglit-gles2:arm64:
  extends:
@@ -418,6 +419,7 @@ panfrost-g610-vk:arm64:
    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1
    PANVK_DEBUG: "no_known_warn,sync,cs"
    DEQP_SUITE: panfrost-g610-vk
+    DEQP_FRACTION: 4
    HWCI_START_WESTON: 1
    LAVA_TAGS: at-least-8gb

@@ -427,4 +429,4 @@ panfrost-g610-vk-full:arm64:
    - .panfrost-vk-manual-rules
  timeout: 1h 35m
  variables:
-    DEQP_SUITE: panfrost-g610-vk-full
+    DEQP_FRACTION: 1