Module: Mesa Branch: main Commit: ba4eeaf435f050dfec5472c7919b9b70e38d1bb8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba4eeaf435f050dfec5472c7919b9b70e38d1bb8
Author: Eric Engestrom <[email protected]> Date: Mon Apr 3 18:22:25 2023 +0100 broadcom/ci: run gl jobs on arm64, just like vk These were running on armhf because that's the default in the custom distro that Raspberry Pi provides, but arm64 is ~20% faster, and we already run weekly tests on both arm64 & armhf, so let's keep only the faster one in the pre-merge path. Signed-off-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22272> --- src/broadcom/ci/broadcom-rpi3-fails.txt | 3 +++ src/broadcom/ci/gitlab-ci.yml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index 5846ea4b3e4..6375136965d 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -783,6 +783,9 @@ spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- glPolygonMode(GL_LINE)- quadrant: right middle PV: FIRST,Fail spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- glPolygonMode(GL_LINE)- quadrant: right top PV: FIRST,Fail +# fails on arm64, passes on armhf +spec@arb_depth_buffer_float@depthstencil-render-miplevels 1024 s=z24_s8_d=z32f,Fail + # Crashes in this group are CMA allocation fails spec@!opengl 1.1@depthstencil-default_fb-blit samples=2,Crash spec@!opengl 1.1@depthstencil-default_fb-blit samples=4,Crash diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index 71da783c6d2..8ae16249d4d 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -17,9 +17,9 @@ variables: BM_BOOTFS: /boot/raspberrypi_armhf -vc4-rpi3-gl:armhf: +vc4-rpi3-gl:arm64: extends: - - .broadcom-test:armhf + - .broadcom-test:arm64 - .vc4-rules script: - ./install/bare-metal/poe-powered.sh @@ -32,9 +32,9 @@ vc4-rpi3-gl:armhf: DEQP_SUITE: broadcom-rpi3 HWCI_START_WESTON: 1 -v3d-rpi4-gl:armhf: +v3d-rpi4-gl:arm64: extends: - - .broadcom-test:armhf + - .broadcom-test:arm64 - .v3d-rules script: - ./install/bare-metal/poe-powered.sh
