From cbbd9f3402f2e73448516029981e47c13eed8e0c Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 3 Aug 2022 13:58:00 -0700 Subject: [PATCH] ci: Upgrade deqp-runner to 0.15.0. This includes the new timeout fixes so that tests that throw lots of debug don't delay the timeout triggering, and the fraction vs shuffling behavior change so that "--fraction 2" doesn't just skip every other test as it appears in the caselist (every vertex shader variant, for example). The fraction vs shuffling change does mean we see some different fails on some drivers now. Acked-by: Timothy Arceri Acked-by: David Heidelberg Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 8 ++- .gitlab-ci/image-tags.yml | 6 +- src/freedreno/ci/freedreno-a530-fails.txt | 5 +- .../radeonsi/ci/radeonsi-stoney-fails.txt | 2 + src/intel/ci/anv-tgl-fails.txt | 68 +++++++++++-------- src/panfrost/ci/panfrost-t860-fails.txt | 14 +--- 6 files changed, 54 insertions(+), 49 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index 9ae0d99329e..d84e8261739 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -15,10 +15,16 @@ if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}" else # Install from package registry - DEQP_RUNNER_CARGO_ARGS="--version 0.13.1 ${EXTRA_CARGO_ARGS} -- deqp-runner" + DEQP_RUNNER_CARGO_ARGS="--version 0.15.0 ${EXTRA_CARGO_ARGS} -- deqp-runner" fi cargo install --locked \ -j ${FDO_CI_CONCURRENT:-4} \ --root /usr/local \ ${DEQP_RUNNER_CARGO_ARGS} + +# remove unused test runners to shrink images for the Mesa CI build (not kernel, +# which chooses its own deqp branch) +if [ -z "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then + rm -f /usr/local/bin/igt-runner +fi diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index ea65756856c..c8ef24568e0 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -11,11 +11,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-08-04-khr-single" - DEBIAN_X86_TEST_VK_TAG: "2022-08-04-khr-single" + DEBIAN_X86_TEST_GL_TAG: "2022-08-04-deqp-runner" + DEBIAN_X86_TEST_VK_TAG: "2022-08-04-deqp-runner" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-08-06-khr-single" + KERNEL_ROOTFS_TAG: "2022-08-06-deqp-runner" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk" diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt index 5be444966b5..de6ea2e0686 100644 --- a/src/freedreno/ci/freedreno-a530-fails.txt +++ b/src/freedreno/ci/freedreno-a530-fails.txt @@ -56,6 +56,7 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_ dEQP-GLES3.functional.texture.specification.texstorage3d.size.3d_2x2x2_2_levels,Fail # MESA: error: ir3_ra() failed! +dEQP-GLES31.functional.atomic_counter.inc_dec.8_counters_5_calls_1_thread,Fail dEQP-GLES31.functional.atomic_counter.get_dec.8_counters_5_calls_10_threads,Fail dEQP-GLES31.functional.atomic_counter.get_dec.8_counters_5_calls_1_thread,Fail dEQP-GLES31.functional.atomic_counter.get_inc.8_counters_5_calls_10_threads,Fail @@ -65,6 +66,7 @@ dEQP-GLES31.functional.atomic_counter.get_inc_dec.4_counters_5_calls_1_thread,Fa dEQP-GLES31.functional.atomic_counter.get_inc_dec.8_counters_5_calls_10_threads,Fail dEQP-GLES31.functional.atomic_counter.get_inc_dec.8_counters_5_calls_1_thread,Fail dEQP-GLES31.functional.atomic_counter.inc_dec.8_counters_5_calls_10_threads,Fail +dEQP-GLES31.functional.atomic_counter.layout.default_offset_set.get_inc.8_counters_5_calls_1_thread,Fail dEQP-GLES31.functional.atomic_counter.layout.default_offset_set.get_dec.8_counters_5_calls_1000_threads,Fail dEQP-GLES31.functional.atomic_counter.layout.default_offset_set.get_dec.8_counters_5_calls_1_thread,Fail dEQP-GLES31.functional.atomic_counter.layout.default_offset_set.inc_dec.8_counters_5_calls_1000_threads,Fail @@ -85,9 +87,6 @@ dEQP-GLES31.functional.atomic_counter.layout.reverse_offset.get_inc.8_counters_5 dEQP-GLES31.functional.atomic_counter.layout.reverse_offset.inc_dec.8_counters_5_calls_1000_threads,Fail dEQP-GLES31.functional.atomic_counter.layout.reverse_offset.inc_dec.8_counters_5_calls_1_thread,Fail -dEQP-GLES31.functional.compute.basic.image_atomic_op_local_size_1,Crash -dEQP-GLES31.functional.compute.basic.image_atomic_op_local_size_8,Crash - dEQP-GLES31.functional.draw_base_vertex.draw_elements_base_vertex.builtin_variable.vertex_id,Fail dEQP-GLES31.functional.draw_base_vertex.draw_elements_instanced_base_vertex.builtin_variable.vertex_id,Fail diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt index 15ab0aa63d8..eb7aa71a578 100644 --- a/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt +++ b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt @@ -12,7 +12,9 @@ spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail +spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-first,Fail +spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims line cull-front pv-first,Fail spec@nv_alpha_to_coverage_dither_control@nv_alpha_to_coverage_dither_control 0,Fail diff --git a/src/intel/ci/anv-tgl-fails.txt b/src/intel/ci/anv-tgl-fails.txt index d1230255190..cc77c14fbe5 100644 --- a/src/intel/ci/anv-tgl-fails.txt +++ b/src/intel/ci/anv-tgl-fails.txt @@ -5,62 +5,72 @@ dEQP-VK.pipeline.extended_dynamic_state.between_pipelines.stencil_state_face_fro # https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3505 dEQP-VK.subgroups.multiple_dispatches.uniform_subgroup_size,Fail -# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3575 -dEQP-VK.drm_format_modifiers.export_import.r16_sfloat,Fail - -# 1.3.2.0 uprev: +# ../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 +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_unorm_pack32,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b5g5r5a1_unorm_pack16,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b8g8r8a8_srgb,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b8g8r8a8_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32g32b32a32_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r4g4b4a4_unorm_pack16,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r5g5b5a1_unorm_pack16,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8b8a8_srgb,Crash +dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8b8a8_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import.a1r5g5b5_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import.a4r4g4b4_unorm_pack16,Crash +dEQP-VK.drm_format_modifiers.export_import.a8b8g8r8_unorm_pack32,Crash dEQP-VK.drm_format_modifiers.export_import.b4g4r4a4_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import.b5g5r5a1_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import.b5g6r5_unorm_pack16,Crash +dEQP-VK.drm_format_modifiers.export_import.b8g8r8a8_srgb,Crash dEQP-VK.drm_format_modifiers.export_import.b8g8r8a8_unorm,Crash +dEQP-VK.drm_format_modifiers.export_import.r16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import.r16_unorm,Crash dEQP-VK.drm_format_modifiers.export_import.r16g16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import.r16g16b16a16_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import.r16g16b16a16_unorm,Crash dEQP-VK.drm_format_modifiers.export_import.r32_sfloat,Crash dEQP-VK.drm_format_modifiers.export_import.r32g32_sfloat,Crash +dEQP-VK.drm_format_modifiers.export_import.r32g32b32a32_sfloat,Crash dEQP-VK.drm_format_modifiers.export_import.r4g4b4a4_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import.r5g5b5a1_unorm_pack16,Crash dEQP-VK.drm_format_modifiers.export_import.r5g6b5_unorm_pack16,Crash +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 -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.a8b8g8r8_srgb_pack32,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_sfloat,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_sfloat,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32_sfloat,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r4g4b4a4_unorm_pack16,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8g8b8a8_unorm,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 dEQP-VK.draw.dynamic_rendering.linear_interpolation.no_offset_8_samples,Fail dEQP-VK.draw.dynamic_rendering.linear_interpolation.offset_min_16_samples,Fail dEQP-VK.draw.dynamic_rendering.linear_interpolation.offset_min_2_samples,Fail dEQP-VK.draw.dynamic_rendering.linear_interpolation.offset_min_4_samples,Fail dEQP-VK.draw.dynamic_rendering.linear_interpolation.offset_min_8_samples,Fail +dEQP-VK.draw.renderpass.linear_interpolation.no_offset_2_samples,Fail +dEQP-VK.draw.renderpass.linear_interpolation.no_offset_4_samples,Fail +dEQP-VK.draw.renderpass.linear_interpolation.no_offset_8_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_max_16_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_max_2_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_max_4_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_max_8_samples,Fail dEQP-VK.draw.renderpass.linear_interpolation.offset_min_16_samples,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_unorm_pack32,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b5g5r5a1_unorm_pack16,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.b8g8r8a8_srgb,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r16g16b16a16_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r32g32b32a32_sfloat,Crash -dEQP-VK.drm_format_modifiers.export_import_fmt_features2.r8_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import.a1r5g5b5_unorm_pack16,Crash -dEQP-VK.drm_format_modifiers.export_import.a8b8g8r8_unorm_pack32,Crash -dEQP-VK.drm_format_modifiers.export_import.b8g8r8a8_srgb,Crash -dEQP-VK.drm_format_modifiers.export_import.r16_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import.r16g16b16a16_unorm,Crash -dEQP-VK.drm_format_modifiers.export_import.r32g32b32a32_sfloat,Crash -dEQP-VK.drm_format_modifiers.export_import.r8_unorm,Crash +dEQP-VK.draw.renderpass.linear_interpolation.offset_min_4_samples,Fail +dEQP-VK.draw.renderpass.linear_interpolation.offset_min_8_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 diff --git a/src/panfrost/ci/panfrost-t860-fails.txt b/src/panfrost/ci/panfrost-t860-fails.txt index aa6c90151bd..03aba702e5e 100644 --- a/src/panfrost/ci/panfrost-t860-fails.txt +++ b/src/panfrost/ci/panfrost-t860-fails.txt @@ -40,16 +40,14 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fa dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y,Fail -dEQP-GLES31.functional.separate_shader.random.23,Fail dEQP-GLES31.functional.separate_shader.random.35,Fail dEQP-GLES31.functional.separate_shader.random.68,Fail dEQP-GLES31.functional.separate_shader.random.79,Fail dEQP-GLES31.functional.separate_shader.random.80,Fail dEQP-GLES31.functional.separate_shader.random.89,Fail dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.ivec2_lowp_compute,Fail -dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec2_lowp_compute,Fail dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_fragment,Fail -dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec3_highp_fragment,Fail +dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec3_highp_vertex,Fail dEQP-GLES31.functional.synchronization.in_invocation.image_alias_overwrite,Crash dEQP-GLES31.functional.synchronization.in_invocation.image_atomic_alias_overwrite,Crash dEQP-GLES31.functional.synchronization.in_invocation.image_atomic_alias_write,Crash @@ -77,16 +75,6 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.base_level.level_1,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.clamp_to_edge_repeat,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.mirrored_repeat_clamp_to_edge,Fail dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.repeat_mirrored_repeat,Fail -dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_int_2d,Fail -dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_int_2d_array,Fail -dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_uint_2d,Fail -dEQP-GLES31.functional.texture.multisample.samples_2.use_texture_uint_2d_array,Fail -dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_int_2d,Fail -dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_int_2d_array,Fail -dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_uint_2d,Fail -dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_uint_2d_array,Fail -dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_int_2d,Fail -dEQP-GLES31.functional.texture.multisample.samples_4.use_texture_int_2d_array,Fail dEQP-GLES31.functional.shaders.builtin_functions.integer.imulextended.ivec4_highp_vertex,Fail dEQP-GLES31.functional.shaders.builtin_functions.integer.umulextended.uvec4_highp_vertex,Fail