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.

Sign up for GitHub

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

Jump to bottom

redesign stage 0 std #119899

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

redesign stage 0 std #119899

wants to merge 8 commits into from
+73 −39

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Jan 12, 2024 •
edited

This is intended to update bootstrap to use the beta standard library on stage 0, rather than compiling it from source (see the motivation at rust-lang/compiler-team#619).

The only drawback encountered was the requirement of using the stage 1 compiler to build the standard library from source. This issue has been resolved by adding the --build-std-on-stage0 flag. Therefore if the goal is to only build/test the compiled standard library without spending time on compiling rustc, it can be achieved by running x build --stage 0 std --build-std-on-stage0.

@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 Jan 12, 2024
@onur-ozkan onur-ozkan 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jan 13, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan force-pushed the redesign-stage0-std branch 2 times, most recently from ce81474 to b688ffa Compare January 13, 2024 15:51
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan force-pushed the redesign-stage0-std branch 6 times, most recently from 5f1747d to 00e59f0 Compare January 14, 2024 13:30
@onur-ozkan onur-ozkan marked this pull request as ready for review January 14, 2024 13:57
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@onur-ozkan onur-ozkan changed the title [WIP] redesign stage 0 std redesign stage 0 std Jan 14, 2024
@onur-ozkan
Copy link
Member Author

@rustbot ready

r? bootstrap
cc @rust-lang/libs

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2024
@onur-ozkan
Copy link
Member Author

@rustbot author (currently stage 2 std is copied from stage 1 and this behaviour should change with the beta std change)

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 14, 2024
@onur-ozkan onur-ozkan force-pushed the redesign-stage0-std branch 3 times, most recently from 358f7ee to f24855b Compare January 29, 2024 19:03
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 9, 2024

☔ The latest upstream changes (presumably #120676) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Mar 16, 2024

☔ The latest upstream changes (presumably #122602) made this pull request unmergeable. Please resolve the merge conflicts.

onur-ozkan and others added 8 commits March 17, 2024 12:23
@onur-ozkan
use initial rustc's std on stage 0
cc416c5 
On stage 0, rather than compiling std utilize the version from the initial
rustc. Theoretically, stage 0 should represent the snapshot version not the
compiled one. This makes bootstrapping quicker as well.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
use stage 1 on CI
5589e8d 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
remove cfg bootstrap logic on libstd
be05f4f 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@jyn514 @onur-ozkan
force recompile on x build std
94ab6dd
@jyn514 @onur-ozkan
set download-rustc = "if-unchanged" by default for all dev profiles
4e89ea4 
including compiler/codegen, per https://rust-lang.zulipchat.com/#narrow/stream/233931-t-compiler.2Fmajor-changes/topic/Redesign.20bootstrap.20stages.20compiler-team.23619/near/352259098
@onur-ozkan
do not allow x check --stage 0 for std
78395a4 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
update std uplifting algorithm
0966074 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
fix various errors
f884dec 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan mentioned this pull request Mar 18, 2024
Open
@onur-ozkan onur-ozkan added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 18, 2024
@bors
Copy link
Contributor

bors commented Mar 20, 2024

☔ The latest upstream changes (presumably #122754) made this pull request unmergeable. Please resolve the merge conflicts.

@onur-ozkan onur-ozkan force-pushed the redesign-stage0-std branch 2 times, most recently from 7a8706a to f884dec Compare April 1, 2024 13:47
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 4, 2024
@bors
Auto merge of rust-lang#122709 - onur-ozkan:use-precompiled-rustc-by-…
9ec5616 
…default, r=<try>

prefer precompiled rustc for x86_64-gnu

*-to be filled-*

blocker for rust-lang#119899
r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 4, 2024
@bors
Auto merge of rust-lang#122709 - onur-ozkan:use-precompiled-rustc-by-…
3a8cf09 
…default, r=<try>

prefer precompiled rustc for x86_64-gnu

*-to be filled-*

blocker for rust-lang#119899
r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 4, 2024
@bors
Auto merge of rust-lang#122709 - onur-ozkan:use-precompiled-rustc-by-…
9bcb703 
…default, r=<try>

prefer precompiled rustc for x86_64-gnu

*-to be filled-*

blocker for rust-lang#119899
r? ghost
@Dylan-DPC
Copy link
Member

@onur-ozkan any updates on this? thanks

@onur-ozkan
Copy link
Member Author

@onur-ozkan any updates on this? thanks

Blocked by #122709

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

@Kobzol Kobzol Kobzol left review comments

@albertlarsan68 albertlarsan68 albertlarsan68 approved these changes

Assignees

@albertlarsan68 albertlarsan68

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@onur-ozkan @rust-log-analyzer @rustbot @bors @albertlarsan68 @m-ou-se @fmease @Dylan-DPC @Kobzol @jyn514