AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcom/ci: use deqp-runner suites for gles

Browse Source 
Glue together all the GLES related jobs using the suites feature.

This allow us to reduce the total number of devices required, moving
some of them to help in other jobs, and the remaining free for other
pipelines in parallel.

Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12453>
This commit is contained in:
Juan A. Suarez Romero
2021-08-18 11:02:03 +02:00
committed by Marge Bot
parent e3b4c77ed3
commit c65e2eed32
4 changed files with 97 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/ci/deqp-v3d-rpi4-gles.toml
+47
View File
@@ -0,0 +1,47 @@
[[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",
]
[[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-khr-master.txt",
"/deqp/mustpass/gles3-khr-master.txt",
"/deqp/mustpass/gles2-khr-master.txt",
]
deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-surface-width=256",
"--deqp-visibility=hidden",
]
src/broadcom/ci/deqp-v3dv-rpi4-flakes.txt
+10
View File
@@ -2,17 +2,27 @@ dEQP-VK.api.external.fence.opaque_fd.reset_permanent
dEQP-VK.api.external.fence.opaque_fd.reset_temporary
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.1B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.32B_out_of_memory_with_vec4_s32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.32B_out_of_memory_with_vec4_u32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.3B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.3B_out_of_memory_with_vec4_f32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.3B_out_of_memory_with_vec4_u32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.4B_out_of_memory_with_scalar_f32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.4B_out_of_memory_with_scalar_s32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.4B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.compute.reads.4B_out_of_memory_with_vec4_s32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.16B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.1B_out_of_memory_with_scalar_f32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.4B_out_of_memory_with_scalar_f32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.4B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.4B_out_of_memory_with_vec4_s32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.16B_out_of_memory_with_vec4_f32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.1B_out_of_memory_with_vec4_s32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.32B_out_of_memory_with_scalar_s32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.3B_out_of_memory_with_scalar_f32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.3B_out_of_memory_with_vec4_u32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.4B_out_of_memory_with_scalar_f32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.4B_out_of_memory_with_scalar_s32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.4B_out_of_memory_with_scalar_u32
dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.vertex.4B_out_of_memory_with_vec4_s32
dEQP-VK.ssbo.layout.instance_array_basic_type.std430.uvec4
dEQP-VK.wsi.display.get_display_plane_capabilities
src/broadcom/ci/deqp-vc4-rpi3-gles.toml
+23
View File
@@ -0,0 +1,23 @@
[[deqp]]
deqp = "/deqp/modules/gles2/deqp-gles2"
caselists = [ "/deqp/mustpass/gles2-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",
]
[[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",
]
src/broadcom/ci/gitlab-ci.yml
+17 -58
View File
@@ -19,33 +19,22 @@
tags:
- igalia-rpi3
.vc4-rpi3-deqp:armhf:
vc4-rpi3-gles:armhf:
extends:
- .vc4-rpi3-test:armhf
parallel: 2
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_SUITE: vc4-rpi3-gles
DEQP_VER: gles2
vc4-rpi3-egl:armhf:
extends:
- .vc4-rpi3-test:armhf
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
# The vc4s are so slow that it takes about a minute to get through the
# default 500 tests in a group, triggering the serial watchdog.
DEQP_RUNNER_OPTIONS: "--tests-per-group 250"
vc4-rpi3-gles2:armhf:
extends:
- .vc4-rpi3-deqp:armhf
parallel: 4
variables:
DEQP_VER: gles2
vc4-rpi3-khr-gles2:armhf:
extends:
- .vc4-rpi3-deqp:armhf
variables:
DEQP_VER: gles2-khr
vc4-rpi3-egl:armhf:
extends:
- .vc4-rpi3-deqp:armhf
variables:
HWCI_START_XORG: 1
DEQP_RUNNER_OPTIONS: "--tests-per-group 250"
DEQP_VER: egl
.vc4-rpi3-piglit:armhf:
@@ -97,44 +86,14 @@ vc4-rpi3-piglit-quick_shader:armhf:
tags:
- igalia-rpi4
v3d-rpi4-gles31:armhf:
v3d-rpi4-gles:armhf:
extends:
- .v3d-rpi4-test:armhf
parallel: 2
parallel: 8
variables:
DEQP_SUITE: v3d-rpi4-gles
DEQP_VER: gles31
v3d-rpi4-gles3:armhf:
extends:
- .v3d-rpi4-test:armhf
parallel: 4
variables:
DEQP_VER: gles3
v3d-rpi4-gles2:armhf:
extends:
- .v3d-rpi4-test:armhf
variables:
DEQP_VER: gles2
v3d-rpi4-khr-gles31:armhf:
extends:
- .v3d-rpi4-test:armhf
variables:
DEQP_VER: gles31-khr
v3d-rpi4-khr-gles3:armhf:
extends:
- .v3d-rpi4-test:armhf
variables:
DEQP_VER: gles3-khr
v3d-rpi4-khr-gles2:armhf:
extends:
- .v3d-rpi4-test:armhf
variables:
DEQP_VER: gles2-khr
v3d-rpi4-egl:armhf:
extends:
- .v3d-rpi4-test:armhf
@@ -146,7 +105,7 @@ v3d-rpi4-piglit:armhf:
extends:
- .piglit-test
- .v3d-rpi4-test:armhf
parallel: 3
parallel: 4
variables:
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_START_XORG: 1
@@ -158,14 +117,14 @@ v3dv-rpi4-vk:arm64:
- .baremetal-test
- .use-debian/arm_test
- .v3dv-rules
parallel: 6
parallel: 8
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_arm64
BM_POE_TIMEOUT: 300
BM_ROOTFS: /rootfs-arm64
DEQP_EXPECTED_RENDERER: "V3D 4.2"
DEQP_FRACTION: 7
DEQP_FRACTION: 5
DEQP_VER: vk
FLAKES_CHANNEL: "#videocore-ci"
GPU_VERSION: v3dv-rpi4