From e368623fff8dfb0f488cf3f29be0040e99920fd7 Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Mon, 4 Nov 2024 15:18:07 -0800 Subject: [PATCH] freedreno/ci: add prefix for a630-vk-asan tests Currently a630-vk-asan has separate files for its expected failures and skips, but by using the deqp-runner prefix option, the job can use the common a630 expectation files. This simplifies `a630-vk-asan` without any substantive changes to the ci job. Part-of: --- src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml | 1 + src/freedreno/ci/freedreno-a630-asan-fails.txt | 0 src/freedreno/ci/freedreno-a630-asan-skips.txt | 2 -- src/freedreno/ci/freedreno-a630-skips.txt | 3 +++ src/freedreno/ci/gitlab-ci.yml | 1 - 5 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 src/freedreno/ci/freedreno-a630-asan-fails.txt delete mode 100644 src/freedreno/ci/freedreno-a630-asan-skips.txt diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml index 3346a8636c9..441b41e9133 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml +++ b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml @@ -5,6 +5,7 @@ caselists = ["/deqp/mustpass/vk-main.txt"] skips = ["install/freedreno-a6xx-skips.txt"] fraction = 1000 renderer_check = "Turnip Adreno .* 630" +prefix = "asan-" [deqp.env] # Disable leak checking as of CTS 1.3.3.0 because the CTS itself leaks memory ASAN_OPTIONS = "detect_leaks=0" diff --git a/src/freedreno/ci/freedreno-a630-asan-fails.txt b/src/freedreno/ci/freedreno-a630-asan-fails.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/freedreno/ci/freedreno-a630-asan-skips.txt b/src/freedreno/ci/freedreno-a630-asan-skips.txt deleted file mode 100644 index 11eb12d0870..00000000000 --- a/src/freedreno/ci/freedreno-a630-asan-skips.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Leaky in VK-GL-cts -dEQP-VK.binding_model diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt index df42b0ce466..f916f40f77f 100644 --- a/src/freedreno/ci/freedreno-a630-skips.txt +++ b/src/freedreno/ci/freedreno-a630-skips.txt @@ -14,3 +14,6 @@ spec@egl 1.4@egl-copy-buffers # uprev Piglit in Mesa spec@egl_khr_gl_colorspace@srgb spec@egl_khr_gl_colorspace@linear + +# Leaky in VK-GL-cts +asan-dEQP-VK.binding_model diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 551aa53bee9..f9d5c4de776 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -326,7 +326,6 @@ a630-vk-asan: variables: DEQP_SUITE: freedreno-a630-vk-asan FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled - GPU_VERSION: freedreno-a630-asan a630-piglit: extends: