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 <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22272>

diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt
index 5846ea4..6375136 100644 (file)
--- 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 71da783..8ae1624 100644 (file)
--- 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