broadcom/ci: merge gl test lists to use a single deqp instance

This makes the config file easier to read, and also shaves 5-10 seconds
of deqp-run per job, but that's cancelled out by all the random network
delays of everything else in the job so we'll never actually notice the
difference.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26039>
This commit is contained in:
Eric Engestrom 2023-11-02 18:18:45 +00:00 committed by Marge Bot
parent 790fabd38e
commit 9349b7d2fb
2 changed files with 10 additions and 49 deletions

View file

@ -1,6 +1,9 @@
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = [ "/deqp/mustpass/gles2-master.txt" ]
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gles2-master.txt",
"/deqp/mustpass/gles2-khr-master.txt",
]
tests_per_group = 250
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
@ -12,18 +15,6 @@ deqp_args = [
version_check = "GL ES 2.0.*git"
renderer_check = "VC4"
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [ "/deqp/mustpass/gles2-khr-master.txt" ]
tests_per_group = 250
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
# We are getting frequent GPU hangs with piglit, but still haven't identified
# the cause. So let's disable it for now.
# [[piglit]]

View file

@ -1,41 +1,9 @@
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = [ "/deqp/mustpass/gles31-master.txt" ]
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
version_check = "GL ES 3.1.*git"
renderer_check = "V3D"
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = [ "/deqp/mustpass/gles3-master.txt" ]
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = [ "/deqp/mustpass/gles2-master.txt" ]
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gles31-master.txt",
"/deqp/mustpass/gles3-master.txt",
"/deqp/mustpass/gles2-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles2-khr-master.txt",
@ -47,6 +15,8 @@ deqp_args = [
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
version_check = "GL ES 3.1.*git"
renderer_check = "V3D"
[[piglit]]
piglit_folder = "/piglit"