From 69aa988ecaa13db5b90dcbb42655726384c99713 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 11 Dec 2024 10:18:31 +0100
Subject: [PATCH] turnip/ci: Bump the number of tests per group for a630

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>
---
 .../ci/deqp-freedreno-a630-vk-asan.toml       |  2 ++
 .../ci/deqp-freedreno-a630-vk-full.toml       |  3 +++
 src/freedreno/ci/deqp-freedreno-a630-vk.toml  | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml
index efe68cfb4e9..a1f507c56cc 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml
@@ -6,6 +6,7 @@ skips = ["install/freedreno-a6xx-skips.txt"]
 fraction = 1000
 renderer_check = "Turnip Adreno .* 630"
 prefix = "asan-"
+tests_per_group = 500
 [deqp.env]
 # Disable leak checking as of CTS 1.3.3.0 because the CTS itself leaks memory
 ASAN_OPTIONS = "detect_leaks=0"
@@ -17,6 +18,7 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.graphicsfuzz.barrier-in-loop-with-break"]
 prefix = "spill-"
+tests_per_group = 1
 [deqp.env]
 IR3_SHADER_DEBUG = "spillall"
 # Disable leak checking as of CTS 1.3.3.0 because the CTS itself leaks memory
diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
index 9cd1b95b293..0a9f18267eb 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
@@ -5,6 +5,7 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 timeout = 300
 renderer_check = "Turnip Adreno .* 630"
+tests_per_group = 5000
 
 # force-gmem testing
 # Autotuner forces sysmem on most CTS tests
@@ -15,6 +16,7 @@ skips = ["install/freedreno-a6xx-skips.txt"]
 timeout = 300
 prefix = "gmem-"
 fraction = 10
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,forcebin"
 
@@ -26,5 +28,6 @@ skips = ["install/freedreno-a6xx-skips.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-a630-vk.toml b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
index 9e0eb192850..c81f6053603 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
@@ -3,8 +3,9 @@
 deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
-fraction = 60
+fraction = 40
 renderer_check = "Turnip Adreno .* 630"
+tests_per_group = 5000
 
 # force-gmem testing (~1 min)
 # Autotuner forces sysmem on most CTS tests
@@ -13,7 +14,8 @@ deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 prefix = "gmem-"
-fraction = 150
+fraction = 100
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,forcebin"
 
@@ -24,7 +26,8 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.renderpass.*"]
 prefix = "gmem-unaligned-"
-fraction = 10
+fraction = 5
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,unaligned_store"
 
@@ -35,7 +38,8 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.renderpass.*"]
 prefix = "bypass-"
-fraction = 30
+fraction = 15
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "sysmem"
 
@@ -46,7 +50,8 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.graphicsfuzz.*"]
 prefix = "spill-"
-fraction = 10
+fraction = 5
+tests_per_group = 1000
 [deqp.env]
 IR3_SHADER_DEBUG = "spillall"
 
@@ -57,7 +62,8 @@ caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 include = ["dEQP-VK.renderpass2.*"]
 prefix = "dynamic-"
-fraction = 10
+fraction = 5
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "dynamic"
 
@@ -67,7 +73,8 @@ deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp-vk/mustpass/vk-main.txt"]
 skips = ["install/freedreno-a6xx-skips.txt"]
 prefix = "stale-regs-"
-fraction = 200
+fraction = 100
+tests_per_group = 5000
 [deqp.env]
 TU_DEBUG = "gmem,forcebin"
 TU_DEBUG_STALE_REGS_RANGE = "0x0c00,0xbe01"