ci: Update to vulkan-cts-1.3.5.2 (and pull in some more fixes).

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23610>
2023-06-05 13:04:00 -07:00
parent e3b0a79b3a
commit 8c35537351
25 changed files with 36 additions and 90 deletions
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -14,7 +14,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.5.1 \
+    -b vulkan-cts-1.3.5.2 \
    --depth 1 \
    /VK-GL-CTS
 pushd /VK-GL-CTS
@@ -26,16 +26,36 @@ pushd /VK-GL-CTS
 # patches.

 cts_commits_to_backport=(
-        # queue_transfer fix
-        8771481027d76a262195de8397d8985246bca98f
-
        # sync fix for SSBO writes
        44f1be32fe6bd2a7de7b9169fc71cc44e0b26124

+        # sync fix for KHR-GL46.multi_bind.dispatch_bind_image_textures
+        db6c9e295ab38054ace425cb75ff966719ccc609
+
+        # VK robustness barriers fix
+        6052f21c4d6077438d644f525c10cc58dcdf25bf
+
        # correctness fixes for zink validation fails
        1923cbc89ed3969a3afe7c6926124b51157902e1
        af3a979c49dc65f8809c27660405ae3a76c7da4a
-        6b70682c57c4ffd07fdf6bcbf1aebd7cf1123629
+
+        # GL/GLES vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI fix
+        bdb456dcf85e34fced872ebdaf06f6b73451f99c
+
+        # KHR-GLES31.core.compute_shader.max fix
+        7aa3ebb49d07982f5c44edd4799edb5a894567e9
+
+        # GL arrays_of_arrays perf fix
+        b481dada59734e8e34050fe884ba6d627d9e5c54
+
+        # GL shadow samplers require depth compares fix
+        a8bc242ec234bf8d7df8b4eec1eeccab4e401288
+
+        # GL PolygonOffsetClamp fix
+        1f2feb2388da88b4e46eba55547d50856467cc20
+
+        # KHR-GL46.texture_view.view_sampling fix
+        aca29fb9553ebe28094513ce18bb46bad138cf46

        # video validation fails
        4cc3980a86ba5b7fe6e76b559cc1a9cb5fd1b253
@@ -43,6 +63,9 @@ cts_commits_to_backport=(

        # Check for robustness before testing it
        ee7138d8adf5ed3c4845e5ac2553c4f9697be9d8
+
+        # dEQP-VK.wsi.acquire_drm_display.*invalid_fd
+        98ad9402e7d94030d1689fd59135da7a2f52384c
 )

 for commit in "${cts_commits_to_backport[@]}"
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -15,13 +15,13 @@ variables:
   DEBIAN_X86_64_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
   DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"

-   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-05-25-bookworm"
-   DEBIAN_X86_64_TEST_GL_TAG: "2023-05-31-vvl"
-   DEBIAN_X86_64_TEST_VK_TAG: "2023-05-25-vkd3d-proton"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-06-07-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "2023-06-07-deqp"
+   DEBIAN_X86_64_TEST_VK_TAG: "2023-06-07-deqp"

   ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
   FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
-   KERNEL_ROOTFS_TAG: "2023-06-05-virgl-crosvm"
+   KERNEL_ROOTFS_TAG: "2023-06-07-deqp"

   WINDOWS_X64_VS_PATH: "windows/x64_vs"
   WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
--- a/src/amd/ci/radeonsi-vangogh-fails.txt
+++ b/src/amd/ci/radeonsi-vangogh-fails.txt
@@ -1,9 +1,6 @@
-KHR-GLES31.core.compute_shader.max,Fail
 KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreCS,Fail
 KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreVS,Fail

-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 KHR-GL46.shader_image_load_store.basic-allTargets-atomic,Fail
 KHR-GL46.sparse_texture2_tests.SparseTexture2Allocation,Fail
 KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment,Fail
--- a/src/amd/ci/radeonsi-vangogh-skips.txt
+++ b/src/amd/ci/radeonsi-vangogh-skips.txt
@@ -2,6 +2,7 @@
 glx@

 # these tests take longer than 60sec
+KHR-GLES31.core.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
 KHR-GL46.copy_image.functional
 KHR-GL46.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_MaxPatchVertices_Position_PointSize
 KHR-GL46.texture_swizzle.smoke
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -523,9 +523,5 @@ dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgba32i_cube,Fail
 # Debian bookworm update (2023-04-27)
 spec@!opengl 1.0@depth-clear-precision-check,Timeout

-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4377
-dEQP-VK.wsi.acquire_drm_display.acquire_drm_display_invalid_fd,Fail
-dEQP-VK.wsi.acquire_drm_display.get_drm_display_invalid_fd,Fail
-
 # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/818
 spec@intel_performance_query@intel_performance_query-issue_2235,Fail
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -362,8 +362,6 @@ wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail
 SRGBReadWritePixels,Fail

 # New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 dEQP-VK.pipeline.fast_linked_library.misc.interpolate_at_sample_no_sample_shading,Crash
 dEQP-VK.transform_feedback.simple.lines_or_triangles_line_strip_1,Fail
 dEQP-VK.transform_feedback.simple.lines_or_triangles_line_strip_3,Fail
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -1,8 +1,5 @@
 KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail

-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
 KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
 KHR-GL46.shading_language_420pack.binding_images,Fail
--- a/src/freedreno/ci/freedreno-a660-fails.txt
+++ b/src/freedreno/ci/freedreno-a660-fails.txt
@@ -1,8 +1,6 @@
 KHR-GL46.direct_state_access.renderbuffers_storage_multisample,Fail
 KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
 KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail
 KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
 KHR-GL46.tessellation_shader.single.max_patch_vertices,Fail
--- a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt
@@ -960,7 +960,3 @@ KHR-GL46.tessellation_shader.tessellation_shader_tessellation.TES,Fail
 spec@arb_tessellation_shader@execution@vs-tes-tessinner-tessouter-inputs-quads,Fail
 spec@arb_tessellation_shader@execution@vs-tes-tessinner-tessouter-inputs-quads-dlist,Fail
 spec@arb_tessellation_shader@execution@vs-tes-tessinner-tessouter-inputs-tris,Fail
-
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
--- a/src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-hsw-skips.txt
@@ -7,3 +7,4 @@ KHR-GL46.texture_swizzle.functional
 KHR-GL46.texture_swizzle.smoke
 KHR-GL46.direct_state_access.framebuffers_texture_layer_attachment
 shaders@glsl-max-varyings
+spec@amd_performance_monitor@measure
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
@@ -212,10 +212,6 @@ spec@arb_texture_buffer_object@texture-buffer-size-clamp@rgba8ui_texture_buffer_
 # [...]
 wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 # Debian bookworm fails
 spec@arb_viewport_array@display-list,Fail
 spec@intel_shader_atomic_float_minmax@execution@ssbo-atomicmin-float-nan,Fail
--- a/src/gallium/drivers/nouveau/ci/nouveau-gt215-fails.txt
+++ b/src/gallium/drivers/nouveau/ci/nouveau-gt215-fails.txt
@@ -105,10 +105,6 @@ KHR-GLES31.core.compute_shader.shared-max,Fail
 KHR-GLES31.core.compute_shader.sso-case3,Fail
 KHR-GLES31.core.layout_binding.block_layout_binding_block_ComputeShader,Fail

-# TODO
-KHR-GLES31.core.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GLES31.core.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 # TODO
 KHR-GLES31.core.shader_image_load_store.advanced-allMips-cs,Fail
 KHR-GLES31.core.shader_image_load_store.basic-allTargets-store-cs,Fail
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
@@ -2,9 +2,6 @@ multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored_masked,Fai
 multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored,Fail
 multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_scissored,Fail

-# CTS bug: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4200
-KHR-GLES31.core.compute_shader.max,Fail
-
 # "Fail, buffer content is not well preserved when age > 0 (Fail)"
 dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_clear_even_clear_clear,Fail
 dEQP-EGL.functional.buffer_age.no_preserve.no_resize.odd_clear_clear_even_clear,Fail
@@ -699,10 +696,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp@sRGB decode full
 spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
 spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 # since Debian 12 (bookworm) uprev
 spec@arb_viewport_array@display-list,Fail
 glx@glx-multi-window-single-context,Fail
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -247,8 +247,6 @@ spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec4-vec4,Fail
 spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail

 # New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
 spec@arb_texture_cube_map_array@texsubimage cube_map_array,Fail

 spec@ext_transform_feedback@tessellation quads wireframe,Fail
--- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt
@@ -316,13 +316,6 @@ spec@egl 1.4@egl-ext_egl_image_storage,Fail
 # Introduced by a8d2b288eee3 ("ci/piglit: 2023-01-19 uprev")
 spec@!opengl 1.1@line-smooth-stipple,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
-# Should be fixed in the next glcts release (according to zmike)
-KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
-
 spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
 spec@ext_transform_feedback@tessellation quads wireframe,Fail

--- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt
@@ -322,13 +322,6 @@ spec@!opengl 1.1@depthstencil-default_fb-blit samples=4,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=6,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=8,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
-# Should be fixed in the next glcts release (according to zmike)
-KHR-GL46.multi_bind.dispatch_bind_image_textures,Fail
-
 spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
 spec@ext_transform_feedback@tessellation quads wireframe,Fail

--- a/src/gallium/drivers/zink/ci/zink-tu-a630-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-tu-a630-fails.txt
@@ -11,18 +11,10 @@ KHR-GL46.limits.max_fragment_input_components,Fail
 # https://gerrit.khronos.org/c/vk-gl-cts/+/9672
 KHR-GL46.buffer_storage.map_persistent_draw,Fail

-# https://gerrit.khronos.org/c/vk-gl-cts/+/9667
-KHR-GL46.gpu_shader_fp64.builtin.mod_dvec2,Fail
-KHR-GL46.gpu_shader_fp64.builtin.mod_dvec3,Fail
-KHR-GL46.gpu_shader_fp64.builtin.mod_dvec4,Fail
-
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/6723
 KHR-GL46.copy_image.functional,Fail
 KHR-GL46.texture_view.view_classes,Fail

-# https://gerrit.khronos.org/c/vk-gl-cts/+/9891/
-KHR-GLES31.core.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-
 # Piglit xfb tests
 spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
 spec@ext_transform_feedback@tessellation quads wireframe,Fail
--- a/src/intel/ci/iris-amly-fails.txt
+++ b/src/intel/ci/iris-amly-fails.txt
@@ -7,7 +7,3 @@ wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail
 wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail

 wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail
-
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
--- a/src/intel/ci/iris-apl-fails.txt
+++ b/src/intel/ci/iris-apl-fails.txt
@@ -5,10 +5,6 @@
 # Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3
 wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 # after enabling wayland in x86_64 mesa build
 wayland-dEQP-EGL.functional.wide_color.window_888_colorspace_default,Fail
 wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail
--- a/src/intel/ci/iris-cml-fails.txt
+++ b/src/intel/ci/iris-cml-fails.txt
@@ -1,3 +0,0 @@
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
--- a/src/intel/ci/iris-glk-fails.txt
+++ b/src/intel/ci/iris-glk-fails.txt
@@ -9,6 +9,3 @@ KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail
 # Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3
 # Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3
 wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail
-
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
--- a/src/intel/ci/iris-glk-skips.txt
+++ b/src/intel/ci/iris-glk-skips.txt
@@ -7,3 +7,5 @@ wayland-dEQP-EGL.functional.query_context.query_context.*
 wayland-dEQP-EGL.functional.resize.surface_size.*
 wayland-dEQP-EGL.functional.swap_buffers_with_damage.*
 wayland-dEQP-EGL.functional.wide_color.*
+
+KHR-Single-GL46.arrays_of_arrays_gl.SizedDeclarationsPrimitive
--- a/src/intel/ci/iris-jsl-fails.txt
+++ b/src/intel/ci/iris-jsl-fails.txt
@@ -1,3 +0,0 @@
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
--- a/src/intel/ci/iris-kbl-fails.txt
+++ b/src/intel/ci/iris-kbl-fails.txt
@@ -140,9 +140,5 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful
 spec@!opengl 1.1@line-smooth-coverage,Fail
 spec@!opengl 1.1@line-smooth-stipple,Fail

-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail
-
 # fails after Debian bookworm update
 spec@arb_viewport_array@display-list,Fail
--- a/src/intel/ci/iris-whl-fails.txt
+++ b/src/intel/ci/iris-whl-fails.txt
@@ -1,3 +0,0 @@
-# New CTS failures in 1.3.5.0
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail
-KHR-GL46.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail