From 1883f3094fdf4bb4498fb0e778f96577b86342ea Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sat, 2 May 2026 20:20:39 -0700 Subject: [PATCH] ci: uprev virglrenderer This uprev: - brings in vrend fixes with virgl ci expectation updated - enables new venus extensions support - drops render-server-worker since process isolation is the default - updates venus ci expectations Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-crosvm.sh | 4 +- .gitlab-ci/image-tags.yml | 2 +- .../drivers/virgl/ci/virpipe-gl-fails.txt | 56 ------------------- src/virtio/ci/venus-fails.txt | 11 ---- src/virtio/ci/venus-flakes.txt | 8 ++- src/virtio/ci/venus-skips.txt | 4 ++ 7 files changed, 14 insertions(+), 73 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index fadf41f1af9..4efbc933a46 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,7 +1,7 @@ variables: CONDITIONAL_BUILD_ANDROID_CTS_TAG: 2dfd3e288249e4776ef6866d34d344d4 CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9 - CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db + CONDITIONAL_BUILD_CROSVM_TAG: 7edabf28bbd50e00558e3b0bb2d94255 CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 061a525369ba3233d21ad80a5dfaefd6 diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index d66bd3a168c..c0e30cb64ca 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -22,12 +22,12 @@ pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=95610d57da49d76617bd6d8d21b9bfb1bf360f64 +VIRGLRENDERER_VERSION=37168812546aba59e79eb032d65e150c38ad3996 rm -rf third_party/virglrenderer git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer git checkout "$VIRGLRENDERER_VERSION" -meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true ${EXTRA_MESON_ARGS:-} +meson setup build/ -D libdir=lib -D venus=true ${EXTRA_MESON_ARGS:-} meson install -C build popd diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0c592ed1faa..0db5c89cfa7 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -22,7 +22,7 @@ variables: DEBIAN_BUILD_BASE_TAG: "20250430-imgui.2" DEBIAN_BUILD_TAG: "20260430-imgui.2" - DEBIAN_TEST_BASE_TAG: "20260430-imgui.2" + DEBIAN_TEST_BASE_TAG: "20260502-virgl" DEBIAN_TEST_ANDROID_TAG: "20260430-imgui.2" DEBIAN_TEST_GL_TAG: "20260430-imgui.2" DEBIAN_TEST_VIDEO_TAG: "20260430-imgui.2" diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 2966ab93919..dc41c55576c 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -508,16 +508,7 @@ spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one_write- spec@arb_shader_image_load_store@max-size@image2DMS max size test/8x16384x8x1,Fail spec@arb_shader_image_load_store@max-size@image2DMS max size test/8x8x16384x1,Fail spec@arb_shader_image_load_store@max-size@image2DMSArray max size test/8x8x8x2048,Fail -spec@arb_tessellation_shader@execution@built-in-functions@tcs-equal-vec2-vec2,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-max-float-float,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-float-float-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-mat2-mat2-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-mat3x4-mat3x4-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-vec4-vec4,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-mat2-mat2-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec3-vec3-using-if,Crash spec@arb_tessellation_shader@execution@tcs-output-unmatched,Fail -spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec3-index-wr-before-tcs,Crash spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT- swizzled- border color only,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT- swizzled- border color only,Fail @@ -552,12 +543,6 @@ spec@ext_packed_float@texwrap formats bordercolor,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled@GL_R11F_G11F_B10F- swizzled- border color only,Fail spec@ext_packed_float@texwrap formats bordercolor@GL_R11F_G11F_B10F- border color only,Fail -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-float-float,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-mat2-mat2,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-vec3-vec3-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-mat2-mat2,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec3-vec3,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec4-vec4-using-if,Crash spec@ext_texture_compression_s3tc@texwrap formats bordercolor,Fail spec@ext_texture_compression_s3tc@texwrap formats bordercolor@GL_COMPRESSED_RGBA_S3TC_DXT1_EXT- border color only,Fail spec@ext_texture_compression_s3tc@texwrap formats bordercolor@GL_COMPRESSED_RGBA_S3TC_DXT3_EXT- border color only,Fail @@ -603,48 +588,7 @@ KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing4_var_type_index_1 KHR-Single-GL43.arrays_of_arrays_gl.SubroutineFunctionCalls1_var_type_index_14,Fail KHR-Single-GL43.arrays_of_arrays_gl.SubroutineFunctionCalls2_var_type_index_14,Fail -# TGSI translation failure after https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40291 -KHR-GL43.shading_language_420pack.const_dynamic_value,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_float_t2_float,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_mat2_t2_mat2,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_mat2x3_t2_mat2x3,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_vec3_t2_ivec3,Crash -KHR-GL43.shading_language_420pack.initializer_list_initializer_vector_cols_1_rows_3,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_between_preprocessor_token_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_between_preprocessor_token_repetition_multiple_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_between_preprocessor_token_repetition_single_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_comment_repetition_single_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_variable_name_repetition_single_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_last_character_in_part_string_without_null_termination_repetition_single_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_part_of_source_repetition_single_ending_dos,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-equal-vec3-vec3,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-eq-vec4-vec4-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec2-vec2,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec2-vec2-using-if,Crash -spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec4-vec4,Crash -spec@arb_tessellation_shader@execution@variable-indexing@tcs-input-array-float-index-rd,Crash -spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec2-index-wr-before-tcs,Crash -spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec4-index-wr-before-tcs,Crash - # New failures with GL CTS 4.6.8.0 KHR-GL43.cull_distance.functional_test_item_5_primitive_mode_lines_max_culldist_0,Fail KHR-GL43.framebuffer_blit.multisampled_to_singlesampled_blit_depth_config_test,Fail -KHR-GL43.gpu_shader_fp64.fp64.named_uniform_blocks,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_float_t2_int,Crash -KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_vec4_t2_ivec4,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_part_string_without_null_termination_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_single_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_single_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_between_preprocessor_token_repetition_single_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_function_name_repetition_multiple_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_preprocessor_token_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_type_name_repetition_multiple_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_inside_vector_variable_initializer_repetition_single_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_after_assignment_operator_repetition_single_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_last_character_in_part_of_source_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_last_character_in_part_string_without_null_termination_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_part_of_source_repetition_multiple_ending_dos,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_part_of_source_repetition_multiple_ending_unix,Crash -KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_source_repetition_single_ending_dos,Crash KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing2_var_type_index_14,Fail diff --git a/src/virtio/ci/venus-fails.txt b/src/virtio/ci/venus-fails.txt index 5468bc53332..d14e30a208f 100644 --- a/src/virtio/ci/venus-fails.txt +++ b/src/virtio/ci/venus-fails.txt @@ -5,13 +5,6 @@ dEQP-VK.api.external.memory.opaque_fd.suballocated.buffer.info,Fail dEQP-VK.draw.renderpass.basic_draw.misc.maintenance5,Crash dEQP-VK.pipeline.monolithic.timestamp.misc_tests.consistent_results,Fail -# New fails in 1.4.1.0 -dEQP-VK.pipeline.pipeline_library.multisample.sample_rate_a2c.static_a2c,Fail -dEQP-VK.pipeline.fast_linked_library.multisample.sample_rate_a2c.static_a2c,Fail - -# New fails in 1.4.3.3 -dEQP-VK.pipeline.monolithic.multisample.sample_rate_a2c.static_a2c,Fail - # From venus-lavapipe-full dEQP-VK.draw.renderpass.multiple_interpolation.structured.with_sample_decoration.4_samples,Fail @@ -30,10 +23,6 @@ dEQP-VK.mesh_shader.ext.smoke.monolithic.depth_only_triangles_position_component dEQP-VK.mesh_shader.ext.smoke.optimized_lib.depth_only_points_position_components,Fail dEQP-VK.mesh_shader.ext.smoke.optimized_lib.depth_only_triangles_position_components,Fail -dEQP-VK.memory.allocation.random.66,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.formats.r8g8b8a8_unorm.input.dont_care.store.self_dep_clear_draw,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.formats.r8g8b8a8_unorm.input.load.store.self_dep_clear_draw,Fail - # CTS bug # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40520 dEQP-VK.spirv_assembly.instruction.graphics.float_controls2.fp32.input_args.reflect_testedWithout_NSZ_arg1_minusZero_arg2_one_res_minusZero_deco_vert,Fail diff --git a/src/virtio/ci/venus-flakes.txt b/src/virtio/ci/venus-flakes.txt index cfaff8c4c20..dd6441755fb 100644 --- a/src/virtio/ci/venus-flakes.txt +++ b/src/virtio/ci/venus-flakes.txt @@ -7,7 +7,11 @@ dEQP-VK.transform_feedback.primitives_generated_query.get.*reset.* # Seen in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/1364513 dEQP-VK.api.image_clearing.dedicated_allocation.clear_color_image.2d.linear.remaining_array_layers.b10g11r11_ufloat_pack32 -dEQP-VK.dynamic_rendering.graphics_pipeline_library.suballocation.formats.a8b8g8r8_unorm_pack32.input.load.store.self_dep_clear_draw -dEQP-VK.dynamic_rendering.primary_cmd_buff.suballocation.formats.a8b8g8r8_unorm_pack32.input.clear.store.self_dep_draw +dEQP-VK.renderpasses.dynamic_rendering.graphics_pipeline_library.dedicated_allocation.formats.a8b8g8r8_unorm_pack32.input.clear.store.self_dep_draw +dEQP-VK.renderpasses.dynamic_rendering.graphics_pipeline_library.suballocation.formats.a8b8g8r8_unorm_pack32.input.load.store.self_dep_clear_draw +dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.formats.a8b8g8r8_unorm_pack32.input.clear.store.self_dep_draw +dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.formats.r8g8b8a8_unorm.input.dont_care.store.self_dep_clear_draw +dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.suballocation.formats.r8g8b8a8_unorm.input.load.store.self_dep_clear_draw + dEQP-VK.image.host_image_copy.draw_r32g32b32a32_sfloat_r32g32b32a32_sfloat.host_transition_host_copy.memory_to_image.transfer_src_transfer_dst.shader_read_only_optimal.optimal.0_4_4.16x16 diff --git a/src/virtio/ci/venus-skips.txt b/src/virtio/ci/venus-skips.txt index a9204bfe364..410b3160da8 100644 --- a/src/virtio/ci/venus-skips.txt +++ b/src/virtio/ci/venus-skips.txt @@ -75,3 +75,7 @@ dEQP-VK.wsi.direct_drm.* # New timeouts since https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40211 dEQP-VK.api.external.fence.sync_fd.export_multiple_times_temporary dEQP-VK.api.external.semaphore.sync_fd.export_multiple_times_temporary + +# Skip flaky memory pressure related tests +dEQP-VK.memory.allocation.basic.percent_1.* +dEQP-VK.memory.allocation.random.*