Mesa (main): ci/freedreno: Switch 2 default a630 VK jobs to being GLES and VK ASan jobs.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b5e41c8c2def1b67348388191fa9d79d2fe686c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5e41c8c2def1b67348388191fa9d79d2fe686c0

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Dec 15 15:15:48 2021 -0800

ci/freedreno: Switch 2 default a630 VK jobs to being GLES and VK ASan jobs.

The automatic VK coverage we care about is happening on a618, which is the
HW we're shipping.  Having the old 630 runners make sure we don't leak
memory is a great use for them.  Still, keep one default A630 VK job to
make sure we don't totally trash it.

Reviewed-by: Hyunjun Ko <zzoon at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14235>

---

 src/freedreno/ci/deqp-freedreno-a630-vk.toml | 2 +-
 src/freedreno/ci/gitlab-ci.yml               | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk.toml b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
index 43e2872f9a9..b9159fea29b 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
@@ -3,7 +3,7 @@
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
 skips = ["install/freedreno-a630-premerge-skips.txt"]
-fraction = 3
+fraction = 9
 renderer_check = "Turnip Adreno .* 630"
 [deqp.env]
 # Force binning in the main run, which makes sure we render at
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 0d3bfa355f6..06ef70255e7 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -196,11 +196,11 @@ a630_gles_asan:
     - .baremetal-deqp-test
     - .a630-test
     - .baremetal-arm64-asan-test
-    - .test-manual
   variables:
     DEQP_VER: gles31
-    DEQP_FRACTION: 10
+    DEQP_FRACTION: 100
     DEQP_EXPECTED_RENDERER: FD630
+    FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
     GPU_VERSION: freedreno-a630-asan
 
 a630_skqp:
@@ -216,7 +216,6 @@ a630_vk:
   extends:
     - .a630-test
     - .baremetal-deqp-test-freedreno-vk
-  parallel: 3
   variables:
     DEQP_SUITE: freedreno-a630-vk
 
@@ -228,15 +227,11 @@ a630_vk_full:
   variables:
     DEQP_SUITE: freedreno-a630-vk-full
 
-# Disabled by default until we can sort out what looks like timeouts before
-# getting to the first test (or is it at cleanup after tests completed?).
-# Clicking play can show you some useful areas for fixing turnip, though.
 a630_vk_asan:
   extends:
     - .a630-test
     - .baremetal-deqp-test-freedreno-vk
     - .baremetal-arm64-asan-test
-    - .test-manual
   variables:
     DEQP_SUITE: freedreno-a630-vk-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled