v3d/v3dv/ci: adjust job fractions

So far we have 12 jobs for v3d-gl (OpenGL/ES and piglit), 1 job for
v3d-traces, and 10 jobs for v3dv-vulkan, but we only have 21 rpi4
devices for testing.

So let's reduce from 12 to 10 jobs in v3d-gl, so all jobs can run
simultaneously.

Also, as the ideal goal is that each job doesn't take more than 15
minutes, let's increase a little bit the fraction for v3dv, and include
a fraction for v3d-gl as well, so all jobs are ideally under the time
limit.

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23285>

diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index 43d15f1..47966d3 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -525,3 +525,5 @@ dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgba32i_cube,Fail
 
 # Debian bookworm update (2023-04-27)
 spec@!opengl 1.0@depth-clear-precision-check,Timeout
+
+dEQP-VK.wsi.acquire_drm_display.acquire_drm_display_invalid_fd,Fail

diff --git a/src/broadcom/ci/broadcom-rpi4-skips.txt b/src/broadcom/ci/broadcom-rpi4-skips.txt
index c5f364e..51538c7 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi4-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi4-skips.txt
@@ -61,6 +61,7 @@ dEQP-VK.binding_model.buffer_device_address.set3.depth3.basessbo.convertcheckuv2
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.basessbo.convertcheckuv2.store.single.std140.comp
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.basessbo.convertcheckuv2.store.single.std140.frag
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.basessbo.convertcheckuv2.store.single.std140.vert
+dEQP-VK.binding_model.buffer_device_address.set3.depth3.basessbo.convertuvec2.store.single.std140.vert
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.baseubo.convertcheckuv2.nostore.multi.std140.comp
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.baseubo.convertcheckuv2.nostore.multi.std140.frag
 dEQP-VK.binding_model.buffer_device_address.set3.depth3.baseubo.convertcheckuv2.nostore.multi.std140.vert
@@ -87,6 +88,9 @@ 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.3_level_array.std140.column_major_mat4
+dEQP-VK.ssbo.layout.3_level_array.std430.mat4
+dEQP-VK.ssbo.layout.3_level_unsized_array.std430.row_major_mat4
 dEQP-VK.ssbo.layout.random.16bit.all_per_block_buffers.5
 dEQP-VK.ssbo.layout.random.16bit.all_shared_buffer.40
 dEQP-VK.ssbo.layout.random.8bit.all_per_block_buffers.5
@@ -105,6 +109,3 @@ 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.ssbo.layout.3_level_array.std430.mat4
-dEQP-VK.ssbo.layout.3_level_array.std140.column_major_mat4
-dEQP-VK.ssbo.layout.3_level_unsized_array.std430.row_major_mat4

diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 9c506cd..2c4452b 100644 (file)
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -38,12 +38,13 @@ v3d-rpi4-gl:armhf:
     - .v3d-rules
   tags:
     - igalia-rpi4
-  parallel: 12
+  parallel: 10
   variables:
     GPU_VERSION: broadcom-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4
     HWCI_START_WESTON: 1
     DEQP_SUITE: broadcom-rpi4
+    DEQP_FRACTION: 2
 
 v3d-rpi4-traces:arm64:
   extends:
@@ -70,7 +71,7 @@ v3dv-rpi4-vk:arm64:
   variables:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     DEQP_EXPECTED_RENDERER: "V3D.4.2"
-    DEQP_FRACTION: 8
+    DEQP_FRACTION: 9
     DEQP_VER: vk
     FLAKES_CHANNEL: "#videocore-ci"
     GPU_VERSION: broadcom-rpi4