Skip to content

Revert "Link LLVM dynamically on aarch64-apple-darwin" and "re-enable enzyme/autodiff builds on dist-aarch64-apple"#154485

Merged
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
ZuseZ4:revert-aarch64-apple-dynamic-llvm
Mar 28, 2026
Merged

Revert "Link LLVM dynamically on aarch64-apple-darwin" and "re-enable enzyme/autodiff builds on dist-aarch64-apple"#154485
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
ZuseZ4:revert-aarch64-apple-dynamic-llvm

Conversation

@ZuseZ4
Copy link
Copy Markdown
Member

@ZuseZ4 ZuseZ4 commented Mar 27, 2026

This reverts commit e7c268f.

This approach was much better than the last time, as it didn't break downstream users like miri.
Unfortunately, it still broke rustc contributors and is blocking some people: #154408
The previously discussed solution (symlink) didn't seem to work for a user, and shipping two full copies of LLVM (old + new name) until the next stage0 compiler bump should probably be discussed first. We now also have artifacts of a nightly or two, which can be used for local experimenting, so hopefully next time we won't break anyone at all.

cc @sgasho

r? @jieyouxu

@rustbot rustbot added A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 27, 2026
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Can you force a CI LLVM stamp bump here too?

View changes since this review

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Mar 28, 2026
@ZuseZ4 ZuseZ4 force-pushed the revert-aarch64-apple-dynamic-llvm branch from b03112a to 0ae31c4 Compare March 28, 2026 02:30
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 28, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

@jieyouxu
Copy link
Copy Markdown
Member

@bors r+ p=10 rollup=never (unblock bootstrap on macos)

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

📌 Commit 0ae31c4 has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Mar 28, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 28, 2026
…ieyouxu

Revert "Link LLVM dynamically on aarch64-apple-darwin"

This reverts commit e7c268f.



This approach was much better than the last time, as it didn't break downstream users like miri.
Unfortunately, it still broke rustc contributors and is blocking some people: #154408
The previously discussed solution (symlink) didn't seem to work for a user, and shipping two full copies of LLVM (old + new name) until the next stage0 compiler bump should probably be discussed first. We now also have artifacts of a nightly or two, which can be used for local experimenting, so hopefully next time we won't break anyone at all.

cc @sgasho 

r? @jieyouxu
@ZuseZ4 ZuseZ4 force-pushed the revert-aarch64-apple-dynamic-llvm branch from 0ae31c4 to 0d3d1ac Compare March 28, 2026 04:19
@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

⚠️ A new commit 0d3d1ac9b3417fcea4fc2cb631779b32891c14d0 was pushed.

This pull request was unapproved.

Auto build was cancelled due to push. Cancelled workflows:

@jieyouxu jieyouxu changed the title Revert "Link LLVM dynamically on aarch64-apple-darwin" Revert "Link LLVM dynamically on aarch64-apple-darwin" and "re-enable enzyme/autodiff builds on dist-aarch64-apple" Mar 28, 2026
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, yeah I thought that was already disabled.

@bors r+

View changes since this review

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

📌 Commit 0d3d1ac has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 28, 2026
@rust-bors rust-bors bot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 28, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

☀️ Test successful - CI
Approved by: jieyouxu
Duration: 3h 8m 15s
Pushing c4db0e1 to main...

@rust-bors rust-bors bot merged commit c4db0e1 into rust-lang:main Mar 28, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 28, 2026
@github-actions
Copy link
Copy Markdown
Contributor

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 e161368 (parent) -> c4db0e1 (this PR)

Test differences

Show 1 test diff

Stage 2

  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression or LLVM is not the default codegen backend) (J0)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard c4db0e127c6e96d1798423bf9f205fd06f5481a6 --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-gnu-tools: 52m 17s -> 1h 15m (+45.2%)
  2. pr-check-1: 28m 14s -> 40m 19s (+42.8%)
  3. x86_64-rust-for-linux: 44m 59s -> 1h 3m (+40.2%)
  4. pr-check-2: 38m 25s -> 51m 31s (+34.1%)
  5. x86_64-gnu-nopt: 2h 10m -> 2h 46m (+27.4%)
  6. test-various: 1h 53m -> 2h 23m (+26.5%)
  7. x86_64-gnu-gcc: 1h 3m -> 1h 19m (+25.3%)
  8. arm-android: 1h 36m -> 2h 1m (+24.9%)
  9. armhf-gnu: 1h 23m -> 1h 43m (+24.3%)
  10. optional-x86_64-gnu-parallel-frontend: 2h 10m -> 2h 40m (+22.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.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (c4db0e1): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 13.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Cycles

Results (primary -2.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 484.178s -> 485.299s (0.23%)
Artifact size: 395.05 MiB -> 395.08 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants