Module: Mesa Branch: main Commit: 551924aa87912f664637ae844b422986f8453712 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=551924aa87912f664637ae844b422986f8453712
Author: Samuel Pitoiset <[email protected]> Date: Fri Dec 22 11:52:29 2023 +0100 ci: apply two bugfixes for VKCTS These are needed for RADV. Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26798> --- .gitlab-ci/container/build-deqp.sh | 6 ++++++ .gitlab-ci/image-tags.yml | 8 ++++---- src/amd/ci/external/radv-navi22-aco-flakes.txt | 1 - src/amd/ci/radv-navi10-aco-fails.txt | 2 -- src/amd/ci/radv-navi10-aco-flakes.txt | 2 -- src/amd/ci/radv-navi21-aco-fails.txt | 2 -- src/amd/ci/radv-navi21-aco-flakes.txt | 2 -- src/amd/ci/radv-navi21-llvm-flakes.txt | 1 - src/amd/ci/radv-navi31-aco-fails.txt | 2 -- src/amd/ci/radv-navi31-aco-flakes.txt | 2 -- src/amd/ci/radv-polaris10-aco-flakes.txt | 2 -- src/amd/ci/radv-raven-flakes.txt | 3 --- src/amd/ci/radv-renoir-aco-fails.txt | 2 -- src/amd/ci/radv-renoir-aco-flakes.txt | 2 -- src/amd/ci/radv-vangogh-aco-fails.txt | 2 -- src/amd/ci/radv-vangogh-aco-flakes.txt | 4 ---- src/amd/ci/radv-vega10-aco-flakes.txt | 3 --- 17 files changed, 10 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 4b96995979f..ab538ed0063 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -37,6 +37,12 @@ cts_commits_to_backport=( # Remove illegal mesh shader query tests 2a87f7b25dc27188be0f0a003b2d7aef69d9002e + + # Relax fragment shader invocations result verifications + 0d8bf6a2715f95907e9cf86a86876ff1f26c66fe + + # Fix several issues in dynamic rendering basic tests + c5453824b498c981c6ba42017d119f5de02a3e34 ) for commit in "${cts_commits_to_backport[@]}" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c8bff527555..8b7e22b0a6d 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -18,14 +18,14 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-12-14-structured-logs" - DEBIAN_X86_64_TEST_GL_TAG: "2023-12-14-structured-logs" - DEBIAN_X86_64_TEST_VK_TAG: "2023-12-14-structured-logs" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-12-22-vkcts" + DEBIAN_X86_64_TEST_GL_TAG: "2023-12-22-vkcts" + DEBIAN_X86_64_TEST_VK_TAG: "2023-12-22-vkcts" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-12-11-meson-bump" - KERNEL_ROOTFS_TAG: "2023-12-14-structured-logs" + KERNEL_ROOTFS_TAG: "2023-12-22-vkcts" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" diff --git a/src/amd/ci/external/radv-navi22-aco-flakes.txt b/src/amd/ci/external/radv-navi22-aco-flakes.txt index 9e0e97aada7..e69de29bb2d 100644 --- a/src/amd/ci/external/radv-navi22-aco-flakes.txt +++ b/src/amd/ci/external/radv-navi22-aco-flakes.txt @@ -1 +0,0 @@ -dEQP-VK.dynamic_rendering.basic.single_cmdbuffer_resuming diff --git a/src/amd/ci/radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-aco-fails.txt index 159eeac34b5..acda34d6cf2 100644 --- a/src/amd/ci/radv-navi10-aco-fails.txt +++ b/src/amd/ci/radv-navi10-aco-fails.txt @@ -1,4 +1,2 @@ # New CTS failures in 1.3.7.0 dEQP-VK.api.version_check.unavailable_entry_points,Fail - -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.*,Fail diff --git a/src/amd/ci/radv-navi10-aco-flakes.txt b/src/amd/ci/radv-navi10-aco-flakes.txt index 01b8f6eb4cb..56d39e1844d 100644 --- a/src/amd/ci/radv-navi10-aco-flakes.txt +++ b/src/amd/ci/radv-navi10-aco-flakes.txt @@ -1,5 +1,3 @@ -dEQP-VK.dynamic_rendering.basic.* -dEQP-VK.dynamic_rendering.primary_cmd_buff.* dEQP-VK.pipeline.fast_linked_library.image.suballocation.sampling_type.combined.view_type.cube_array.format.r8g8b8a8_unorm.count_4.size.32x32_array_of_36 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_line_geom dEQP-VK.texture.filtering.3d.combinations.nearest.linear.mirror_clamp_to_edge.mirror_clamp_to_edge.repeat diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-aco-fails.txt index 6c19919f26b..acda34d6cf2 100644 --- a/src/amd/ci/radv-navi21-aco-fails.txt +++ b/src/amd/ci/radv-navi21-aco-fails.txt @@ -1,4 +1,2 @@ # New CTS failures in 1.3.7.0 dEQP-VK.api.version_check.unavailable_entry_points,Fail -dEQP-VK.query_pool.frag_invocations.frag_invs.primary,Fail -dEQP-VK.query_pool.frag_invocations.frag_invs.secondary,Fail diff --git a/src/amd/ci/radv-navi21-aco-flakes.txt b/src/amd/ci/radv-navi21-aco-flakes.txt index a0210283aab..9e2e41634c1 100644 --- a/src/amd/ci/radv-navi21-aco-flakes.txt +++ b/src/amd/ci/radv-navi21-aco-flakes.txt @@ -1,5 +1,3 @@ -dEQP-VK.dynamic_rendering.basic.* -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.* dEQP-VK.pipeline.monolithic.image.suballocation.sampling_type.separate.view_type.2d.format.a2b10g10r10_uint_pack32.count_4.size.13x23 dEQP-VK.pipeline.monolithic.image.suballocation.sampling_type.combined.view_type.cube_array.format.r8g8_sint.count_4.size.13x13_array_of_36 diff --git a/src/amd/ci/radv-navi21-llvm-flakes.txt b/src/amd/ci/radv-navi21-llvm-flakes.txt index 616c556c66a..ae70cccc0ad 100644 --- a/src/amd/ci/radv-navi21-llvm-flakes.txt +++ b/src/amd/ci/radv-navi21-llvm-flakes.txt @@ -1,4 +1,3 @@ -dEQP-VK.dynamic_rendering.basic.* dEQP-VK.pipeline.monolithic.image.suballocation.sampling_type.separate.view_type.2d.format.a2b10g10r10_uint_pack32.count_4.size.13x23 dEQP-VK.pipeline.monolithic.image.suballocation.sampling_type.combined.view_type.cube_array.format.r8g8_sint.count_4.size.13x13_array_of_36 dEQP-VK.pipeline.monolithic.image_view.view_type.cube_array.format.r32g32_sint.subresource_range.lod_mip_levels_array_base_and_size diff --git a/src/amd/ci/radv-navi31-aco-fails.txt b/src/amd/ci/radv-navi31-aco-fails.txt index 159eeac34b5..acda34d6cf2 100644 --- a/src/amd/ci/radv-navi31-aco-fails.txt +++ b/src/amd/ci/radv-navi31-aco-fails.txt @@ -1,4 +1,2 @@ # New CTS failures in 1.3.7.0 dEQP-VK.api.version_check.unavailable_entry_points,Fail - -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.*,Fail diff --git a/src/amd/ci/radv-navi31-aco-flakes.txt b/src/amd/ci/radv-navi31-aco-flakes.txt index e39d988d372..d1a8efcf746 100644 --- a/src/amd/ci/radv-navi31-aco-flakes.txt +++ b/src/amd/ci/radv-navi31-aco-flakes.txt @@ -3,5 +3,3 @@ dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.multithreaded_compi dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.multithreaded_compilation.*_check_capture_replay_handles dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.singlethreaded_compilation.*_check_all_handles dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.singlethreaded_compilation.*_check_capture_replay_handles - -dEQP-VK.dynamic_rendering.primary_cmd_buff.* diff --git a/src/amd/ci/radv-polaris10-aco-flakes.txt b/src/amd/ci/radv-polaris10-aco-flakes.txt index 32bdf7ea3bd..e69de29bb2d 100644 --- a/src/amd/ci/radv-polaris10-aco-flakes.txt +++ b/src/amd/ci/radv-polaris10-aco-flakes.txt @@ -1,2 +0,0 @@ -dEQP-VK.dynamic_rendering.basic.* -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.* diff --git a/src/amd/ci/radv-raven-flakes.txt b/src/amd/ci/radv-raven-flakes.txt index 709aed13f0a..c1cb913e211 100644 --- a/src/amd/ci/radv-raven-flakes.txt +++ b/src/amd/ci/radv-raven-flakes.txt @@ -1,5 +1,2 @@ # since Debian 12 CI uprev dEQP-VK.pipeline.pipeline_library.framebuffer_attachment.diff_attachments_2d_32x32_39x41_ms - -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_primary_cmdbuffers_resuming -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_2_primary_cmdbuffers_resuming diff --git a/src/amd/ci/radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-aco-fails.txt index 6bd303e50ab..a91278246ec 100644 --- a/src/amd/ci/radv-renoir-aco-fails.txt +++ b/src/amd/ci/radv-renoir-aco-fails.txt @@ -1,4 +1,2 @@ # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail - -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.*,Fail diff --git a/src/amd/ci/radv-renoir-aco-flakes.txt b/src/amd/ci/radv-renoir-aco-flakes.txt index 28c6f6d7d52..dd9ccf4098b 100644 --- a/src/amd/ci/radv-renoir-aco-flakes.txt +++ b/src/amd/ci/radv-renoir-aco-flakes.txt @@ -1,6 +1,4 @@ -dEQP-VK.dynamic_rendering.basic.* dEQP-VK.reconvergence.workgroup_uniform_control_flow_elect.compute.nesting4.2.35 -dEQP-VK.dynamic_rendering.primary_cmd_buff.* # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8817 dEQP-VK.*framebuffer_attachment.diff_attachments.* diff --git a/src/amd/ci/radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-aco-fails.txt index 0e5d9d145e4..200abf381a7 100644 --- a/src/amd/ci/radv-vangogh-aco-fails.txt +++ b/src/amd/ci/radv-vangogh-aco-fails.txt @@ -68,5 +68,3 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_buffer.2d_images.mip_cop # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail -dEQP-VK.query_pool.frag_invocations.frag_invs.primary,Fail -dEQP-VK.query_pool.frag_invocations.frag_invs.secondary,Fail diff --git a/src/amd/ci/radv-vangogh-aco-flakes.txt b/src/amd/ci/radv-vangogh-aco-flakes.txt index 61d3f90e86e..b9ddd844495 100644 --- a/src/amd/ci/radv-vangogh-aco-flakes.txt +++ b/src/amd/ci/radv-vangogh-aco-flakes.txt @@ -1,5 +1 @@ -dEQP-VK.dynamic_rendering.basic.* -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.* -dEQP-VK.draw.dynamic_rendering.* - dEQP-VK.pipeline.monolithic.image.suballocation.sampling_type.separate.view_type.2d_array.format.r4g4b4a4_unorm_pack16.count_4.size.32x16_array_of_6 diff --git a/src/amd/ci/radv-vega10-aco-flakes.txt b/src/amd/ci/radv-vega10-aco-flakes.txt index cb85ff27204..ba7dabb59a7 100644 --- a/src/amd/ci/radv-vega10-aco-flakes.txt +++ b/src/amd/ci/radv-vega10-aco-flakes.txt @@ -1,6 +1,3 @@ -dEQP-VK.dynamic_rendering.basic.* -dEQP-VK.dynamic_rendering.primary.* - dEQP-VK.multiview.renderpass2.multisample.8_1_1_8 dEQP-VK.multiview.renderpass2.multisample.8 dEQP-VK.multiview.renderpass2.multisample.15_15_15_15
