Skip to content

update llvm-tools logic for dist and install steps #140932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2025

Conversation

onur-ozkan
Copy link
Member

First commit aligns build_steps::compile and build_steps::dist logics for copying llvm-tools, and the second commit adds the correct should_run condition for LlvmTools step as the previous one was clearly incorrect.

Fixes #140913

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented May 12, 2025

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 12, 2025
if let Some(config) = builder.config.target_config.get(&target) {
if let Some(ref _s) = config.llvm_config {
if !builder.config.llvm_from_ci && config.llvm_config.is_some() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running any dist command when CI LLVM is enabled should IMO be a hard error. But that's a separate topic.

@Kobzol
Copy link
Contributor

Kobzol commented May 20, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented May 20, 2025

📌 Commit 475e743 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 20, 2025
@bors
Copy link
Collaborator

bors commented May 20, 2025

⌛ Testing commit 475e743 with merge 6cab15c...

@bors
Copy link
Collaborator

bors commented May 20, 2025

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 6cab15c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 20, 2025
@bors bors merged commit 6cab15c into rust-lang:master May 20, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 20, 2025
Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 28174fc (parent) -> 6cab15c (this PR)

Test differences

Show 33254 test diffs

Stage 1

  • net::socket_addr::tests::to_socket_addr_ipaddr_u16: [missing] -> pass (J0)
  • num::bench_i16_from_str: [missing] -> pass (J0)
  • slice::sort_small_ascending: [missing] -> pass (J0)
  • slice::sort_unstable_large_ascending: [missing] -> pass (J0)
  • sort::tests::unstable::stability_string_descending: [missing] -> pass (J0)
  • str::char_count::zh_large::case01_filter_count_cont_bytes: [missing] -> pass (J0)
  • vec::bench_extend_0000_0010: [missing] -> pass (J0)
  • cell::unsafe_cell_raw_get: [missing] -> pass (J1)
  • collections::vec_deque::tests::test_get: [missing] -> pass (J1)
  • env_home_dir: [missing] -> pass (J1)
  • f32::test_ln_gamma: [missing] -> pass (J1)
  • floats::f128::test_is_normal: [missing] -> pass (J1)
  • fmt::num::test_format_int_sign_padding: [missing] -> pass (J1)
  • fmt::test_maybe_uninit_short: [missing] -> pass (J1)
  • future::test_join_function_like_value_arg_semantics::join_lets_control_flow_effects_such_as_try_flow_through: [missing] -> pass (J1)
  • iter::adapters::cloned::test_cloned_try_folds: [missing] -> pass (J1)
  • iter::adapters::intersperse::test_fold_specialization_intersperse: [missing] -> pass (J1)
  • iter::adapters::zip::test_zip_nested_sideffectful: [missing] -> pass (J1)
  • iter::range::test_double_ended_range: [missing] -> pass (J1)
  • mpsc_sync::oneshot_multi_thread_send_recv_stress: [missing] -> pass (J1)
  • mutex::smoke: [missing] -> pass (J1)
  • num::bignum::test_mul_pow2_overflow_2: [missing] -> pass (J1)
  • num::i8::test_count_ones: [missing] -> pass (J1)
  • num::u32::test_isolate_most_significant_one: [missing] -> pass (J1)
  • ops::test_bound_cloned_included: [missing] -> pass (J1)
  • rc::slice: [missing] -> pass (J1)
  • rwlock::test_get_cloned: [missing] -> pass (J1)
  • slice::test_get_disjoint_mut_normal_2: [missing] -> pass (J1)
  • str::slice_index::rangeinclusive_neg_width::index_fail: [missing] -> pass (J1)
  • sys_common::wtf8::tests::wtf8buf_show: [missing] -> pass (J1)
  • vec::vec_macro_repeating_null_raw_fat_pointer: [missing] -> pass (J1)
  • analyze_source_file::tests::non_narrow_short: [missing] -> pass (J2)
  • error_reporting::traits::on_unimplemented_format::errors::verify_trait_selection_invalid_format_specifier_6: [missing] -> pass (J2)
  • errors::verify_ast_passes_fn_param_too_many_3: [missing] -> pass (J2)
  • errors::verify_ast_passes_trait_object_single_bound_33: [missing] -> pass (J2)
  • errors::verify_codegen_ssa_check_installed_visual_studio_53: [missing] -> pass (J2)
  • errors::verify_codegen_ssa_invalid_instruction_set_21: [missing] -> pass (J2)
  • errors::verify_codegen_ssa_no_saved_object_file_17: [missing] -> pass (J2)
  • errors::verify_metadata_fail_write_file_41: [missing] -> pass (J2)
  • errors::verify_mir_build_non_partial_eq_match_18: [missing] -> pass (J2)
  • errors::verify_passes_layout_homogeneous_aggregate_118: [missing] -> pass (J2)
  • errors::verify_resolve_self_in_generic_param_default_10: [missing] -> pass (J2)
  • extern_abi::tests::guarantee_lexicographic_ordering: [missing] -> pass (J2)
  • html::length_limit::tests::multiple_nested_tags: [missing] -> pass (J2)
  • html::markdown::tests::test_header: [missing] -> pass (J2)
  • html::render::tests::test_compare_names: [missing] -> pass (J2)
  • lints::verify_lint_uses_power_alignment_86: [missing] -> pass (J2)
  • parser::tests::single_label_without_message: [missing] -> pass (J2)
  • spec::tests::riscv32im_risc0_zkvm_elf: [missing] -> pass (J2)
  • symbols::tests::test_symbols: [missing] -> pass (J2)
  • sort::tests::unstable::stability_string_random_d2: [missing] -> ignore (J3)

Stage 2

  • btree::map::iter_1: pass -> [missing] (J0)
  • fs::tests::binary_file: pass -> [missing] (J0)
  • fs::tests::file_test_io_smoke_test: pass -> [missing] (J0)
  • hash::map::grow_by_insertion: pass -> [missing] (J0)
  • sort::tests::stable::correct_u64_ascending: pass -> [missing] (J0)
  • sort::tests::unstable::self_cmp_string_random_d2: pass -> [missing] (J0)
  • collections::btree::map::tests::test_cursor_mut_insert_before_2: pass -> [missing] (J1)
  • collections::linked_list::tests::test_mut_rev_iter: pass -> [missing] (J1)
  • ffi::os_str::tests::test_os_string_reserve_exact: pass -> [missing] (J1)
  • floats::f64::test_recip: pass -> [missing] (J1)
  • io::tests::lines: pass -> [missing] (J1)
  • lazy::dropck: pass -> [missing] (J1)
  • lazy::reentrant_init: pass -> [missing] (J1)
  • mem::size_of_val_basic: pass -> [missing] (J1)
  • mpsc_sync::oneshot_multi_thread_send_recv_stress: pass -> [missing] (J1)
  • mpsc_sync::try_send3: pass -> [missing] (J1)
  • mutex::test_get_cloned: pass -> [missing] (J1)
  • net::ip_addr::ip_const: pass -> [missing] (J1)
  • nonzero::test_match_option_rc: pass -> [missing] (J1)
  • num::flt2dec::strategy::dragon::test_to_shortest_exp_str: pass -> [missing] (J1)
  • num::i64::test_borrowing_sub: pass -> [missing] (J1)
  • num::test_i8f64: pass -> [missing] (J1)
  • num::u128::test_overflows: pass -> [missing] (J1)
  • num::u16::test_count_zeros: pass -> [missing] (J1)
  • num::u16::test_unbounded_shl: pass -> [missing] (J1)
  • num::wrapping::test_wrapping_i32: pass -> [missing] (J1)
  • rc::test_clone_from_slice_panic: pass -> [missing] (J1)
  • slice::split_off_in_bounds_range_from: pass -> [missing] (J1)
  • slice::test_chunks_next: pass -> [missing] (J1)
  • sort::tests::stable::correct_i32_random_d20: pass -> [missing] (J1)
  • str::test_str_slice_rangetoinclusive_ok: pass -> [missing] (J1)
  • str::to_uppercase: pass -> [missing] (J1)
  • thin_box::align64small: pass -> [missing] (J1)
  • vec_deque::test_try_fold_wraparound: pass -> [missing] (J1)
  • errors::verify_incremental_not_dirty_10: pass -> [missing] (J2)
  • errors::verify_parse_bad_item_kind_151: pass -> [missing] (J2)
  • errors::verify_passes_ignored_attr_7: pass -> [missing] (J2)
  • errors::verify_passes_transparent_incompatible_151: pass -> [missing] (J2)
  • errors::verify_passes_used_compiler_linker_77: pass -> [missing] (J2)
  • errors::verify_resolve_expected_module_found_18: pass -> [missing] (J2)
  • errors::verify_session_target_stack_protector_not_supported_24: pass -> [missing] (J2)
  • html::tests::href_relative_parts_parent_module: pass -> [missing] (J2)
  • lints::verify_lint_identifier_non_ascii_char_73: pass -> [missing] (J2)
  • small_c_str::tests::from_cstr: pass -> [missing] (J2)
  • stable_hasher::tests::test_isize_compression: pass -> [missing] (J2)
  • tests::invalid05: pass -> [missing] (J2)
  • tests::test_native_libs_tracking_hash_different_order: pass -> [missing] (J2)
  • sort::tests::unstable::panic_observable_is_less_saw_mixed: ignore -> [missing] (J3)
  • sort::tests::unstable::violate_ord_retain_orig_set_string_random_d2: ignore -> [missing] (J3)

(and 16556 additional test diffs)

Additionally, 16598 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 6cab15c1aef39456d86ce51be6096088cb2ef1da --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-apple-2: 1439.3s -> 4695.3s (226.2%)
  2. test-various: 2330.6s -> 4178.5s (79.3%)
  3. x86_64-gnu-aux: 4338.1s -> 6467.7s (49.1%)
  4. aarch64-apple: 3657.2s -> 4566.5s (24.9%)
  5. dist-apple-various: 6145.8s -> 7414.5s (20.6%)
  6. dist-arm-linux: 4595.2s -> 5534.4s (20.4%)
  7. x86_64-mingw-2: 7220.0s -> 7962.1s (10.3%)
  8. dist-loongarch64-musl: 5629.1s -> 5166.5s (-8.2%)
  9. dist-powerpc64-linux: 5364.5s -> 5777.0s (7.7%)
  10. dist-i686-msvc: 7136.9s -> 7679.4s (7.6%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@onur-ozkan onur-ozkan deleted the llvm-tools branch May 20, 2025 16:59
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6cab15c): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
3.0% [3.0%, 3.0%] 1
Regressions ❌
(secondary)
0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.0% [3.0%, 3.0%] 1

Max RSS (memory usage)

Results (primary -3.7%, secondary -1.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.6% [0.4%, 1.1%] 5
Improvements ✅
(primary)
-3.7% [-3.7%, -3.6%] 3
Improvements ✅
(secondary)
-2.6% [-3.7%, -1.4%] 12
All ❌✅ (primary) -3.7% [-3.7%, -3.6%] 3

Cycles

Results (primary 2.8%, secondary 0.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.8% [2.8%, 2.8%] 1
Regressions ❌
(secondary)
0.5% [0.5%, 0.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.8% [2.8%, 2.8%] 1

Binary size

Results (primary 1.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.1% [1.1%, 1.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.1% [1.1%, 1.1%] 1

Bootstrap: 775.471s -> 775.908s (0.06%)
Artifact size: 365.50 MiB -> 365.52 MiB (0.01%)

@rustbot rustbot added the perf-regression Performance regression. label May 20, 2025
@Kobzol
Copy link
Contributor

Kobzol commented May 20, 2025

Noise.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label May 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

llvm-* and llc binaries missing from rustc build
5 participants