From 5a510aede7d1ea1ef7feb3432fd2d87df204eee7 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 20 Feb 2025 14:42:26 +0100 Subject: [PATCH] anv/ci: Increase parallelism of zink-anv-adl With some of the jobs migrated to the new brask and nissa devices, we can increase zink-on-anv coverage on brya. Reduce the fraction of Piglit tests and introduce fractional GLESCTS testing. Also increase the parallelism of the zink nightly job, but lower its FDO_CI_CONCURRENT variable to avoid OOMkills. To accommodate this, decrease the parallelism of the anv-adl-full job. Additionally, drop redundant HWCI_START_WESTON from full runs that inherit the variable from their pre-merge jobs. Signed-off-by: Valentine Burley Part-of: --- .../drivers/zink/ci/deqp-zink-anv-adl.toml | 79 ++++++++++--------- src/gallium/drivers/zink/ci/gitlab-ci.yml | 6 +- .../drivers/zink/ci/zink-anv-adl-flakes.txt | 10 +++ src/intel/ci/gitlab-ci.yml | 2 +- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-adl.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-adl.toml index 463cba92c27..954788c441f 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-anv-adl.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-adl.toml @@ -1,40 +1,43 @@ -#[[deqp]] -#deqp = "/deqp-gles/modules/gles2/deqp-gles2" -#caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -#deqp_args = [ -# "--deqp-surface-width=256", -# "--deqp-surface-height=256", -# "--deqp-surface-type=pbuffer", -# "--deqp-gl-config-name=rgba8888d24s8ms0", -# "--deqp-visibility=hidden" -#] -#timeout = 180.0 -#version_check = "GL ES 3.2.*git" -#renderer_check = "zink.*Intel.*" -# -#[[deqp]] -#deqp = "/deqp-gles/modules/gles3/deqp-gles3" -#caselists = ["/deqp-gles/mustpass/gles3-main.txt"] -#deqp_args = [ -# "--deqp-surface-width=256", -# "--deqp-surface-height=256", -# "--deqp-surface-type=pbuffer", -# "--deqp-gl-config-name=rgba8888d24s8ms0", -# "--deqp-visibility=hidden" -#] -#timeout = 180.0 -# -#[[deqp]] -#deqp = "/deqp-gles/modules/gles31/deqp-gles31" -#caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -#deqp_args = [ -# "--deqp-surface-width=256", -# "--deqp-surface-height=256", -# "--deqp-surface-type=pbuffer", -# "--deqp-gl-config-name=rgba8888d24s8ms0", -# "--deqp-visibility=hidden" -#] -#timeout = 180.0 +[[deqp]] +deqp = "/deqp-gles/modules/gles2/deqp-gles2" +caselists = ["/deqp-gles/mustpass/gles2-main.txt"] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] +timeout = 180.0 +version_check = "GL ES 3.2.*git" +renderer_check = "zink.*Intel.*" +fraction = 2 + +[[deqp]] +deqp = "/deqp-gles/modules/gles3/deqp-gles3" +caselists = ["/deqp-gles/mustpass/gles3-main.txt"] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] +timeout = 180.0 +fraction = 2 + +[[deqp]] +deqp = "/deqp-gles/modules/gles31/deqp-gles31" +caselists = ["/deqp-gles/mustpass/gles31-main.txt"] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] +timeout = 180.0 +fraction = 2 [[deqp]] deqp = "/deqp-gl/external/openglcts/modules/glcts" @@ -97,5 +100,3 @@ piglit_folder = "/piglit" profile = "quick_gl" process_isolation = true timeout = 180.0 -fraction = 3 - diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 6a458ead393..3f2489e17e9 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -58,7 +58,7 @@ zink-anv-adl: # We use gbm because its a copy of tgl job PIGLIT_PLATFORM: gbm timeout: 30m - parallel: 2 + parallel: 4 # Manual full run when you want to double-check the full status. zink-anv-adl-full: @@ -67,8 +67,9 @@ zink-anv-adl-full: - .zink-anv-manual-rules variables: DEQP_SUITE: zink-anv-adl-full - HWCI_START_WESTON: 1 + FDO_CI_CONCURRENT: 6 # higher is too much, and leads to OOM timeout: 2h + parallel: 5 zink-anv-tgl: extends: @@ -91,7 +92,6 @@ zink-anv-tgl-full: - .zink-anv-manual-rules variables: DEQP_SUITE: zink-anv-tgl-full - HWCI_START_WESTON: 1 timeout: 1h 45m parallel: 3 diff --git a/src/gallium/drivers/zink/ci/zink-anv-adl-flakes.txt b/src/gallium/drivers/zink/ci/zink-anv-adl-flakes.txt index b28f5ce3558..b5a19fce47c 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-adl-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-adl-flakes.txt @@ -844,3 +844,13 @@ spec@arb_tessellation_shader@execution@variable-indexing@tcs-patch-vec4-index-wr # Fails in the pre-merge job and passes in the nightly KHR-GL46.shader_viewport_layer_array.ShaderViewportIndexTestCase + +# Discovered after decreasing the fraction +spec@arb_timer_query@timestamp-get + +# These can fail after a GuC engine reset request failure +https://gitlab.freedesktop.org/mesa/mesa/-/jobs/71634375#L3564 +glx@glx-fbconfig-bad +glx@glx-query-drawable-glxpixmap-glx_width +glx@glx_arb_create_context@invalid opengl version +glx@glx_arb_create_context_profile@invalid profile diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 73477d9e01d..6ada7f4375f 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -38,7 +38,7 @@ anv-adl-full: variables: DEQP_SUITE: anv-adl-full timeout: 1h 40m - parallel: 5 + parallel: 3 anv-tgl: extends: