From 7198bfc590753cc9e291ca64944f12e7f0f2ebd3 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 19 Dec 2024 11:40:52 +0100 Subject: [PATCH] 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 Part-of: --- src/panfrost/ci/deqp-panfrost-g52-vk-full.toml | 4 ---- src/panfrost/ci/deqp-panfrost-g52-vk.toml | 1 - src/panfrost/ci/deqp-panfrost-g610-vk-full.toml | 4 ---- src/panfrost/ci/deqp-panfrost-g610-vk.toml | 1 - src/panfrost/ci/gitlab-ci.yml | 6 ++++-- 5 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 src/panfrost/ci/deqp-panfrost-g52-vk-full.toml delete mode 100644 src/panfrost/ci/deqp-panfrost-g610-vk-full.toml diff --git a/src/panfrost/ci/deqp-panfrost-g52-vk-full.toml b/src/panfrost/ci/deqp-panfrost-g52-vk-full.toml deleted file mode 100644 index 819ebf76b4b..00000000000 --- a/src/panfrost/ci/deqp-panfrost-g52-vk-full.toml +++ /dev/null @@ -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" diff --git a/src/panfrost/ci/deqp-panfrost-g52-vk.toml b/src/panfrost/ci/deqp-panfrost-g52-vk.toml index 20fa3d1c79d..819ebf76b4b 100644 --- a/src/panfrost/ci/deqp-panfrost-g52-vk.toml +++ b/src/panfrost/ci/deqp-panfrost-g52-vk.toml @@ -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 diff --git a/src/panfrost/ci/deqp-panfrost-g610-vk-full.toml b/src/panfrost/ci/deqp-panfrost-g610-vk-full.toml deleted file mode 100644 index 310691d1aae..00000000000 --- a/src/panfrost/ci/deqp-panfrost-g610-vk-full.toml +++ /dev/null @@ -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" diff --git a/src/panfrost/ci/deqp-panfrost-g610-vk.toml b/src/panfrost/ci/deqp-panfrost-g610-vk.toml index 0544c58c49a..310691d1aae 100644 --- a/src/panfrost/ci/deqp-panfrost-g610-vk.toml +++ b/src/panfrost/ci/deqp-panfrost-g610-vk.toml @@ -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 diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index ae1f8cb2bd9..8063dcf6736 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -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