From 83a1d56faa2b87dec56af20741a58404c308cc3f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 11 Jan 2023 11:02:26 +1000 Subject: [PATCH] ci: bump vk cts to 1.3.3.1 + and a crash fix. With the video changes some crashes were introduced in CTS, apply the fix. Reviewed-by: Emma Anholt Part-of: --- .gitlab-ci/container/build-deqp.sh | 6 +++++- .gitlab-ci/image-tags.yml | 6 +++--- src/amd/ci/radv-navi21-aco-fails.txt | 3 +++ src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt | 4 ++++ src/intel/ci/anv-tgl-fails.txt | 10 +--------- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 2c100d5243d..5b857861d10 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -7,7 +7,7 @@ git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" git clone \ https://github.com/KhronosGroup/VK-GL-CTS.git \ - -b vulkan-cts-1.3.3.0 \ + -b vulkan-cts-1.3.3.1 \ --depth 1 \ /VK-GL-CTS pushd /VK-GL-CTS @@ -19,6 +19,10 @@ pushd /VK-GL-CTS wget -O- https://github.com/KhronosGroup/VK-GL-CTS/commit/6bb2e7d64261bedb503947b1b251b1eeeb49be73.patch | git am - +# Apply a patch to fix a bug in 1.3.3.0 that affects some new formats +wget -O- https://github.com/KhronosGroup/VK-GL-CTS/commit/4fa2b40411921b304f5dad8d106b212ad5b0f172.patch | + git am - + # --insecure is due to SSL cert failures hitting sourceforge for zlib and # libpng (sigh). The archives get their checksums checked anyway, and git # always goes through ssh or https. diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b9710bcf49d..ed58d980704 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -14,12 +14,12 @@ variables: DEBIAN_X86_TEST_IMAGE_VK_PATH: "debian/x86_test-vk" DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH} - DEBIAN_X86_TEST_GL_TAG: "2023-01-08-weston-xwayland" - DEBIAN_X86_TEST_VK_TAG: "2022-12-12-vkd3d-proton-uprev" + DEBIAN_X86_TEST_GL_TAG: "2023-01-12-cts" + DEBIAN_X86_TEST_VK_TAG: "2023-01-12-cts" ALPINE_X86_BUILD_TAG: "2023-01-10-robust-wget" FEDORA_X86_BUILD_TAG: "2023-01-10-robust-wget" - KERNEL_ROOTFS_TAG: "2023-01-10-virglrenderer" + KERNEL_ROOTFS_TAG: "2023-01-12-cts" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-aco-fails.txt index a29798c93f8..ef257651d18 100644 --- a/src/amd/ci/radv-navi21-aco-fails.txt +++ b/src/amd/ci/radv-navi21-aco-fails.txt @@ -2,3 +2,6 @@ dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.gpu.access_sbt_read,Crash dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.gpu.stage_all_transfer,Crash dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.gpu.stage_as_copy_bit,Crash + +# New fails in CTS 1.3.3.1 +dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Fail diff --git a/src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt index a0f28e09b37..24235e9e83a 100644 --- a/src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt +++ b/src/gallium/frontends/lavapipe/ci/lvp-asan-fails.txt @@ -3,3 +3,7 @@ dEQP-VK.transform_feedback.primitives_generated_query.copy.host_reset.pgq_32bit_ dEQP-VK.transform_feedback.primitives_generated_query.copy.queue_reset.pgq_32bit_xfb_64bit.geom.xfb.no_rast.line_strip.pgq_default_xfb_0.single_draw,Fail dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.64bit.geom.xfb.rast.triangle_fan.pgq_default_xfb_1.single_draw,Fail dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.64bit.geom.xfb.no_rast.line_list_with_adjacency.pgq_1_xfb_0.single_draw,Fail +dEQP-VK.transform_feedback.primitives_generated_query.copy.host_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.triangle_strip_with_adjacency.pgq_default_xfb_default.single_draw,Fail +dEQP-VK.transform_feedback.primitives_generated_query.copy.queue_reset.pgq_32bit_xfb_64bit.geom.xfb.rast.point_list.pgq_0_xfb_1.single_draw,Fail +dEQP-VK.transform_feedback.primitives_generated_query.get.host_reset.pgq_32bit_xfb_64bit.geom.xfb.no_rast.line_strip.pgq_default_xfb_0.single_draw,Fail +dEQP-VK.transform_feedback.primitives_generated_query.get.queue_reset.64bit.geom.xfb.rast.triangle_fan.pgq_default_xfb_1.single_draw,Fail diff --git a/src/intel/ci/anv-tgl-fails.txt b/src/intel/ci/anv-tgl-fails.txt index cc77c14fbe5..8b2d3ec83dc 100644 --- a/src/intel/ci/anv-tgl-fails.txt +++ b/src/intel/ci/anv-tgl-fails.txt @@ -2,9 +2,6 @@ dEQP-VK.pipeline.extended_dynamic_state.before_good_static.stencil_state_face_front_ge_inc_clamp_clear_255_ref_255_depthfail,Fail dEQP-VK.pipeline.extended_dynamic_state.between_pipelines.stencil_state_face_front_ge_inc_clamp_clear_255_ref_255_depthfail,Fail -# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3505 -dEQP-VK.subgroups.multiple_dispatches.uniform_subgroup_size,Fail - # ../src/intel/vulkan/genX_cmd_buffer.c:1305: transition_color_buffer: Assertion `isl_mod_info->aux_usage != ISL_AUX_USAGE_NONE' failed. dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a1r5g5b5_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_srgb_pack32,Crash @@ -49,10 +46,6 @@ dEQP-VK.drm_format_modifiers.export_import.r8_unorm,Crash dEQP-VK.drm_format_modifiers.export_import.r8g8_unorm,Crash dEQP-VK.drm_format_modifiers.export_import.r8g8b8a8_srgb,Crash -# 1.3.2.0 uprev: -dEQP-VK.fragment_operations.early_fragment.sample_count_early_fragment_tests_depth_samples_2,Fail -dEQP-VK.fragment_operations.early_fragment.sample_count_early_fragment_tests_depth_samples_4,Fail - # 1.3.3.0 uprev: dEQP-VK.draw.dynamic_rendering.linear_interpolation.no_offset_16_samples,Fail dEQP-VK.draw.dynamic_rendering.linear_interpolation.no_offset_2_samples,Fail @@ -71,6 +64,5 @@ dEQP-VK.draw.renderpass.linear_interpolation.offset_max_8_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_min_16_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_min_4_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_min_8_samples,Fail +dEQP-VK.draw.renderpass.linear_interpolation.offset_min_2_samples,Fail -dEQP-VK.fragment_operations.early_fragment.sample_count_early_fragment_tests_depth_samples_16,Fail -dEQP-VK.fragment_operations.early_fragment.sample_count_early_fragment_tests_depth_samples_8,Fail