ci/llvmpipe: Use the deqp-runner suite support to consolidate jobs.

5 jobs become 2, plus we add KHR-GLES3 and 31 to the test set since
it's cheap.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12110>
This commit is contained in:
Emma Anholt 2021-07-21 16:40:02 -07:00 committed by Marge Bot
parent 4658a9a479
commit 6f7a921c99
4 changed files with 128 additions and 32 deletions

View File

@ -69,3 +69,69 @@ KHR-GL45.transform_feedback.draw_xfb_instanced_test,Crash
KHR-GL45.transform_feedback.draw_xfb_stream_instanced_test,Crash
KHR-GL45.transform_feedback.query_vertex_interleaved_test,Fail
KHR-GL45.transform_feedback.query_vertex_separate_test,Fail
KHR-GLES31.core.compute_shader.resource-image,Crash
KHR-GLES31.core.geometry_shader.limits.max_texture_units,Fail
KHR-GLES31.core.texture_gather.offset-gather-int-2darray,Crash
KHR-GLES31.core.texture_gather.offset-gather-int-2d,Crash
KHR-GLES31.core.texture_gather.offset-gather-uint-2darray,Crash
KHR-GLES31.core.texture_gather.offset-gather-uint-2d,Crash
KHR-GLES31.core.texture_gather.plain-gather-int-2darray,Crash
KHR-GLES31.core.texture_gather.plain-gather-int-2d,Crash
KHR-GLES31.core.texture_gather.plain-gather-int-cube-rgba,Crash
KHR-GLES31.core.texture_gather.plain-gather-uint-2darray,Crash
KHR-GLES31.core.texture_gather.plain-gather-uint-2d,Crash
KHR-GLES31.core.texture_gather.plain-gather-uint-cube,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_11x131_2_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.r32ui_49x23_2_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_11x131_2_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rg32ui_49x23_2_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_11x131_2_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_0_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_1_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_clamp_to_edge,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_mirrored_repeat,Crash
KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_repeat,Crash

View File

@ -13,3 +13,4 @@ KHR-GL45.copy_image.functional
KHR-GL45.texture_size_promotion.functional
KHR-GL45.texture_swizzle.functional
KHR-GL45.texture_swizzle.smoke
KHR-GLES31.core.arrays_of_arrays.InteractionFunctionCalls2

View File

@ -0,0 +1,56 @@
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = ["/deqp/mustpass/gles2-master.txt"]
deqp_args = [
"--deqp-surface-width=256",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
[[deqp]]
deqp = "/deqp/modules/gles3/deqp-gles3"
caselists = ["/deqp/mustpass/gles3-master.txt"]
deqp_args = [
"--deqp-surface-width=256",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
[[deqp]]
deqp = "/deqp/modules/gles31/deqp-gles31"
caselists = ["/deqp/mustpass/gles31-master.txt"]
deqp_args = [
"--deqp-surface-width=256",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
[deqp.env]
# Stress test NIR clone/serialization for GLES3.1 (which should cover most of the featureset).
# Costs about 30% extra runtime.
NIR_TEST_CLONE = "true"
NIR_TEST_SERIALIZE = "true"
# Note that KHR-GL3* test sets include all tests from the previous
# version, so we only need to run one test list (unlike dEQP-GLES,
# where the test sets are separate).
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gles2-khr-master.txt",
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles31-khr-master.txt",
"/deqp/mustpass/gl45-master.txt",
]
deqp_args = [
"--deqp-surface-width=256",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]

View File

@ -90,39 +90,12 @@ llvmpipe-traces:
- .deqp-test
- .llvmpipe-test
llvmpipe-gles2:
llvmpipe-deqp:
variables:
DEQP_VER: gles2
extends:
- .llvmpipe-deqp-test
llvmpipe-gles3:
variables:
DEQP_VER: gles3
extends:
- .llvmpipe-deqp-test
llvmpipe-gles31:
variables:
DEQP_VER: gles31
# Stress test NIR clone/serialization with significant shaders enabled.
# Costs about 30% extra runtime.
NIR_TEST_CLONE: "true"
NIR_TEST_SERIALIZE: "true"
extends:
- .llvmpipe-deqp-test
llvmpipe-gl:
variables:
DEQP_VER: gl45
extends:
- .llvmpipe-deqp-test
llvmpipe-khr-gles2:
variables:
DEQP_VER: gles2-khr
extends:
- .llvmpipe-deqp-test
DEQP_VER: gles2 # for the renderer check
DEQP_SUITE: llvmpipe
parallel: 2
extends: .llvmpipe-deqp-test
llvmpipe-egl:
variables: