From ed4dc4261e675420567c4bd200ff2688aa97ef1a Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 9 Sep 2024 14:59:50 +0100 Subject: [PATCH] ci/vulkan: Backport dEQP commit to make it less OOMy It looks like the compute reconvergence tests are slamming us into OOM on stoney at least; backport a commit which makes this less horrible. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/container/build-deqp.sh | 3 +++ .gitlab-ci/image-tags.yml | 4 ++-- src/amd/ci/radv-stoney-aco-fails.txt | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 44d853ea6a7..1c566759e78 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -33,6 +33,9 @@ vk_cts_commits_to_backport=( # Allow extra invocations in the pipeline stats 78f6618e147c0a745754b9e73ae10113a1ebde29 + + # Reduce the memory usage of the compute reconvergence tests + 85b965dbb675d1fdb4ff367a342b9ee189394e95 ) # shellcheck disable=SC2034 diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 64f6f19714a..c1b7265585c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -29,8 +29,8 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20240906-deqp" DEBIAN_TEST_GL_TAG: "20240906-deqp" - DEBIAN_TEST_VK_TAG: "20240906-deqp" - KERNEL_ROOTFS_TAG: "20240909-pytest" + DEBIAN_TEST_VK_TAG: "20240909-deqp-oom" + KERNEL_ROOTFS_TAG: "20240909-pytest-deqp" ALPINE_X86_64_BUILD_TAG: "20240814-var" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" diff --git a/src/amd/ci/radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-aco-fails.txt index f2992385fb0..20473396aa7 100644 --- a/src/amd/ci/radv-stoney-aco-fails.txt +++ b/src/amd/ci/radv-stoney-aco-fails.txt @@ -39,6 +39,3 @@ dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_rgen_buffers1_sets3,Cr # New CTS failures in 1.3.8.0 dEQP-VK.texture.mipmap.2d.image_view_min_lod.base_level.nearest_linear_integer_texel_coord,Fail - -# New CTS failures in 1.3.9.0 -dEQP-VK.reconvergence.maximal.compute.nesting5.1.15,Crash