From 716ba29056e073125d0627d20b010d155ff22020 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Thu, 5 Aug 2021 08:27:15 +0200 Subject: [PATCH] virgl/ci: Rebalance concurrency Crosvm deals with virtio-gpu commands sequentially, so parallelization in the host doesn't help much. Also, too much parallelization in the guest causes some tests to time out. So reduce the number of dEQP instances being run concurrently, make sure we dont limit the number of CPUs being used in the host and schedule more jobs in CI to keep the times below 10 minutes. Closes: #5172 Signed-off-by: Tomeu Vizoso Reviewed-by: Gert Wollny Part-of: --- .gitlab-ci/crosvm-runner.sh | 2 +- src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt | 6 +++--- src/gallium/drivers/virgl/ci/gitlab-ci.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index ca5cce4ee7a..dcd1d473877 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -33,7 +33,7 @@ syslogd > /dev/null crosvm run \ --gpu "$CROSVM_GPU_ARGS" \ -m 4096 \ - -c 4 \ + -c $((FDO_CI_CONCURRENT > 1 ? FDO_CI_CONCURRENT - 1 : 1)) \ --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ --host_ip=192.168.30.1 --netmask=255.255.255.0 --mac "AA:BB:CC:00:00:12" \ diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt index 79854c9a60d..e315117d258 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt @@ -41,9 +41,9 @@ dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide,Fail dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide,Fail dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail -dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12,Fail -dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_32,Fail +dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8,Fail +dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_12,Fail +dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_writeonly_12,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index acc5dd50b19..3380c6e8572 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -14,9 +14,10 @@ virgl-on-gl: GPU_VERSION: virgl-gl # Speed rendering a bit, as crosvm is processing requests serially LP_NUM_THREADS: 8 + DEQP_PARALLEL: 3 DEQP_EXPECTED_RENDERER: virgl CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh" - parallel: 2 + parallel: 6 tags: - kvm script: