Skip to content
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

Copy stage0 rustc binaries to stage0-sysroot #113341

Merged
merged 1 commit into from
Jul 9, 2023

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jul 4, 2023

This is basically a revival of #101711 and #107956, with an added check that the full sysroot will only be created if the original rustc comes from stage0/bin.

What is/should be tested:

(Hopefully) fixes: #101691

This is not the "end all, be all" solution to this problem, but as long as it resolves the basic use-case, and doesn't break perfbot, I say ship it. This code will probably be nuked anyway Soon™ because of the stage redesign.

@rustbot
Copy link
Collaborator

rustbot commented Jul 4, 2023

r? @Mark-Simulacrum

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 4, 2023
@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 4, 2023

@bors try @rust-timer queue

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 4, 2023
@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 4, 2023
@bors
Copy link
Contributor

bors commented Jul 4, 2023

⌛ Trying commit bb8c497 with merge 4326a1077ebab6adbc37556763a8fd302d86f154...

@bors
Copy link
Contributor

bors commented Jul 4, 2023

☀️ Try build successful - checks-actions
Build commit: 4326a1077ebab6adbc37556763a8fd302d86f154 (4326a1077ebab6adbc37556763a8fd302d86f154)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4326a1077ebab6adbc37556763a8fd302d86f154): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) - - 0

Cycles

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)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.4% [2.4%, 2.4%] 1

Binary size

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

Bootstrap: 653.846s -> 654.334s (0.07%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 5, 2023
@Kobzol Kobzol marked this pull request as ready for review July 5, 2023 08:29
@Kobzol
Copy link
Contributor Author

Kobzol commented Jul 5, 2023

Ok, perf seems to work, hopefully the conservative approach taken here will not break it.

@rustbot ready

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jul 8, 2023

📌 Commit bb8c497 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 Jul 8, 2023
@bors
Copy link
Contributor

bors commented Jul 9, 2023

⌛ Testing commit bb8c497 with merge 1065d87...

@bors
Copy link
Contributor

bors commented Jul 9, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 9, 2023
@bors bors merged commit 1065d87 into rust-lang:master Jul 9, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 9, 2023
@Kobzol Kobzol deleted the stage0-sysroot branch July 9, 2023 21:02
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1065d87): 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

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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 2
All ❌✅ (primary) - - 0

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: 657.324s -> 659.399s (0.32%)

detly added a commit to detly/backtrace-rs that referenced this pull request Jul 10, 2023
detly added a commit to detly/backtrace-rs that referenced this pull request Jul 10, 2023
workingjubilee pushed a commit to rust-lang/backtrace-rs that referenced this pull request Jul 17, 2023
… (rust-lang/backtrace#550)

This is now done by the bootstrapping process. See rust-lang/rust#113341.
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.

Copy stage0 binaries into stage0-sysroot
5 participants