diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci/build-deqp-vk.sh | 16 | ||||
| -rw-r--r-- | .gitlab-ci/deqp-freedreno-a630-fails.txt | 18 |
3 files changed, 21 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fea645d414..2c9d53ff9c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -302,7 +302,7 @@ x86_test-gl: x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-13-gold" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-31-deqp-version" # Debian 9 based x86 build image (old LLVM) x86_build_old: @@ -357,7 +357,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-24-gold" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-31-deqp-version" .use-arm64_test: variables: diff --git a/.gitlab-ci/build-deqp-vk.sh b/.gitlab-ci/build-deqp-vk.sh index 38c7e2575ce..a8163c20ab5 100644 --- a/.gitlab-ci/build-deqp-vk.sh +++ b/.gitlab-ci/build-deqp-vk.sh @@ -6,7 +6,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.2.3.0 \ + -b vulkan-cts-1.2.3.2 \ --depth 1 \ /VK-GL-CTS pushd /VK-GL-CTS @@ -35,11 +35,12 @@ mkdir /deqp/mustpass cp /VK-GL-CTS/external/vulkancts/mustpass/master/vk-default.txt \ /deqp/mustpass/vk-master.txt -for gles in gles2 gles3 gles31; do - cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/$gles-master.txt \ - /deqp/mustpass/$gles-master.txt -done +cp \ + /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \ + /deqp/mustpass/. +cp \ + /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \ + /deqp/mustpass/. # Save *some* executor utils, but otherwise strip things down # to reduct deqp build size: @@ -48,12 +49,15 @@ cp /deqp/executor/testlog-to-* /deqp/executor.save rm -rf /deqp/executor mv /deqp/executor.save /deqp/executor +rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass +rm -rf /deqp/external/openglcts/modules/cts-runner rm -rf /deqp/modules/internal rm -rf /deqp/execserver rm -rf /deqp/modules/egl rm -rf /deqp/framework find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk +${STRIP_CMD:-strip} external/openglcts/modules/glcts ${STRIP_CMD:-strip} modules/*/deqp-* du -sh * rm -rf /VK-GL-CTS diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt index 8d06d4eaca3..5b983913c33 100644 --- a/.gitlab-ci/deqp-freedreno-a630-fails.txt +++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt @@ -1,14 +1,14 @@ # Possibly https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2035 related dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_neg_x_neg_z_and_pos_x_pos_z_and_neg_x_neg_y_pos_z -dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithigh.imglimithigh.noiub.uab.frag.ialimitlow.0 -dEQP-VK.draw.output_location.array.b8g8r8a8-unorm-mediump-output-vec3 -dEQP-VK.graphicsfuzz.mat-array-deep-control-flow -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 +dEQP-VK.api.image_clearing.core.clear_color_attachment.single_layer.a8b8g8r8_srgb_pack32_1x33 +dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_attachment.single_layer.b8g8r8a8_srgb_33x128 +dEQP-VK.compute.indirect_dispatch.upload_buffer.multi_dispatch +dEQP-VK.draw.output_location.array.r8g8-uint-mediump-output-uint +dEQP-VK.memory_model.message_passing.core11.u32.coherent.fence_fence.atomicwrite.device.payload_local.image.guard_nonlocal.workgroup.comp +dEQP-VK.spirv_assembly.instruction.graphics.opquantize.round_to_negative_inf_geom +dEQP-VK.spirv_assembly.instruction.graphics.opquantize.spec_const_positive_round_up_or_round_down_geom # not sure what's wrong here -dEQP-VK.tessellation.invariance.outer_edge_index_independence.triangles_equal_spacing_ccw_point_mode -dEQP-VK.tessellation.invariance.primitive_set.isolines_fractional_odd_spacing_ccw_point_mode +dEQP-VK.tessellation.invariance.outer_edge_index_independence.quads_fractional_even_spacing_ccw_point_mode +dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_fractional_odd_spacing_cw_point_mode |