From 2b871958dc9868617af3dafaea3fe68778efb47f Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Fri, 18 Jul 2025 10:35:02 +0200 Subject: [PATCH] freedreno/ci: Streamline using common a6xx-skips Use the existing DRIVER_NAME mechanism to pick up common skips. This is less error prone than manually adding the skips. A redundant freedreno-a618-skips.txt is also dropped, as it's already included via GPU_VERSION. Signed-off-by: Valentine Burley Part-of: --- .../ci/deqp-freedreno-a618-gles-asan.toml | 1 - .../ci/deqp-freedreno-a618-piglit-full.toml | 1 - src/freedreno/ci/deqp-freedreno-a618-piglit.toml | 2 -- src/freedreno/ci/deqp-freedreno-a618-vk-asan.toml | 2 -- src/freedreno/ci/deqp-freedreno-a618-vk.toml | 3 --- src/freedreno/ci/deqp-freedreno-a618.toml | 15 --------------- src/freedreno/ci/deqp-freedreno-a660-vk-full.toml | 4 ---- src/freedreno/ci/deqp-freedreno-a660-vk.toml | 4 ---- src/freedreno/ci/deqp-freedreno-a660.toml | 14 -------------- src/freedreno/ci/deqp-freedreno-a750-vk.toml | 7 ------- src/freedreno/ci/deqp-freedreno-a750.toml | 6 ------ src/freedreno/ci/gitlab-ci-inc.yml | 4 ++++ src/freedreno/ci/gitlab-ci.yml | 3 +++ src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 ++ 14 files changed, 9 insertions(+), 59 deletions(-) diff --git a/src/freedreno/ci/deqp-freedreno-a618-gles-asan.toml b/src/freedreno/ci/deqp-freedreno-a618-gles-asan.toml index 4331b5e65d9..dcf9fc3d5af 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-gles-asan.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-gles-asan.toml @@ -1,7 +1,6 @@ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["/install/freedreno-a6xx-skips.txt"] fraction = 1 renderer_check = "FD618" deqp_args = [ diff --git a/src/freedreno/ci/deqp-freedreno-a618-piglit-full.toml b/src/freedreno/ci/deqp-freedreno-a618-piglit-full.toml index d9293834c8d..95a55952c37 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-piglit-full.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-piglit-full.toml @@ -3,6 +3,5 @@ piglit_folder = "/piglit" profile = "gpu" process_isolation = true timeout = 180.0 -skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-skips.txt"] [piglit.env] PIGLIT_NO_WINDOW = "1" diff --git a/src/freedreno/ci/deqp-freedreno-a618-piglit.toml b/src/freedreno/ci/deqp-freedreno-a618-piglit.toml index 9ff8c5bc356..424bb8b4c39 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-piglit.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-piglit.toml @@ -3,7 +3,6 @@ piglit_folder = "/piglit" profile = "gpu" process_isolation = true fraction = 6 -skips = ["install/freedreno-a6xx-skips.txt"] [piglit.env] PIGLIT_NO_WINDOW = "1" @@ -11,6 +10,5 @@ skips = ["install/freedreno-a6xx-skips.txt"] piglit_folder = "/piglit" profile = "cl" process_isolation = true -skips = ["install/freedreno-a6xx-skips.txt"] [piglit.env] RUSTICL_ENABLE = "msm" diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk-asan.toml b/src/freedreno/ci/deqp-freedreno-a618-vk-asan.toml index 8a9a3668ba0..da5a36c43aa 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-vk-asan.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-vk-asan.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] fraction = 100 renderer_check = "Turnip Adreno .* 618" prefix = "asan-" @@ -13,7 +12,6 @@ tests_per_group = 3500 [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" 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 diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk.toml b/src/freedreno/ci/deqp-freedreno-a618-vk.toml index 6da976d866b..43a19d811f7 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-vk.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] renderer_check = "Turnip Adreno .* 618" fraction = 3 tests_per_group = 10000 @@ -12,7 +11,6 @@ tests_per_group = 10000 [[deqp]] 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 = 15 tests_per_group = 5000 @@ -22,7 +20,6 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"] prefix = "spill-" tests_per_group = 2000 diff --git a/src/freedreno/ci/deqp-freedreno-a618.toml b/src/freedreno/ci/deqp-freedreno-a618.toml index ad0be398e7e..4937a3fbd43 100644 --- a/src/freedreno/ci/deqp-freedreno-a618.toml +++ b/src/freedreno/ci/deqp-freedreno-a618.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +13,6 @@ renderer_check = "FD618" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +22,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +35,6 @@ caselists = [ "/deqp-gles/mustpass/gles3-khr-main.txt", "/deqp-gles/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +49,6 @@ deqp = "/deqp-gl/external/openglcts/modules/glcts" caselists = [ "/deqp-gl/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -65,7 +60,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -81,7 +75,6 @@ FD_MESA_DEBUG = "gmem" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -97,7 +90,6 @@ FD_MESA_DEBUG = "sysmem" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["functional.*ubo"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -113,7 +105,6 @@ IR3_SHADER_DEBUG = "nouboopt" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -124,7 +115,6 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -136,7 +126,6 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-multisample.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -147,7 +136,6 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-multisample.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -159,7 +147,6 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -174,7 +161,6 @@ IR3_SHADER_DEBUG = "spillall" [[deqp]] deqp = "/deqp-gles/modules/egl/deqp-egl-x11" caselists = ["/deqp-gles/mustpass/egl-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -184,7 +170,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/egl/deqp-egl-wayland" caselists = ["/deqp-gles/mustpass/egl-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", diff --git a/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml index 5cb75d08171..91a3a38fdc9 100644 --- a/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml +++ b/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] timeout = 300 renderer_check = "Turnip Adreno .* 660" tests_per_group = 10000 @@ -12,7 +11,6 @@ tests_per_group = 10000 [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] timeout = 300 prefix = "gmem-" fraction = 10 @@ -24,7 +22,6 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] timeout = 300 prefix = "nobin-" fraction = 10 @@ -37,7 +34,6 @@ TU_DEBUG = "gmem,nobin" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] timeout = 300 include = ["dEQP-VK.renderpass.*"] prefix = "bypass-" diff --git a/src/freedreno/ci/deqp-freedreno-a660-vk.toml b/src/freedreno/ci/deqp-freedreno-a660-vk.toml index ca2f34d8e75..6bbf0c3fe55 100644 --- a/src/freedreno/ci/deqp-freedreno-a660-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a660-vk.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] renderer_check = "Turnip Adreno .* 660" tests_per_group = 10000 @@ -11,7 +10,6 @@ tests_per_group = 10000 [[deqp]] 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 = 20 tests_per_group = 5000 @@ -22,7 +20,6 @@ TU_DEBUG = "gmem,forcebin" #[[deqp]] #deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" #caselists = ["/deqp-vk/mustpass/vk-main.txt"] -#skips = ["install/freedreno-a6xx-skips.txt"] #include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"] #prefix = "spill-" #tests_per_group = 2000 @@ -33,7 +30,6 @@ TU_DEBUG = "gmem,forcebin" #[[deqp]] #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 #tests_per_group = 5000 diff --git a/src/freedreno/ci/deqp-freedreno-a660.toml b/src/freedreno/ci/deqp-freedreno-a660.toml index cc81e5e955d..a9bcef5c41e 100644 --- a/src/freedreno/ci/deqp-freedreno-a660.toml +++ b/src/freedreno/ci/deqp-freedreno-a660.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +13,6 @@ renderer_check = "FD660" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +22,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +35,6 @@ caselists = [ "/deqp-gles/mustpass/gles3-khr-main.txt", "/deqp-gles/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +49,6 @@ deqp = "/deqp-gl/external/openglcts/modules/glcts" caselists = [ "/deqp-gl/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -65,7 +60,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -81,7 +75,6 @@ FD_MESA_DEBUG = "gmem" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -97,7 +90,6 @@ FD_MESA_DEBUG = "sysmem" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["functional.*ubo"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -113,7 +105,6 @@ IR3_SHADER_DEBUG = "nouboopt" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -124,7 +115,6 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -136,7 +126,6 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-multisample.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -147,7 +136,6 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-multisample.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -159,7 +147,6 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -174,6 +161,5 @@ IR3_SHADER_DEBUG = "spillall" piglit_folder = "/piglit" profile = "cl" process_isolation = true -skips = ["install/freedreno-a6xx-skips.txt"] [piglit.env] RUSTICL_ENABLE = "msm" diff --git a/src/freedreno/ci/deqp-freedreno-a750-vk.toml b/src/freedreno/ci/deqp-freedreno-a750-vk.toml index 65efc3403aa..1ff61549f52 100644 --- a/src/freedreno/ci/deqp-freedreno-a750-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a750-vk.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] renderer_check = "Turnip Adreno .* 750" tests_per_group = 10000 @@ -11,7 +10,6 @@ tests_per_group = 10000 [[deqp]] 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 = 20 tests_per_group = 1000 @@ -22,7 +20,6 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["dEQP-VK.renderpass.*"] prefix = "gmem-unaligned-" fraction = 10 @@ -34,7 +31,6 @@ TU_DEBUG = "gmem,unaligned_store" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["dEQP-VK.renderpass.*"] prefix = "bypass-" fraction = 10 @@ -47,7 +43,6 @@ TU_DEBUG = "sysmem" # [[deqp]] # deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" # caselists = ["/deqp-vk/mustpass/vk-main.txt"] -# skips = ["install/freedreno-a6xx-skips.txt"] # include = ["dEQP-VK.graphicsfuzz.*"] # prefix = "spill-" # fraction = 10 @@ -59,7 +54,6 @@ TU_DEBUG = "sysmem" [[deqp]] deqp = "/deqp-vk/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp-vk/mustpass/vk-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] include = ["dEQP-VK.renderpass2.*"] prefix = "dynamic-" tests_per_group = 10000 @@ -71,7 +65,6 @@ TU_DEBUG = "dynamic" # [[deqp]] # 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 = 100 # tests_per_group = 1000 diff --git a/src/freedreno/ci/deqp-freedreno-a750.toml b/src/freedreno/ci/deqp-freedreno-a750.toml index 3baed41e23e..6427e7e9953 100644 --- a/src/freedreno/ci/deqp-freedreno-a750.toml +++ b/src/freedreno/ci/deqp-freedreno-a750.toml @@ -2,7 +2,6 @@ [[deqp]] deqp = "/deqp-gles/modules/gles2/deqp-gles2" caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +13,6 @@ renderer_check = "FD750" [[deqp]] deqp = "/deqp-gles/modules/gles3/deqp-gles3" caselists = ["/deqp-gles/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +22,6 @@ deqp_args = [ [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +35,6 @@ caselists = [ "/deqp-gles/mustpass/gles3-khr-main.txt", "/deqp-gles/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +49,6 @@ deqp = "/deqp-gl/external/openglcts/modules/glcts" caselists = [ "/deqp-gl/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a6xx-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -64,6 +59,5 @@ deqp_args = [ piglit_folder = "/piglit" profile = "cl" process_isolation = true -skips = ["install/freedreno-a6xx-skips.txt"] [piglit.env] RUSTICL_ENABLE = "msm" diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 4f90c5c9f1f..76abef5f9a3 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -238,6 +238,7 @@ GPU_VERSION: freedreno-a618 KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown + DRIVER_NAME: freedreno-a6xx VK_DRIVER: freedreno LAVA_FIRMWARE: qcom-lava KERNEL_TAG: msm-next-250718 @@ -256,6 +257,7 @@ GPU_VERSION: freedreno-a618 KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen + DRIVER_NAME: freedreno-a6xx VK_DRIVER: freedreno LAVA_FIRMWARE: qcom-lava KERNEL_TAG: msm-next-250718 @@ -275,6 +277,7 @@ KERNEL_IMAGE_NAME: "Image.gz" KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk + DRIVER_NAME: freedreno-a6xx VK_DRIVER: freedreno LAVA_FIRMWARE: qcom-lava KERNEL_TAG: msm-next-250718 @@ -360,4 +363,5 @@ CI_TRON_WATCHDOG__FIRMWARE_TO_LINUX__START_REGEX: 'VB: RWDeviceState: Succeed using devinfo!' # A line repeated during firmware boot CI_TRON_WATCHDOG__FIRMWARE_TO_LINUX__STOP_REGEX: 'CPU features: detected:' # A line repeated during Linux boot GPU_VERSION: freedreno-a750 + DRIVER_NAME: freedreno-a6xx VK_DRIVER: freedreno diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index e316a14ece0..87a4524b8ec 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -90,6 +90,7 @@ a618-angle: - .test-angle variables: DEQP_SUITE: tu-angle + DRIVER_NAME: null # Don't use freedreno skips a618-vk: extends: @@ -237,6 +238,7 @@ a660-angle: - .test-angle variables: DEQP_SUITE: tu-angle + DRIVER_NAME: null # Don't use freedreno skips a660-gl-cl: extends: @@ -284,6 +286,7 @@ a750-angle: CI_TRON_TIMEOUT__OVERALL__MINUTES: 20 DEQP_SUITE: tu-angle HWCI_TEST_SCRIPT: ./install/deqp-runner.sh + DRIVER_NAME: null # Don't use freedreno skips a750-gl-cl: extends: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index c785e5e734c..ff49f95e1e6 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -159,6 +159,7 @@ zink-tu-a618: FLAKES_CHANNEL: "#freedreno-ci" HWCI_START_WESTON: 1 GPU_VERSION: zink-tu-a618 + DRIVER_NAME: null # Don't use freedreno skips parallel: 3 zink-tu-a618-traces: @@ -196,6 +197,7 @@ zink-tu-a750: DEQP_SUITE: zink-tu-a750 GPU_VERSION: zink-tu-a750 HWCI_START_WESTON: 1 + DRIVER_NAME: null # Don't use freedreno skips ############### Combined testing (GL, GLES, Piglit) on NVK / RADV zink-nvk-ga106-valve: