From 23e9fe5d537417309b4e174ef283299c6fe06a37 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 15 Jan 2023 09:03:10 -0800 Subject: [PATCH] freedreno/ci: Cleanup a618 yaml De-duplicate GPU_VERSION/VK_DRIVER and add different jobs that can be extended for limozeen vs kingoftown runners in order to de-duplicate the DEVICE_TYPE/DTB/RUNNER_TAG variables. This should simplify moving jobs between runners to load-balance. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ci/gitlab-ci.yml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 44328ec912a..411c24d4a5f 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -134,19 +134,32 @@ a530-traces: # Increase the hangcheck timer for our spilling tests which bump up against # the .5s default. FREEDRENO_HANGCHECK_MS: 2000 + GPU_VERSION: freedreno-a618 + VK_DRIVER: freedreno -a618_vk: +.a618-test-kingoftown-r1: extends: - .a618-test - - .turnip-rules - parallel: 12 variables: DEVICE_TYPE: sc7180-trogdor-kingoftown DTB: sc7180-trogdor-kingoftown-r1 RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown - VK_DRIVER: freedreno + +.a618-test-limozeen-nots-r5: + extends: + - .a618-test + variables: + DEVICE_TYPE: sc7180-trogdor-lazor-limozeen + DTB: sc7180-trogdor-lazor-limozeen-nots-r5 + RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen + +a618_vk: + extends: + - .a618-test-kingoftown-r1 + - .turnip-rules + parallel: 12 + variables: DEQP_SUITE: freedreno-a618-vk - GPU_VERSION: freedreno-a618 MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 a618_vk_full: @@ -165,15 +178,11 @@ a618_vk_full: a618_gl: extends: - - .a618-test + - .a618-test-limozeen-nots-r5 - .freedreno-rules parallel: 4 variables: - DEVICE_TYPE: sc7180-trogdor-lazor-limozeen - DTB: sc7180-trogdor-lazor-limozeen-nots-r5 - RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen DEQP_SUITE: freedreno-a618 - GPU_VERSION: freedreno-a618 .a630-test: extends: