From b4132bd026fc40480299aa54f654f4c89e861b70 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 8 Feb 2022 13:21:50 -0800 Subject: [PATCH] ci/zink: Move testing to shared 64-core runners at Google. Now the main deqp and piglit run takes about 4:30 of runner time in a single job. Added a couple of flakes that hit this MR, but which I think predate it (probably due to not having #zink-ci until recently). Acked-by: Daniel Stone Part-of: --- src/gallium/drivers/zink/ci/deqp-zink-lvp.toml | 17 ++++++++++++ src/gallium/drivers/zink/ci/gitlab-ci.yml | 36 +++++++++++-------------- src/gallium/drivers/zink/ci/zink-lvp-flakes.txt | 19 +++++++++++++ 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml index bdf53c5..5506b85 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml @@ -37,3 +37,20 @@ deqp_args = [ "--deqp-visibility=hidden" ] timeout = 180.0 + +[[piglit]] +piglit_folder = "/piglit" +profile = "quick_gl" +process_isolation = true +timeout = 180.0 + [piglit.env] + +# Whoops, no prefix support for piglit yet. Looks like we're going to need a new deqp-runner. +#[[piglit]] +#piglit_folder = "/piglit" +#profile = "quick_gl" +#process_isolation = true +#prefix = "no-timeline-" +#timeout = 180.0 +# [piglit.env] +# ZINK_NO_TIMELINES = "1" diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index f72f51b..f54495e 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -8,36 +8,30 @@ FLAKES_CHANNEL: "#zink-ci" # Fix non-conformant llvmpipe filter defaults GALLIVM_PERF: "no_quad_lod" - LP_NUM_THREADS: 0 -.zink-piglit-quick_gl: +zink: + tags: + - mesa-swrast extends: - .test-gl + - .deqp-test - .zink-lvp-test variables: - PIGLIT_PROFILES: quick_gl + DEQP_SUITE: zink-lvp PIGLIT_NO_WINDOW: 1 - PIGLIT_RUNNER_OPTIONS: "--timeout 180" - -zink-piglit-timelines: - extends: - - .zink-piglit-quick_gl script: - - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh" + - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh" -zink-piglit-no_timelines: - extends: - - .zink-piglit-quick_gl - script: - - xvfb-run --server-args='-noreset' sh -c "ZINK_NO_TIMELINES=1 GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh" - -zink-lvp-deqp: +# Should be merged into the main zink job once we have prefix support in deqp-runner. +.zink-piglit-quick_gl: extends: - .test-gl - - .deqp-test - .zink-lvp-test variables: - GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions - VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set - DEQP_SUITE: zink-lvp - parallel: 4 + PIGLIT_PROFILES: quick_gl + PIGLIT_NO_WINDOW: 1 + PIGLIT_RUNNER_OPTIONS: "--timeout 180" + # No taking more than our fair share of CPU on fd.o shared runners. + LP_NUM_THREADS: 0 + script: + - xvfb-run --server-args='-noreset' sh -c "ZINK_NO_TIMELINES=1 GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh" diff --git a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt index fa1a1a5..027d619 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt @@ -1,4 +1,23 @@ dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_mirror_l8_pot spec@khr_debug@push-pop-group_gl.* glx@glx-multi-window-single-context +KHR-GL46.shader_atomic_counter_ops_tests.ShaderAtomicCounterOps.* +KHR-GL46.geometry_shader.layered_rendering_fbo_no_attachment.layered_rendering_fbo_no_attachment +KHR-GL46.shader_image_load_store.advanced-sso-subroutine + +# " Value is: [0,0,0,0]. Value should be: [1,2,3,4]. Format is: rgba32f. Unit is: 0" +KHR-GL46.shader_image_load_store.basic-allFormats-store + +KHR-GL46.shader_image_load_store.non-layered_binding KHR-GL46.shader_storage_buffer_object.advanced-write-tessellation + +# "Pending expose event- rerunning." +# exit status: signal: 11" +glx@glx-copy-sub-buffer samples=2 + +# "free(): invalid next size (fast)" +# since it's heap corruption, it may or may not appear in a particular run +spec@arb_compute_variable_group_size@local-size + +spec@arb_shader_image_load_store@atomicity +spec@arb_shader_image_load_store@atomicity@imageAtomicCompSwap -- 2.7.4