From 2a3b983728e5d2fde065c5d94e8816e7d4be707a Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Tue, 2 Jul 2024 19:02:12 +0200 Subject: [PATCH] broadcom/ci: run some GL tests in arm32 arch While Raspberry PI OS 64-bit is the suggested version for rpi3 devices and newers, for older devices like rpi1 to rpi2, which uses the same GPU, the recommended flavour is 32-bit. Also, while 64-bit is the recommended version, users can still decide to use the 32-bit flavour. Hence, spend a bit of nightly time to run a subset of the OpenGL/ES tests. Reviewed-by: Eric Engestrom Signed-off-by: Juan A. Suarez Romero Part-of: --- src/broadcom/ci/broadcom-rpi3-fails.txt | 19 +++++++++ src/broadcom/ci/broadcom-rpi4-fails.txt | 3 ++ src/broadcom/ci/deqp-broadcom-rpi3-arm32.toml | 27 +++++++++++++ src/broadcom/ci/deqp-broadcom-rpi4-arm32.toml | 40 +++++++++++++++++++ src/broadcom/ci/gitlab-ci.yml | 23 ++++++++++- 5 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 src/broadcom/ci/deqp-broadcom-rpi3-arm32.toml create mode 100644 src/broadcom/ci/deqp-broadcom-rpi4-arm32.toml diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index 7ab493df0a2..0270ed5b107 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -1195,3 +1195,22 @@ spec@glsl-1.10@execution@glsl-1.10-built-in-uniform-state,Fail # Couldn't reproduce locally spec@oes_packed_depth_stencil@depth_stencil texture gles2,Fail + +# Failures from arm32 +arm32-KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component16,Fail +arm32-KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_int_depth_component24,Fail +arm32-KHR-GLES2.core.internalformat.texture2d.depth_component_unsigned_short_depth_component16,Fail +arm32-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail +arm32-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail +arm32-dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_masked,Fail +arm32-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_rgba8888,Fail +arm32-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_rgba8888,Fail +arm32-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_mirror_rgba8888,Fail +arm32-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_repeat_rgba8888,Fail +arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat_non_square,Fail +arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp_non_square,Fail +arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror_non_square,Fail +arm32-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat_non_square,Fail +arm32-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_etc1,Fail +arm32-dEQP-GLES2.functional.uniform_api.random.3,Fail +arm32-dEQP-GLES2.functional.uniform_api.random.79,Fail diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index c5d4b3c3e86..5babe7cc0cf 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -621,3 +621,6 @@ program@execute@scalar-comparison-ulong,Crash program@execute@scalar-load-long,Crash program@execute@scalar-load-ulong,Crash program@run kernel with max work item sizes,Fail + +# Failures from arm32 +arm32-KHR-GL31.texture_size_promotion.functional,Fail diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-arm32.toml b/src/broadcom/ci/deqp-broadcom-rpi3-arm32.toml new file mode 100644 index 00000000000..cb2edf5301f --- /dev/null +++ b/src/broadcom/ci/deqp-broadcom-rpi3-arm32.toml @@ -0,0 +1,27 @@ +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-main.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", +] +version_check = "GL ES 2.0.*git" +renderer_check = "VC4 V3D 2.1" +prefix = "arm32-" + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gles2-khr-main.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", +] +prefix = "arm32-" diff --git a/src/broadcom/ci/deqp-broadcom-rpi4-arm32.toml b/src/broadcom/ci/deqp-broadcom-rpi4-arm32.toml new file mode 100644 index 00000000000..caa71c17d50 --- /dev/null +++ b/src/broadcom/ci/deqp-broadcom-rpi4-arm32.toml @@ -0,0 +1,40 @@ +[[deqp]] +deqp = "/deqp/modules/gles31/deqp-gles31" +caselists = ["/deqp/mustpass/gles31-main.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 4.2.14" +fraction = 4 +prefix = "arm32-" + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = [ + "/deqp/mustpass/gles31-khr-main.txt", +] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] +prefix = "arm32-" + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gl31-main.txt"] +deqp_args = [ + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-surface-width=256", + "--deqp-visibility=hidden", +] +prefix = "arm32-" diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index b6761522853..4455054306c 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -21,6 +21,17 @@ vc4-rpi3-gl-piglit-full:arm64: variables: DEQP_SUITE: broadcom-rpi3-piglit-full +vc4-rpi3-gl:arm32: + extends: + - .igalia-bcm2837-rpi-3-b + - .broadcom-test:arm32 + - .vc4-manual-rules + tags: + - igalia-rpi3 + - igalia-fullrun + variables: + DEQP_SUITE: broadcom-rpi3-arm32 + v3d-rpi4-gl:arm64: extends: @@ -48,7 +59,7 @@ v3d-rpi4-gl-full:arm64: v3d-rpi4-rusticl:arm64: extends: - - .igalia-bcm2711-rpi-4:arm64 + - .igalia-bcm2711-rpi-4 - .broadcom-test:arm64 - .v3d-rusticl-manual-rules timeout: 30m # base run time = 17min test, 19min total @@ -68,6 +79,16 @@ v3d-rpi4-traces:arm64: PIGLIT_REPLAY_DEVICE_NAME: "broadcom-rpi4" PIGLIT_RESULTS: "broadcom-rpi4-replay" +v3d-rpi4-gl:arm32: + extends: + - .igalia-bcm2711-rpi-4 + - .broadcom-test:arm32 + - .v3d-manual-rules + tags: + - igalia-rpi4 + - igalia-fullrun + variables: + DEQP_SUITE: broadcom-rpi4-arm32 v3dv-rpi4-vk:arm64: extends: