From cf510901ac93de7a30dd2c342229158cebe1a42d Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Tue, 15 Jul 2025 12:00:07 +0200 Subject: [PATCH] zink/ci: Drop duplicate full ANV deqp-runner suites The full TGL and ADL suites were identical. Signed-off-by: Valentine Burley Part-of: --- .../zink/ci/deqp-zink-anv-adl-full.toml | 136 ------------------ ...-tgl-full.toml => deqp-zink-anv-full.toml} | 0 src/gallium/drivers/zink/ci/gitlab-ci.yml | 4 +- 3 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 src/gallium/drivers/zink/ci/deqp-zink-anv-adl-full.toml rename src/gallium/drivers/zink/ci/{deqp-zink-anv-tgl-full.toml => deqp-zink-anv-full.toml} (100%) diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-adl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-adl-full.toml deleted file mode 100644 index 4aef425c68f..00000000000 --- a/src/gallium/drivers/zink/ci/deqp-zink-anv-adl-full.toml +++ /dev/null @@ -1,136 +0,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.*" - -[[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/external/openglcts/modules/glcts" -caselists = [ - "/deqp-gles/mustpass/gles2-khr-main.txt", - "/deqp-gles/mustpass/gles3-khr-main.txt", - "/deqp-gles/mustpass/gles31-khr-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-gl/external/openglcts/modules/glcts" -caselists = [ - "/deqp-gl/mustpass/gl46-main.txt", - "/deqp-gl/mustpass/gl46-khr-single.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 - -# 565-nozs -[[deqp]] -deqp = "/deqp-gles/modules/gles3/deqp-gles3" -caselists = ["/deqp-gles/mustpass/gles3-565-no-depth-no-stencil.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgb565d0s0ms0", -] -prefix = "565-nozs-" - -[[deqp]] -deqp = "/deqp-gles/modules/gles31/deqp-gles31" -caselists = ["/deqp-gles/mustpass/gles31-565-no-depth-no-stencil.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgb565d0s0ms0", -] -prefix = "565-nozs-" - -# multisample -[[deqp]] -deqp = "/deqp-gles/modules/gles3/deqp-gles3" -caselists = ["/deqp-gles/mustpass/gles3-multisample.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms4", -] -prefix = "multisample-" - -[[deqp]] -deqp = "/deqp-gles/modules/gles31/deqp-gles31" -caselists = ["/deqp-gles/mustpass/gles31-multisample.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms4", -] -prefix = "multisample-" - -[[deqp]] -deqp = "/deqp-gles/modules/egl/deqp-egl-x11" -caselists = ["/deqp-gles/mustpass/egl-main.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] - -[[deqp]] -deqp = "/deqp-gles/modules/egl/deqp-egl-wayland" -caselists = ["/deqp-gles/mustpass/egl-main.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-" - -[[piglit]] -piglit_folder = "/piglit" -profile = "gpu" -process_isolation = true -timeout = 180.0 - diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-full.toml similarity index 100% rename from src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml rename to src/gallium/drivers/zink/ci/deqp-zink-anv-full.toml diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index f84471ec6ed..ee382a0d434 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -79,7 +79,7 @@ zink-anv-adl-full: - .zink-anv-manual-rules - .test-piglit variables: - DEQP_SUITE: zink-anv-adl-full + DEQP_SUITE: zink-anv-full timeout: 2h parallel: 5 @@ -132,7 +132,7 @@ zink-anv-tgl-full: - .zink-anv-manual-rules - .test-piglit variables: - DEQP_SUITE: zink-anv-tgl-full + DEQP_SUITE: zink-anv-full timeout: 1h 45m parallel: 3