Skip to content

copy the correct version of LLVM into the stage0 sysroot #114480

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 1 commit into from
Aug 13, 2023

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Aug 4, 2023

In some cases(see #109314), when the stage0
compiler relies on more recent version of LLVM than the beta compiler, it may not
be able to locate the correct LLVM in the sysroot. This situation typically occurs
when we upgrade LLVM version while the beta compiler continues to use an older version.

Fixes #109314

@rustbot
Copy link
Collaborator

rustbot commented Aug 4, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@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 Aug 4, 2023
@onur-ozkan onur-ozkan force-pushed the fix-stage0-compiler-llvm branch from 9cb44c1 to a579257 Compare August 7, 2023 05:10
In some cases(see rust-lang#109314), when the stage0
compiler relies on more recent version of LLVM than the beta compiler, it may not
be able to locate the correct LLVM in the sysroot. This situation typically occurs
when we upgrade LLVM version while the beta compiler continues to use an older version.

Signed-off-by: ozkanonur <[email protected]>
@onur-ozkan onur-ozkan force-pushed the fix-stage0-compiler-llvm branch from a579257 to aec4b59 Compare August 7, 2023 05:12
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

I'm going to go ahead and approve but let's keep an eye out for any regressions and back out if needed.

@bors
Copy link
Collaborator

bors commented Aug 13, 2023

📌 Commit aec4b59 has been approved by Mark-Simulacrum

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 Aug 13, 2023
@bors
Copy link
Collaborator

bors commented Aug 13, 2023

⌛ Testing commit aec4b59 with merge ebbd715...

@bors
Copy link
Collaborator

bors commented Aug 13, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing ebbd715 to master...

1 similar comment
@bors
Copy link
Collaborator

bors commented Aug 13, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing ebbd715 to master...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Aug 13, 2023
@bors bors merged commit ebbd715 into rust-lang:master Aug 13, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 13, 2023
@onur-ozkan onur-ozkan deleted the fix-stage0-compiler-llvm branch August 13, 2023 20:34
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ebbd715): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

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)
4.1% [2.9%, 5.3%] 2
Regressions ❌
(secondary)
2.1% [1.8%, 2.4%] 2
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
-3.3% [-3.4%, -3.2%] 2
All ❌✅ (primary) 1.9% [-2.6%, 5.3%] 3

Cycles

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

Binary size

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

Bootstrap: 632.481s -> 631.811s (-0.11%)

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. 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.

x test rustc_interface --stage 0 is broken again
5 participants