From 75214c599cbbefdbb1cb4e81c2b66d6ad050c6b1 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 14 Apr 2025 16:29:12 +0200 Subject: [PATCH] zink/ci: Work around recent OOM issues in zink-anv-tgl Lower the concurrency for the zink-anv-tgl job to avoid the out-of-memory issues seen recently. Remove the flakes that were added as the previous workaround. Signed-off-by: Valentine Burley Part-of: --- src/gallium/drivers/zink/ci/gitlab-ci.yml | 1 + .../drivers/zink/ci/zink-anv-tgl-flakes.txt | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index a031f661ca3..6771f4e3776 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -101,6 +101,7 @@ zink-anv-tgl: # MESA: error: ZINK: vkQueueSubmit failed (VK_ERROR_DEVICE_LOST) # Xorg: ../src/gallium/drivers/zink/zink_batch.c:599: zink_end_batch: Assertion `!ctx->batch_states' failed. PIGLIT_PLATFORM: gbm + FDO_CI_CONCURRENT: 6 # higher is too much, and leads to OOM parallel: 4 # Manual full run when you want to double-check the full status. diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt index f2fe8e01674..89aa94f30de 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-flakes.txt @@ -147,19 +147,3 @@ dEQP-EGL.functional.sharing.gles2.multithread.random.programs.link.7 # Fails in the pre-merge job and passes in the nightly KHR-GL46.shader_viewport_layer_array.ShaderViewportIndexTestCase - -glx@extension string sanity -glx@glx-close-display -glx@glx-copy-context-dest-current -glx@glx-dont-care-mask -glx@glx-fbconfig-bad -glx@glx-multi-context-ib-1 -glx@glx-multithread-shader-compile -glx@glx-query-drawable-glx_width -glx@glx-swap-exchange -glx@glx-swap-singlebuffer -glx@glx_arb_create_context@invalid render type -glx@glx_arb_create_context@null attribute list -glx@glx_arb_create_context_profile@pre-gl3.2 profile -glx@glx_ext_import_context@get current display -glx@glx_ext_import_context@imported context has same context id