fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 06:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ci: remove redundant skip files

Browse source 
When running deqp-runner with a toml suite, the skip files can be
specified in the toml configuration or on the command line. The names of
most skip files are generated in `deqp-runner.sh` and passed through on
the command line so it’s not necessary to specify them again in the toml
suite. It doesn’t hurt, but it can be confusing.

Simplify the toml files by removing the duplicate skip files.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31912>
This commit is contained in:
Deborah Brouwer 2024-10-29 19:28:51 -07:00
parent eef0b09939
commit a39d6f5003
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

6
src/freedreno/ci/deqp-freedreno-a630-vk-full.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-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
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-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
prefix = "gmem-"
fraction = 10
@ -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-a630-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
include = ["dEQP-VK.renderpass.*"]
prefix = "bypass-"

8
src/freedreno/ci/deqp-freedreno-a660-vk-full.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-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
renderer_check = "Turnip Adreno .* 660"
@ -11,7 +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"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
prefix = "gmem-"
fraction = 10
@ -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-a660-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
prefix = "nobin-"
fraction = 10
@ -34,7 +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"]
skips = ["install/freedreno-a6xx-skips.txt"]
timeout = 300
include = ["dEQP-VK.renderpass.*"]
prefix = "bypass-"

26
src/freedreno/ci/deqp-freedreno-a660.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-a660-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 = "FD660"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-main.txt"]
skips = ["install/freedreno-a6xx-skips.txt", "install/freedreno-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-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-a660-skips.txt"]
skips = ["install/freedreno-a6xx-skips.txt"]
include = ["functional.shaders"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",