Mesa (master): ci: Bump vulkan CTS to 1.2.3.0.

Fri Jun 19 22:11:53 UTC 2020

Module: Mesa
Branch: master
Commit: 6ee80d8e0cf678d05ce23d61669199e3f9b39a1c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ee80d8e0cf678d05ce23d61669199e3f9b39a1c

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 18 12:21:44 2020 -0700

ci: Bump vulkan CTS to 1.2.3.0.

Looks like it fixes some potentially important VK test bugs.  But also, it
fixes the GLES31 SSBO layout tests to not be so excessively large, so we
can run them in a reasonable time now.  Note that a630 fail list is reset,
since the test list has changed and so we end up with a different subset
of tests being run.  Interestingly, in the process the semaphore tests are
now reporting "NotSupported (Exporting and importing semaphore type not
supported at vktSynchronizationSignalOrderTests.cpp:513)" where they
weren't before.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5554>

---

 .gitlab-ci.yml                                  |  4 +-
 .gitlab-ci/build-deqp-vk.sh                     |  7 +---
 .gitlab-ci/deqp-freedreno-a630-bypass-fails.txt | 50 +++++++++++++------------
 .gitlab-ci/deqp-freedreno-a630-fails.txt        | 50 +++++++++----------------
 .gitlab-ci/deqp-freedreno-a630-skips.txt        |  4 --
 5 files changed, 47 insertions(+), 68 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd4c2a8951b..36a1844fa3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -250,7 +250,7 @@ x86_test-gl:
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02-gles"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -305,7 +305,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-09-rsync"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/build-deqp-vk.sh b/.gitlab-ci/build-deqp-vk.sh
index 9142c5220cb..38c7e2575ce 100644
--- a/.gitlab-ci/build-deqp-vk.sh
+++ b/.gitlab-ci/build-deqp-vk.sh
@@ -6,14 +6,11 @@ git config --global user.email "mesa at example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.2.2.1 \
+    -b vulkan-cts-1.2.3.0 \
+    --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
 
-# Cherry pick a fix that's not in 1.2.2.1 yet.  Re-add --depth 1 to the clone
-# when an uprev removes this.
-git cherry-pick -x ea6f1ffae14de94bbd9c354ad5a6c3f452f65ac4
-
 # --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/deqp-freedreno-a630-bypass-fails.txt b/.gitlab-ci/deqp-freedreno-a630-bypass-fails.txt
index ac1c7b86113..eabca8fb0bd 100644
--- a/.gitlab-ci/deqp-freedreno-a630-bypass-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-bypass-fails.txt
@@ -95,27 +95,29 @@ dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d
 dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d_array
 dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_depth_2d
 dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_depth_2d_array
-dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.store.self_dep_clear_draw
-dEQP-VK.renderpass2.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.self_dep_clear_draw_stencil_read_only
-dEQP-VK.renderpass2.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.self_dep_draw
-dEQP-VK.renderpass2.suballocation.formats.d24_unorm_s8_uint.input.load.store.self_dep_clear_draw
-dEQP-VK.renderpass2.suballocation.subpass_dependencies.separate_channels.r8g8b8a8_unorm
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.dont_care.clear_draw_use_input_aspect
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.dont_care.draw_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.store.clear_draw_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.store.draw
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.clear_draw_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.draw
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.store.clear_draw
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.dont_care.draw_use_input_aspect_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.clear_draw_use_input_aspect_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.draw_use_input_aspect
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.dont_care.clear_draw_stencil_read_only
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.dont_care.draw
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.store.clear_draw
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.clear_draw
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.draw_use_input_aspect_stencil_read_only
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.clear_draw_use_input_aspect_stencil_read_only
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.draw_use_input_aspect
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.store.clear_draw_use_input_aspect
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.store.draw_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.dont_care.clear_draw
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.store.draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.store.clear_draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.store.draw_use_input_aspect
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.dont_care.clear_draw_use_input_aspect
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.dont_care.draw_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.clear_draw_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.draw
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.dont_care.draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.store.clear_draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.store.draw_use_input_aspect
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.clear_draw_use_input_aspect_stencil_read_only
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.draw_use_input_aspect
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.clear_draw_use_input_aspect
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.draw_stencil_read_only
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.clear_draw_stencil_read_only
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.draw
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.store.clear_draw
+dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.store.self_dep_clear_draw_stencil_read_only
+dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.store.self_dep_draw
+dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.self_dep_draw_stencil_read_only
+dEQP-VK.renderpass2.suballocation.formats.d24_unorm_s8_uint.input.clear.store.self_dep_draw_stencil_read_only
+dEQP-VK.renderpass2.suballocation.multisample.d24_unorm_s8_uint.samples_4
+dEQP-VK.renderpass2.suballocation.multisample.s8_uint.samples_4
+dEQP-VK.renderpass2.suballocation.multisample.separate_stencil_usage.d24_unorm_s8_uint.samples_2.test_stencil
diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt
index 73d3b3c41af..fe13ac8259e 100644
--- a/.gitlab-ci/deqp-freedreno-a630-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt
@@ -3,36 +3,20 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_p
 
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_clear
 dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw
-dEQP-VK.compute.indirect_dispatch.upload_buffer.multiple_groups
-dEQP-VK.glsl.linkage.varying.struct.int
-dEQP-VK.image.texel_view_compatible.graphic.extended.2d_image.texture_read.astc_10x6_unorm_block.r32g32b32a32_uint
-dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.store.self_dep_clear_draw
-dEQP-VK.renderpass2.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.self_dep_clear_draw_stencil_read_only
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.draw
-dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.dont_care.draw_use_input_aspect_stencil_read_only
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.dont_care.draw
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.clear_draw
-dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.clear_draw_use_input_aspect_stencil_read_only
-dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.denorm_fma_inf_preserve
-dEQP-VK.subgroups.basic.framebuffer.subgroupmemorybarrierbuffer_vertex
-dEQP-VK.subgroups.quad.framebuffer.subgroupquadbroadcast_bvec2_geometry
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_blit_image_read_blit_image.image_128_r32_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_blit_image_read_image_compute_indirect.image_128x128_r8_unorm_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_buffer_read_ssbo_fragment.buffer_262144_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_buffer_to_image_read_image_tess_eval.image_128x128_r16_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_image_read_image_tess_control.image_64x64x8_r32_sfloat_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_image_to_buffer_read_ssbo_geometry.buffer_16384_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_compute_indirect_read_image_tess_eval.image_128_r32_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_compute_read_copy_image_to_buffer.image_128x128_r32g32b32a32_sfloat_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_compute_read_image_fragment.image_64x64x8_r32_sfloat_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_fragment_read_image_vertex.image_128x128_r16g16b16a16_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_geometry_read_image_geometry.image_128x128_r8g8b8a8_unorm_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_tess_control_read_image_tess_eval.image_128_r32_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_tess_eval_read_blit_image.image_128x128_r8_unorm_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_tess_eval_read_image_compute_indirect.image_128x128_r16_uint_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_vertex_read_copy_image_to_buffer.image_128x128_r32g32b32a32_sfloat_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_image_vertex_read_image_fragment.image_64x64x8_r32_sfloat_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_ssbo_compute_read_ubo_compute.buffer_16384_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_ssbo_geometry_read_ssbo_tess_control.buffer_16384_opaque_fd
-dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_ssbo_tess_control_read_ssbo_geometry.buffer_16384_opaque_fd
-dEQP-VK.transform_feedback.simple.draw_indirect_beginqueryindexed_streamid_0_244
+dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithigh.imglimithigh.noiub.uab.frag.ialimitlow.0
+dEQP-VK.compute.basic.shared_var_single_group
+dEQP-VK.draw.output_location.array.b8g8r8a8-unorm-mediump-output-vec3
+dEQP-VK.glsl.derivate.fwidthfine.uniform_loop.vec3_mediump
+dEQP-VK.glsl.linkage.varying.struct.mat3x2
+dEQP-VK.graphicsfuzz.mat-array-deep-control-flow
+dEQP-VK.pipeline.spec_constant.compute.composite.array.mat4x3
+dEQP-VK.pipeline.spec_constant.graphics.geometry.composite.array.array_vec4
+dEQP-VK.pipeline.spec_constant.graphics.vertex.composite.array.mat4x3
+dEQP-VK.renderpass2.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.store.self_dep_draw_stencil_read_only
+dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.clear.dont_care.clear_draw
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.draw_use_input_aspect
+dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.store.draw_stencil_read_only
+dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.negate_denorm_preserve
+dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.rounding_rtz_out_prod
+dEQP-VK.spirv_assembly.instruction.graphics.opquantize.carry_bit_geom
+dEQP-VK.subgroups.builtin_var.graphics.subgroupinvocationid
diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/.gitlab-ci/deqp-freedreno-a630-skips.txt
index b4a473f8aea..85dd81589e6 100644
--- a/.gitlab-ci/deqp-freedreno-a630-skips.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-skips.txt
@@ -16,10 +16,6 @@ dEQP-GLES3.functional.transform_feedback.*lines.*
 dEQP-GLES31.functional.primitive_bounding_box.*
 #dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array.*
 
-# Intermittent timeout
-dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.23
-dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
-
 # Flakes reported more than once during Jan-Feb 2020
 dEQP-GLES31.functional.layout_binding.ssbo.fragment_binding_array
 dEQP-GLES3.functional.fragment_out.random.0

