fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

{freedreno,intel}/ci: rename "premerge-skips.txt" to "merge-skips.txt" to accurately reflect what they are

Browse source 
This also means the infrastructure added by @gallo in 1dc64d0613
("ci: Use merge-skips files during merge pipelines") can be used and all
the manual adding of these files can be dropped, reducing the likeliness
of bugs.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31739>
This commit is contained in:
Eric Engestrom 2024-10-18 17:25:46 +02:00 • committed by Marge Bot
parent bb98949134
commit ee0d782229
19 changed files with 54 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/freedreno/ci/deqp-freedreno-a618-egl.toml
View file

@ -2,7 +2,7 @@
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",

6
src/freedreno/ci/deqp-freedreno-a618-vk.toml
View file

@ -2,7 +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-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["dEQP-VK.graphicsfuzz.*", "dEQP-VK.subgroups.ballot*"]
prefix = "spill-"
[deqp.env]

26
src/freedreno/ci/deqp-freedreno-a618.toml
View file

@ -2,7 +2,7 @@
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = ["/deqp/mustpass/gles2-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +14,7 @@ renderer_check = "FD618"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +24,7 @@ deqp_args = [
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +38,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-main.txt",
"/deqp/mustpass/gles31-khr-main.txt",
]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +53,7 @@ deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl46-main.txt",
]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +65,7 @@ deqp_args = [
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +81,7 @@ FD_MESA_DEBUG = "gmem"
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +97,7 @@ FD_MESA_DEBUG = "sysmem"
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +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-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +136,7 @@ prefix = "565-nozs-"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-multisample.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +147,7 @@ prefix = "multisample-"
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-multisample.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.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 +159,7 @@ prefix = "multisample-"
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = ["/deqp/mustpass/gles2-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a618-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["functional.shaders"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",

4
src/freedreno/ci/deqp-freedreno-a630-vk-asan.toml
View file

@ -2,7 +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-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt", "install/freedreno-a630-asan-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-asan-skips.txt"]
include = ["dEQP-VK.graphicsfuzz.barrier-in-loop-with-break"]
prefix = "spill-"
[deqp.env]

14
src/freedreno/ci/deqp-freedreno-a630-vk.toml
View file

@ -2,7 +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-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
prefix = "stale-regs-"
fraction = 200
[deqp.env]

30
src/freedreno/ci/deqp-freedreno-a630.toml
View file

@ -2,7 +2,7 @@
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = ["/deqp/mustpass/gles2-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +14,7 @@ renderer_check = "FD630"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +24,7 @@ deqp_args = [
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +38,7 @@ caselists = [
"/deqp/mustpass/gles3-khr-main.txt",
"/deqp/mustpass/gles31-khr-main.txt",
]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +53,7 @@ deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl46-main.txt",
]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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,7 +64,7 @@ deqp_args = [
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.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 +159,7 @@ prefix = "565-nozs-"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-multisample.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a630-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["functional.shaders"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",

8
src/freedreno/ci/deqp-freedreno-a660-vk.toml
View file

@ -2,7 +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-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"]
#skips = ["install/freedreno-a6xx-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-a6xx-skips.txt", "install/freedreno-a660-premerge-skips.txt"]
#skips = ["install/freedreno-a6xx-skips.txt"]
#prefix = "stale-regs-"
#fraction = 200
#[deqp.env]

14
src/freedreno/ci/deqp-freedreno-a750-vk.toml
View file

@ -2,7 +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-a750-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
renderer_check = "Turnip Adreno .* 750"
tests_per_group = 10000
@ -11,7 +11,7 @@ tests_per_group = 10000
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a750-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
prefix = "gmem-"
fraction = 20
tests_per_group = 1000
@ -22,7 +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-a750-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["dEQP-VK.renderpass.*"]
prefix = "gmem-unaligned-"
fraction = 10
@ -34,7 +34,7 @@ TU_DEBUG = "gmem,unaligned_store"
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a750-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["dEQP-VK.renderpass.*"]
prefix = "bypass-"
fraction = 10
@ -47,7 +47,7 @@ TU_DEBUG = "sysmem"
# [[deqp]]
# deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
# caselists = ["/deqp/mustpass/vk-main.txt"]
# skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a750-premerge-skips.txt"]
# skips = ["install/freedreno-a6xx-skips.txt"]
# include = ["dEQP-VK.graphicsfuzz.*"]
# prefix = "spill-"
# fraction = 10
@ -59,7 +59,7 @@ TU_DEBUG = "sysmem"
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a750-premerge-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["dEQP-VK.renderpass2.*"]
prefix = "dynamic-"
tests_per_group = 10000
@ -71,7 +71,7 @@ TU_DEBUG = "dynamic"
# [[deqp]]
# deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
# caselists = ["/deqp/mustpass/vk-main.txt"]
# skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a750-premerge-skips.txt"]
# skips = ["install/freedreno-a6xx-skips.txt"]
# prefix = "stale-regs-"
# fraction = 100
# tests_per_group = 1000

0
src/freedreno/ci/freedreno-a618-premerge-skips.txt → src/freedreno/ci/freedreno-a618-merge-skips.txt
View file

0
src/freedreno/ci/freedreno-a630-premerge-skips.txt → src/freedreno/ci/freedreno-a630-merge-skips.txt
View file

2
src/freedreno/ci/freedreno-a630-skips.txt
View file

@ -2,7 +2,7 @@
# non-zero-length and not starting with '#', will regex match to
# delete lines from the test list. Be careful.
# Note normal pre-merge CI also includes -premerge-skips.txt, and that's where
# Note normal merge CI also includes -merge-skips.txt, and that's where
# "it's slow but would pass/fail/crash within a couple of minutes" skips should go.
# Still running after 3 hours, time is spent in batch_draw_tracking().

0
src/freedreno/ci/freedreno-a660-premerge-skips.txt → src/freedreno/ci/freedreno-a660-merge-skips.txt
View file

0
src/freedreno/ci/freedreno-a750-premerge-skips.txt → src/freedreno/ci/freedreno-a750-merge-skips.txt
View file

3
src/gallium/drivers/zink/ci/deqp-zink-anv-adl.toml
View file

@ -49,7 +49,6 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
skips = ["/install/zink-anv-adl-premerge-skips.txt"]
timeout = 180.0
[deqp.env]
ZINK_DEBUG = "validation"
@ -69,7 +68,6 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
skips = ["/install/zink-anv-adl-premerge-skips.txt"]
timeout = 180.0
include = ["KHR-GL46.sample_variables.mask.rgba8.*.samples.*.mask.*"]
prefix = "noopt-"
@ -98,7 +96,6 @@ prefix = "noopt-"
piglit_folder = "/piglit"
profile = "quick_gl"
process_isolation = true
skips = ["/install/zink-anv-adl-premerge-skips.txt"]
timeout = 180.0
fraction = 3

3
src/gallium/drivers/zink/ci/deqp-zink-anv-tgl.toml
View file

@ -49,7 +49,6 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
skips = ["/install/zink-anv-tgl-premerge-skips.txt"]
timeout = 180.0
[deqp.env]
ZINK_DEBUG = "validation"
@ -69,7 +68,6 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
skips = ["/install/zink-anv-tgl-premerge-skips.txt"]
timeout = 180.0
include = ["KHR-GL46.sample_variables.mask.rgba8.*.samples.*.mask.*"]
prefix = "noopt-"
@ -98,6 +96,5 @@ prefix = "noopt-"
piglit_folder = "/piglit"
profile = "quick_gl"
process_isolation = true
skips = ["/install/zink-anv-tgl-premerge-skips.txt"]
timeout = 180.0
fraction = 2

0
src/gallium/drivers/zink/ci/zink-anv-adl-premerge-skips.txt → src/gallium/drivers/zink/ci/zink-anv-adl-merge-skips.txt
View file

0
src/gallium/drivers/zink/ci/zink-anv-tgl-premerge-skips.txt → src/gallium/drivers/zink/ci/zink-anv-tgl-merge-skips.txt
View file

0
src/intel/ci/anv-jsl-premerge-skips.txt → src/intel/ci/anv-jsl-merge-skips.txt
View file

1
src/intel/ci/deqp-anv-jsl.toml
View file

@ -1,6 +1,5 @@
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
caselists = ["/deqp/mustpass/vk-main.txt"]
skips = ["install/anv-jsl-premerge-skips.txt"]
fraction = 12
renderer_check = "JSL"