From 8e09be4616ccf62943557b20c6bdee55f8efb620 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 13 Mar 2023 19:10:57 +0000 Subject: [PATCH] ci/broadcom: consolidate vc4-rpi3* jobs into a single vc4-rpi3-gl:armhf Without reducing the coverage and using 4 runners instead of 9, most runs take 10-13 minutes instead of 12-13 minutes for the egl job, 9-11 minutes for the piglit job, and 6-8 minutes for the deqp job. Stress-tested over 40+ runs. Part-of: --- src/broadcom/ci/broadcom-rpi3-fails.txt | 5 +-- src/broadcom/ci/broadcom-rpi3-flakes.txt | 5 +++ src/broadcom/ci/deqp-broadcom-rpi3-egl.toml | 21 ------------- .../ci/deqp-broadcom-rpi3-piglit.toml | 6 ---- src/broadcom/ci/deqp-broadcom-rpi3.toml | 28 +++++++++++++++++ src/broadcom/ci/gitlab-ci.yml | 31 +++---------------- 6 files changed, 41 insertions(+), 55 deletions(-) delete mode 100644 src/broadcom/ci/deqp-broadcom-rpi3-egl.toml delete mode 100644 src/broadcom/ci/deqp-broadcom-rpi3-piglit.toml diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index 135dfde9dcf..aadada82052 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -106,11 +106,12 @@ spec@khr_texture_compression_astc@basic-gl,Fail glx@glx-make-current,Crash glx@glx-multithread-buffer,Fail glx@glx-swap-pixmap-bad,Fail -glx@glx-visuals-depth -pixmap,Fail -glx@glx-visuals-stencil -pixmap,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail +# piglit: error: Test timed out. +glx@glx_arb_sync_control@waitformsc,Fail + glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/broadcom/ci/broadcom-rpi3-flakes.txt b/src/broadcom/ci/broadcom-rpi3-flakes.txt index 03488ae52f2..abb3e8e09df 100644 --- a/src/broadcom/ci/broadcom-rpi3-flakes.txt +++ b/src/broadcom/ci/broadcom-rpi3-flakes.txt @@ -9,6 +9,8 @@ glx@glx-multi-window-single-context shaders@glsl-vs-loop shaders@glsl-vs-loop-nested spec@arb_framebuffer_srgb@blit renderbuffer srgb single_sampled enabled clear +spec@ext_framebuffer_blit@fbo-sys-blit +spec@ext_framebuffer_blit@fbo-sys-sub-blit spec@egl_chromium_sync_control@conformance spec@ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-readpixels @@ -27,3 +29,6 @@ spec@!opengl 1.1@draw-copypixels-sync # 2022-12-29 x11-dEQP-EGL.functional.color_clears.multi_context.gles2.rgba8888_pbuffer + +# flaky on wayland, was stable on x11 +spec@ext_image_dma_buf_import@ext_image_dma_buf_import diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml b/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml deleted file mode 100644 index f2ad0142feb..00000000000 --- a/src/broadcom/ci/deqp-broadcom-rpi3-egl.toml +++ /dev/null @@ -1,21 +0,0 @@ -# wayland -[[deqp]] -deqp = "/deqp/modules/egl/deqp-egl-wayland" -caselists = ["/deqp/mustpass/egl-master.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] -prefix = "wayland-" - -# x11 -[[deqp]] -deqp = "/deqp/modules/egl/deqp-egl" -caselists = ["/deqp/mustpass/egl-master.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] -prefix = "x11-" diff --git a/src/broadcom/ci/deqp-broadcom-rpi3-piglit.toml b/src/broadcom/ci/deqp-broadcom-rpi3-piglit.toml deleted file mode 100644 index c299be2327b..00000000000 --- a/src/broadcom/ci/deqp-broadcom-rpi3-piglit.toml +++ /dev/null @@ -1,6 +0,0 @@ -[[piglit]] -piglit_folder = "/piglit" -profile = "quick_gl" -process_isolation = true - [piglit.env] - PIGLIT_PLATFORM = "mixed_glx_egl" diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml index fc9364b4e2c..7fff18eb9ee 100644 --- a/src/broadcom/ci/deqp-broadcom-rpi3.toml +++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml @@ -24,8 +24,36 @@ deqp_args = [ "--deqp-visibility=hidden", ] +[[piglit]] +piglit_folder = "/piglit" +profile = "quick_gl" +process_isolation = true + [piglit.env] + PIGLIT_PLATFORM = "mixed_glx_egl" [[piglit]] piglit_folder = "/piglit" profile = "quick_shader" process_isolation = true + +# wayland +[[deqp]] +deqp = "/deqp/modules/egl/deqp-egl-wayland" +caselists = ["/deqp/mustpass/egl-master.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +prefix = "wayland-" + +# x11 +[[deqp]] +deqp = "/deqp/modules/egl/deqp-egl" +caselists = ["/deqp/mustpass/egl-master.txt"] +deqp_args = [ + "--deqp-surface-width=256", "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", + "--deqp-gl-config-name=rgba8888d24s8ms0", +] +prefix = "x11-" diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml index 516e1c80a9e..80001aeae60 100644 --- a/src/broadcom/ci/gitlab-ci.yml +++ b/src/broadcom/ci/gitlab-ci.yml @@ -17,41 +17,20 @@ variables: BM_BOOTFS: /boot/raspberrypi_armhf -.vc4-rpi3-test:armhf: +vc4-rpi3-gl:armhf: extends: - .broadcom-test:armhf - .vc4-rules - variables: - GPU_VERSION: broadcom-rpi3 - HWCI_KERNEL_MODULES: vc4 script: - ./install/bare-metal/poe-powered.sh tags: - igalia-rpi3 - -vc4-rpi3:armhf: - extends: - - .vc4-rpi3-test:armhf - parallel: 3 - variables: - DEQP_SUITE: broadcom-rpi3 - PIGLIT_PLATFORM: gbm - -vc4-rpi3-egl:armhf: - extends: - - .vc4-rpi3-test:armhf - variables: - HWCI_START_WESTON: 1 - DEQP_SUITE: broadcom-rpi3-egl - -vc4-rpi3-piglit-quick_gl:armhf: - extends: - - .vc4-rpi3-test:armhf parallel: 4 variables: - FDO_CI_CONCURRENT: 1 - HWCI_START_XORG: 1 - DEQP_SUITE: broadcom-rpi3-piglit + GPU_VERSION: broadcom-rpi3 + HWCI_KERNEL_MODULES: vc4 + DEQP_SUITE: broadcom-rpi3 + HWCI_START_WESTON: 1 .v3d-rpi4-test:armhf: extends: