broadcom/ci: restructure expected results

Sort/rename the files so expected tests are classified by device.

No need to split the tests by driver (e.g., V3D vs V3DV).

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13983>

src/broadcom/ci/broadcom-rpi4-flakes.txt

@@ -9,3 +9,9 @@ spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=2
 spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4
 spec@arb_occlusion_query@occlusion_query_order
 spec@egl_chromium_sync_control@conformance
+
+dEQP-VK.api.external.fence.opaque_fd.reset_permanent
+dEQP-VK.api.external.fence.opaque_fd.reset_temporary
+dEQP-VK.api.external.fence.opaque_fd.signal_export_import_wait_permanent
+dEQP-VK.ssbo.layout.instance_array_basic_type.std430.uvec4
+dEQP-VK.wsi.display.get_display_plane_capabilities

src/broadcom/ci/broadcom-rpi4-skips.txt

@@ -38,3 +38,24 @@ spec@glsl-1.50.*
 spec@glsl-3.*
 spec@glsl-4.*
 spec@glsl-es-3.20.*
+
+# Broadcom waivers
+dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltazero
+dEQP-VK.rasterization.depth_bias.d32_sfloat
+
+# Slow tests (> 1 minute to run)
+dEQP-VK.api.object_management.max_concurrent.query_pool
+dEQP-VK.memory.mapping.dedicated_alloc.buffer.full.variable.implicit_unmap
+dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap
+dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap
+dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_geom
+dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_vert
+dEQP-VK.ssbo.layout.random.all_shared_buffer.5
+dEQP-VK.ssbo.layout.random.arrays_of_arrays.13
+dEQP-VK.ssbo.layout.random.nested_structs_arrays.0
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_repeat
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_clamp
+dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_repeat
+dEQP-VK.ubo.random.all_out_of_order_offsets.45
+dEQP-VK.ubo.random.all_shared_buffer.48

src/broadcom/ci/gitlab-ci.yml

@@ -5,7 +5,7 @@
     - .use-debian/arm_test
   variables:
     BM_BOOTFS: /boot/raspberrypi_armhf
-    GPU_VERSION: vc4-rpi3
+    GPU_VERSION: broadcom-rpi3
     HWCI_KERNEL_MODULES: vc4
     FLAKES_CHANNEL: "#videocore-ci"
   script:
@@ -23,7 +23,7 @@ vc4-rpi3-gles:armhf:
   parallel: 2
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_SUITE: vc4-rpi3-gles
+    DEQP_SUITE: broadcom-rpi3
 
 vc4-rpi3-egl:armhf:
   extends:
@@ -71,7 +71,7 @@ vc4-rpi3-piglit-quick_shader:armhf:
     BM_BOOTFS: /boot/raspberrypi_armhf
     BM_POE_TIMEOUT: 300
     FLAKES_CHANNEL: "#videocore-ci"
-    GPU_VERSION: v3d-rpi4
+    GPU_VERSION: broadcom-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4
   script:
     - ./install/bare-metal/poe-powered.sh
@@ -86,7 +86,7 @@ v3d-rpi4-gles:armhf:
     - .v3d-rpi4-test:armhf
   parallel: 8
   variables:
-    DEQP_SUITE: v3d-rpi4-gles
+    DEQP_SUITE: broadcom-rpi4
 
 v3d-rpi4-egl:armhf:
   extends:
@@ -120,7 +120,7 @@ v3dv-rpi4-vk:arm64:
     DEQP_FRACTION: 5
     DEQP_VER: vk
     FLAKES_CHANNEL: "#videocore-ci"
-    GPU_VERSION: v3dv-rpi4
+    GPU_VERSION: broadcom-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4
     VK_DRIVER: broadcom
   script:

src/broadcom/ci/v3dv-rpi4-flakes.txt

@@ -1,5 +0,0 @@
-dEQP-VK.api.external.fence.opaque_fd.reset_permanent
-dEQP-VK.api.external.fence.opaque_fd.reset_temporary
-dEQP-VK.api.external.fence.opaque_fd.signal_export_import_wait_permanent
-dEQP-VK.ssbo.layout.instance_array_basic_type.std430.uvec4
-dEQP-VK.wsi.display.get_display_plane_capabilities

src/broadcom/ci/v3dv-rpi4-skips.txt

@@ -1,20 +0,0 @@
-# Broadcom waivers
-dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltazero
-dEQP-VK.rasterization.depth_bias.d32_sfloat
-
-# Timeout tests (> 1 minute to run)
-dEQP-VK.api.object_management.max_concurrent.query_pool
-dEQP-VK.memory.mapping.dedicated_alloc.buffer.full.variable.implicit_unmap
-dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap
-dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap
-dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_geom
-dEQP-VK.spirv_assembly.instruction.graphics.spirv_ids_abuse.lots_ids_vert
-dEQP-VK.ssbo.layout.random.all_shared_buffer.5
-dEQP-VK.ssbo.layout.random.arrays_of_arrays.13
-dEQP-VK.ssbo.layout.random.nested_structs_arrays.0
-dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
-dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_repeat
-dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_clamp
-dEQP-VK.texture.explicit_lod.2d.sizes.128x128_nearest_linear_mipmap_linear_repeat
-dEQP-VK.ubo.random.all_out_of_order_offsets.45
-dEQP-VK.ubo.random.all_shared_buffer.48