diff --git a/src/freedreno/ci/deqp-freedreno-a618-egl.toml b/src/freedreno/ci/deqp-freedreno-a618-egl.toml index b4ec4fdbd1d..16f15dfe3e0 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-egl.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-egl.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" caselists = ["/deqp/mustpass/egl-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -12,7 +12,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" caselists = ["/deqp/mustpass/egl-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-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-a618-vk.toml b/src/freedreno/ci/deqp-freedreno-a618-vk.toml index 646633762dc..fc3a4df3fd7 100644 --- a/src/freedreno/ci/deqp-freedreno-a618-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a618-vk.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] renderer_check = "Turnip Adreno .* 618" fraction = 2 @@ -11,7 +11,7 @@ fraction = 2 [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] prefix = "gmem-" fraction = 15 [deqp.env] @@ -20,7 +20,7 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"] prefix = "spill-" [deqp.env] diff --git a/src/freedreno/ci/deqp-freedreno-a618.toml b/src/freedreno/ci/deqp-freedreno-a618.toml index e26c5a11844..1038f8e6f1c 100644 --- a/src/freedreno/ci/deqp-freedreno-a618.toml +++ b/src/freedreno/ci/deqp-freedreno-a618.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +14,7 @@ renderer_check = "FD618" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +38,7 @@ caselists = [ "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +53,7 @@ deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ "/deqp/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -65,7 +65,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -81,7 +81,7 @@ FD_MESA_DEBUG = "gmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -97,7 +97,7 @@ FD_MESA_DEBUG = "sysmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] include = ["functional.*ubo"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -113,7 +113,7 @@ IR3_SHADER_DEBUG = "nouboopt" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -124,7 +124,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -136,7 +136,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-multisample.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -147,7 +147,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-multisample.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -159,7 +159,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a618-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/freedreno/ci/deqp-freedreno-a630-piglit.toml b/src/freedreno/ci/deqp-freedreno-a630-piglit.toml index 3a11d098626..45ab4335093 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-piglit.toml +++ b/src/freedreno/ci/deqp-freedreno-a630-piglit.toml @@ -2,5 +2,6 @@ piglit_folder = "/piglit" profile = "gpu" process_isolation = true +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-skips.txt"] [piglit.env] PIGLIT_NO_WINDOW = "1" diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml index 4c3990212ff..780906ce3df 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml +++ b/src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"] fraction = 1000 renderer_check = "Turnip Adreno .* 630" [deqp.env] @@ -13,7 +13,7 @@ ASAN_OPTIONS = "detect_leaks=0" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"] include = ["dEQP-VK.graphicsfuzz.barrier-in-loop-with-break"] prefix = "spill-" [deqp.env] diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk.toml b/src/freedreno/ci/deqp-freedreno-a630-vk.toml index 556848b5281..35b3aa33f6b 100644 --- a/src/freedreno/ci/deqp-freedreno-a630-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a630-vk.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] fraction = 60 renderer_check = "Turnip Adreno .* 630" @@ -11,7 +11,7 @@ renderer_check = "Turnip Adreno .* 630" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] prefix = "gmem-" fraction = 150 [deqp.env] @@ -21,7 +21,7 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["dEQP-VK.renderpass.*"] prefix = "gmem-unaligned-" fraction = 10 @@ -32,7 +32,7 @@ TU_DEBUG = "gmem,unaligned_store" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["dEQP-VK.renderpass.*"] prefix = "bypass-" fraction = 30 @@ -43,7 +43,7 @@ TU_DEBUG = "sysmem" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["dEQP-VK.graphicsfuzz.*"] prefix = "spill-" fraction = 10 @@ -54,7 +54,7 @@ IR3_SHADER_DEBUG = "spillall" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["dEQP-VK.renderpass2.*"] prefix = "dynamic-" fraction = 10 @@ -65,7 +65,7 @@ TU_DEBUG = "dynamic" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] prefix = "stale-regs-" fraction = 200 [deqp.env] diff --git a/src/freedreno/ci/deqp-freedreno-a630.toml b/src/freedreno/ci/deqp-freedreno-a630.toml index 7a11b2d103a..791ea977636 100644 --- a/src/freedreno/ci/deqp-freedreno-a630.toml +++ b/src/freedreno/ci/deqp-freedreno-a630.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +14,7 @@ renderer_check = "FD630" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +38,7 @@ caselists = [ "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +53,7 @@ deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ "/deqp/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -64,7 +64,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-x11" caselists = ["/deqp/mustpass/egl-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -74,7 +74,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/egl/deqp-egl-wayland" caselists = ["/deqp/mustpass/egl-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -86,7 +86,7 @@ prefix = "wayland-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -102,7 +102,7 @@ FD_MESA_DEBUG = "gmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -120,7 +120,7 @@ FD_MESA_DEBUG = "sysmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["functional.*ubo"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -136,7 +136,7 @@ IR3_SHADER_DEBUG = "nouboopt" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -147,7 +147,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -159,7 +159,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-multisample.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -170,7 +170,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-multisample.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -182,7 +182,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a630-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml index b869fe3a9cc..6fbc6eac54e 100644 --- a/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml +++ b/src/freedreno/ci/deqp-freedreno-a660-vk-full.toml @@ -2,6 +2,7 @@ [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] timeout = 300 renderer_check = "Turnip Adreno .* 660" @@ -10,6 +11,7 @@ renderer_check = "Turnip Adreno .* 660" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] timeout = 300 prefix = "gmem-" fraction = 10 @@ -20,6 +22,7 @@ TU_DEBUG = "gmem,forcebin" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] timeout = 300 prefix = "nobin-" fraction = 10 @@ -31,6 +34,7 @@ TU_DEBUG = "gmem,nobin" [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-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 88da8330496..df8cf4b25c5 100644 --- a/src/freedreno/ci/deqp-freedreno-a660-vk.toml +++ b/src/freedreno/ci/deqp-freedreno-a660-vk.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a660-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"] renderer_check = "Turnip Adreno .* 660" fraction = 2 @@ -11,7 +11,7 @@ fraction = 2 [[deqp]] deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = ["/deqp/mustpass/vk-main.txt"] -skips = ["install/freedreno-a660-premerge-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"] prefix = "gmem-" fraction = 15 [deqp.env] @@ -21,7 +21,7 @@ TU_DEBUG = "gmem,forcebin" #[[deqp]] #deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" #caselists = ["/deqp/mustpass/vk-main.txt"] -#skips = ["install/freedreno-a660-premerge-skips.txt"] +#skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"] #include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"] #prefix = "spill-" #[deqp.env] @@ -31,7 +31,7 @@ TU_DEBUG = "gmem,forcebin" #[[deqp]] #deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" #caselists = ["/deqp/mustpass/vk-main.txt"] -#skips = ["install/freedreno-a660-premerge-skips.txt"] +#skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"] #prefix = "stale-regs-" #fraction = 200 #[deqp.env] diff --git a/src/freedreno/ci/deqp-freedreno-a660.toml b/src/freedreno/ci/deqp-freedreno-a660.toml index ff2290d4dd0..17046146381 100644 --- a/src/freedreno/ci/deqp-freedreno-a660.toml +++ b/src/freedreno/ci/deqp-freedreno-a660.toml @@ -2,7 +2,7 @@ [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -14,7 +14,7 @@ renderer_check = "FD660" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -24,7 +24,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -38,7 +38,7 @@ caselists = [ "/deqp/mustpass/gles3-khr-main.txt", "/deqp/mustpass/gles31-khr-main.txt", ] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -53,7 +53,7 @@ deqp = "/deqp/external/openglcts/modules/glcts" caselists = [ "/deqp/mustpass/gl46-main.txt", ] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -65,7 +65,7 @@ deqp_args = [ [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -81,7 +81,7 @@ FD_MESA_DEBUG = "gmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -97,7 +97,7 @@ FD_MESA_DEBUG = "sysmem" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] include = ["functional.*ubo"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", @@ -113,7 +113,7 @@ IR3_SHADER_DEBUG = "nouboopt" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -124,7 +124,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-565-no-depth-no-stencil.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -136,7 +136,7 @@ prefix = "565-nozs-" [[deqp]] deqp = "/deqp/modules/gles3/deqp-gles3" caselists = ["/deqp/mustpass/gles3-multisample.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -147,7 +147,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles31/deqp-gles31" caselists = ["/deqp/mustpass/gles31-multisample.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", @@ -159,7 +159,7 @@ prefix = "multisample-" [[deqp]] deqp = "/deqp/modules/gles2/deqp-gles2" caselists = ["/deqp/mustpass/gles2-main.txt"] -skips = ["install/freedreno-a660-skips.txt"] +skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-skips.txt"] include = ["functional.shaders"] deqp_args = [ "--deqp-surface-width=256", "--deqp-surface-height=256", diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt index 71a2cdba950..155d507069c 100644 --- a/src/freedreno/ci/freedreno-a618-skips.txt +++ b/src/freedreno/ci/freedreno-a618-skips.txt @@ -20,31 +20,3 @@ spill-dEQP-VK.graphicsfuzz.cov-nested-loop-undefined-smoothstep-never-executed # 60s timeout KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize KHR-GL46.copy_image.functional - -# These take most of a minute to run -spec@!opengl 3.0@clearbuffer-depth-cs-probe -spec@ext_texture_array@fbo-depth-array depth-clear -spec@ext_texture_array@fbo-depth-array depth-draw -spec@ext_texture_array@fbo-depth-array fs-writes-depth -spec@ext_texture_array@fbo-depth-array fs-writes-stencil -spec@ext_texture_array@fbo-depth-array stencil-clear -spec@ext_texture_array@fbo-depth-array stencil-draw -spec@ext_transform_feedback@max-varyings -spec@!opengl 1.0@gl-1.0-blend-func - -# TC Timeouts -spec@arb_sync@clientwaitsync-timeout -spec@arb_texture_buffer_object@bufferstorage -spec@arb_uniform_buffer_object@bufferstorage -spec@arb_buffer_storage@bufferstorage-persistent read -spec@arb_buffer_storage@bufferstorage-persistent read client-storage -spec@arb_buffer_storage@bufferstorage-persistent read coherent -spec@arb_buffer_storage@bufferstorage-persistent read coherent client-storage -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read client-storage -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent client-storage - -# These are redundant with arb_copy_image, so skip them to cut down -# on CI runtime: -spec@nv_copy_image@nv_copy_image.* diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt index d0c5c114577..87d2fffc4e5 100644 --- a/src/freedreno/ci/freedreno-a630-skips.txt +++ b/src/freedreno/ci/freedreno-a630-skips.txt @@ -30,43 +30,10 @@ spill-dEQP-VK.graphicsfuzz.cov-nested-loop-large-array-index-using-vector-compon # Still running after 3 hours, time is spent in batch_draw_tracking(). KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs -# 60s timeout -KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize -KHR-GL46.copy_image.functional - -# These take most of a minute to run -spec@!opengl 3.0@clearbuffer-depth-cs-probe -spec@ext_texture_array@fbo-depth-array depth-clear -spec@ext_texture_array@fbo-depth-array depth-draw -spec@ext_texture_array@fbo-depth-array fs-writes-depth -spec@ext_texture_array@fbo-depth-array fs-writes-stencil -spec@ext_texture_array@fbo-depth-array stencil-clear -spec@ext_texture_array@fbo-depth-array stencil-draw -spec@ext_transform_feedback@max-varyings -spec@!opengl 1.0@gl-1.0-blend-func - spec@ext_framebuffer_blit@fbo-blit-check-limits spec@egl 1.4@egl-copy-buffers -# TC Timeouts -spec@arb_sync@clientwaitsync-timeout -spec@arb_texture_buffer_object@bufferstorage -spec@arb_uniform_buffer_object@bufferstorage -spec@arb_buffer_storage@bufferstorage-persistent read -spec@arb_buffer_storage@bufferstorage-persistent read client-storage -spec@arb_buffer_storage@bufferstorage-persistent read coherent -spec@arb_buffer_storage@bufferstorage-persistent read coherent client-storage -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read client-storage -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent -spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent client-storage - -# These are redundant with arb_copy_image, so skip them to cut down -# on CI runtime: -spec@nv_copy_image@nv_copy_image.* - # uprev Piglit in Mesa -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-modifiers.* spec@egl_khr_gl_colorspace@srgb spec@egl_khr_gl_colorspace@linear diff --git a/src/freedreno/ci/freedreno-a6xx-skips.txt b/src/freedreno/ci/freedreno-a6xx-skips.txt new file mode 100644 index 00000000000..8ceb68a7521 --- /dev/null +++ b/src/freedreno/ci/freedreno-a6xx-skips.txt @@ -0,0 +1,38 @@ +# Note: skips lists for CI are just a list of lines that, when +# non-zero-length and not starting with '#', will regex match to +# delete lines from the test list. Be careful. +# +# This file lists tests to skip for _all_ a6xx devices + +# 60s timeout +KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize +KHR-GL46.copy_image.functional + +# These take most of a minute to run +spec@!opengl 3.0@clearbuffer-depth-cs-probe +spec@ext_texture_array@fbo-depth-array depth-clear +spec@ext_texture_array@fbo-depth-array depth-draw +spec@ext_texture_array@fbo-depth-array fs-writes-depth +spec@ext_texture_array@fbo-depth-array fs-writes-stencil +spec@ext_texture_array@fbo-depth-array stencil-clear +spec@ext_texture_array@fbo-depth-array stencil-draw +spec@ext_transform_feedback@max-varyings +spec@!opengl 1.0@gl-1.0-blend-func + +# TC Timeouts +spec@arb_sync@clientwaitsync-timeout +spec@arb_texture_buffer_object@bufferstorage +spec@arb_uniform_buffer_object@bufferstorage +spec@arb_buffer_storage@bufferstorage-persistent read +spec@arb_buffer_storage@bufferstorage-persistent read client-storage +spec@arb_buffer_storage@bufferstorage-persistent read coherent +spec@arb_buffer_storage@bufferstorage-persistent read coherent client-storage +spec@arb_buffer_storage@bufferstorage-persistent_gles3 read +spec@arb_buffer_storage@bufferstorage-persistent_gles3 read client-storage +spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent +spec@arb_buffer_storage@bufferstorage-persistent_gles3 read coherent client-storage + +# These are redundant with arb_copy_image, so skip them to cut down +# on CI runtime: +spec@nv_copy_image@nv_copy_image.* +