From ea112cf84d47888abecbaa7fcfdcff68656ae19d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 4 Dec 2024 09:10:21 +0100 Subject: [PATCH] ci: update VKCTS main to a9f7069b9a5ba94715a175cb1818ed504add0107 This contains many more tests for Vulkan 1.4, but the Vulkan loader probably needs an update too. This should only affect RADV which is the only user for VKCTS main. Signed-off-by: Samuel Pitoiset Part-of: --- .gitlab-ci/container/build-deqp.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/amd/ci/radv-navi10-aco-fails.txt | 4 ---- src/amd/ci/radv-navi21-aco-fails.txt | 4 ---- src/amd/ci/radv-navi31-aco-fails.txt | 4 ---- src/amd/ci/radv-polaris10-aco-fails.txt | 3 --- src/amd/ci/radv-renoir-aco-fails.txt | 4 ---- src/amd/ci/radv-vangogh-aco-fails.txt | 4 ---- src/amd/ci/radv-vega10-aco-fails.txt | 4 ---- 9 files changed, 3 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 222387cf4f4..eb4bab7ee69 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -22,7 +22,7 @@ uncollapsed_section_start deqp-$deqp_api "Building dEQP $DEQP_API" # - the GL release produces `glcts`, and # - the GLES release produces `deqp-gles*` and `deqp-egl` -DEQP_MAIN_COMMIT=e9a562cfdc4d05044e8465525a79e97016b7b324 +DEQP_MAIN_COMMIT=a9f7069b9a5ba94715a175cb1818ed504add0107 DEQP_VK_VERSION=1.3.10.0 DEQP_GL_VERSION=4.6.5.0 DEQP_GLES_VERSION=3.2.11.0 diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0a4624a7b4f..ce59ca795a6 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -29,8 +29,8 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20241127-main-patch" DEBIAN_TEST_GL_TAG: "20241130-piglit-46" - DEBIAN_TEST_VK_TAG: "20241130-piglit-46" - KERNEL_ROOTFS_TAG: "20241130-piglit-46" + DEBIAN_TEST_VK_TAG: "20241204-vkcts-main" + KERNEL_ROOTFS_TAG: "20241204-vkcts-main" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20241002-pyutils" diff --git a/src/amd/ci/radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-aco-fails.txt index fd05f479a6c..79b36e4c74c 100644 --- a/src/amd/ci/radv-navi10-aco-fails.txt +++ b/src/amd/ci/radv-navi10-aco-fails.txt @@ -8,7 +8,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-aco-fails.txt index fd05f479a6c..79b36e4c74c 100644 --- a/src/amd/ci/radv-navi21-aco-fails.txt +++ b/src/amd/ci/radv-navi21-aco-fails.txt @@ -8,7 +8,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-navi31-aco-fails.txt b/src/amd/ci/radv-navi31-aco-fails.txt index fd05f479a6c..79b36e4c74c 100644 --- a/src/amd/ci/radv-navi31-aco-fails.txt +++ b/src/amd/ci/radv-navi31-aco-fails.txt @@ -8,7 +8,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-polaris10-aco-fails.txt b/src/amd/ci/radv-polaris10-aco-fails.txt index 7b138acc80b..e69de29bb2d 100644 --- a/src/amd/ci/radv-polaris10-aco-fails.txt +++ b/src/amd/ci/radv-polaris10-aco-fails.txt @@ -1,3 +0,0 @@ -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-aco-fails.txt index 7e8c8c26d23..bf101e8bbc0 100644 --- a/src/amd/ci/radv-renoir-aco-fails.txt +++ b/src/amd/ci/radv-renoir-aco-fails.txt @@ -9,7 +9,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-aco-fails.txt index fd05f479a6c..79b36e4c74c 100644 --- a/src/amd/ci/radv-vangogh-aco-fails.txt +++ b/src/amd/ci/radv-vangogh-aco-fails.txt @@ -8,7 +8,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail diff --git a/src/amd/ci/radv-vega10-aco-fails.txt b/src/amd/ci/radv-vega10-aco-fails.txt index 7e8c8c26d23..bf101e8bbc0 100644 --- a/src/amd/ci/radv-vega10-aco-fails.txt +++ b/src/amd/ci/radv-vega10-aco-fails.txt @@ -9,7 +9,3 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.whole_copy_before_resolving_transfe dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.2_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail - -# CTS main not recognizing 1.4 yet. -dEQP-VK.info.device_properties,Fail -dEQP-VK.api.version_check.version,Fail