From 36de4c8fb9a911ccd7a0cb426ee7cb935c99875d Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 11 Dec 2024 09:54:24 +0100
Subject: [PATCH] turnip/ci: Bump the number of tests per group for a618

Due to the slow startup time of deqp-vk, the previous default of
500 tests per group caused the jobs to run up to twice as slowly
compared to using a higher number of tests per group.

Increase the number of tests per group for all subsets of the
deqp-runner suites, which allows decreasing the fractions.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32588>
---
 src/freedreno/ci/deqp-freedreno-a618-vk-full.toml | 4 ++++
 src/freedreno/ci/deqp-freedreno-a618-vk.toml      | 3 +++
 src/freedreno/ci/gitlab-ci.yml                    | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
index d7b6f9d10fe..f044dcaf7b1 100644
--- a/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
@@ -4,6 +4,7 @@ deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 timeout = 300
 renderer_check = "Turnip Adreno .* 618"
+tests_per_group = 5000
 
 # force-gmem testing
 # Autotuner forces sysmem on most CTS tests
@@ -13,6 +14,7 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 timeout = 300
 prefix = "gmem-"
 fraction = 10
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,forcebin"
 
@@ -24,6 +26,7 @@ timeout = 300
 prefix = "nobin-"
 fraction = 10
 include = ["dEQP-VK.transform_feedback.*"]
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,nobin"
 
@@ -34,5 +37,6 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 timeout = 300
 include = ["dEQP-VK.renderpass.*"]
 prefix = "bypass-"
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "sysmem"
diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk.toml b/src/freedreno/ci/deqp-freedreno-a618-vk.toml
index 9bd97da1368..824d7d2b211 100644
--- a/src/freedreno/ci/deqp-freedreno-a618-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618-vk.toml
@@ -5,6 +5,7 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 renderer_check = "Turnip Adreno .* 618"
 fraction = 2
+tests_per_group = 5000
 
 # force-gmem testing
 # Autotuner forces sysmem on most CTS tests
@@ -14,6 +15,7 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 prefix = "gmem-"
 fraction = 15
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,forcebin"
 
@@ -23,5 +25,6 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"]
 prefix = "spill-"
+tests_per_group = 2000
 [deqp.env]
 IR3_SHADER_DEBUG = "spillall"
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index ed901f052b2..352572be33c 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -89,7 +89,7 @@ a618-vk:
     DEQP_SUITE: freedreno-a618-vk
     FLAKES_CHANNEL: "#freedreno-ci"
     MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
-    DEQP_FRACTION: 4
+    DEQP_FRACTION: 2
 
 a618-vk-full:
   extends:
@@ -104,6 +104,7 @@ a618-vk-full:
     FDO_CI_CONCURRENT: 4
     DEQP_SUITE: freedreno-a618-vk-full
     JOB_TIMEOUT: 180
+    DEQP_FRACTION: 1
 
 a618-gl:
   extends: