Skip to content

Split codegen backend check step into two and don't run it with x check compiler#145340

Merged
bors merged 1 commit intorust-lang:masterfrom
Kobzol:bootstrap-codegen-backend-check-split
Aug 15, 2025
Merged

Split codegen backend check step into two and don't run it with x check compiler#145340
bors merged 1 commit intorust-lang:masterfrom
Kobzol:bootstrap-codegen-backend-check-split

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Aug 13, 2025

This reduces the amount of work that is done during x check compiler. We still check both backends during x check by defaut, even if they are not in rust.codegen-backends, as just checking them shouldn't require expensive preparations, like building GCC.

r? @jieyouxu

@rustbot
Copy link
Collaborator

rustbot commented Aug 13, 2025

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

@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 13, 2025
jieyouxu
jieyouxu approved these changes Aug 13, 2025
View reviewed changes
Copy link
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 it always felt a bit strange when ./x check compiler checks cg backends 👍

src/bootstrap/src/core/build_steps/check.rs Outdated
impl Step for GccCodegenBackend {
type Output = ();

const ONLY_HOSTS: bool = true;
Copy link
Member

@jieyouxu jieyouxu Aug 13, 2025

Choose a reason for hiding this comment

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

Remark: will conflict with #145324

@jieyouxu
Copy link
Member

jieyouxu commented Aug 13, 2025

You can r=me after #145324 merges with a rebase (and rename to IS_HOST).

@rustbot author

@rustbot rustbot 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 Aug 13, 2025
@jieyouxu jieyouxu mentioned this pull request Aug 13, 2025
Merged
@bors
Copy link
Collaborator

bors commented Aug 14, 2025

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

@Kobzol Kobzol force-pushed the bootstrap-codegen-backend-check-split branch from 819462e to 2a2903c Compare August 15, 2025 06:19
@Kobzol
Copy link
Member Author

Kobzol commented Aug 15, 2025

Rebased.

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Aug 15, 2025

📌 Commit 2a2903c has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 15, 2025
@Kobzol Kobzol mentioned this pull request Aug 15, 2025
Merged
bors added a commit that referenced this pull request Aug 15, 2025
@bors
Auto merge of #145450 - Kobzol:rollup-cqclix0, r=Kobzol
8b1889c 
Rollup of 11 pull requests

Successful merges:

 - #144210 (std: thread: Return error if setting thread stack size fails)
 - #145310 (Reduce usage of `compiler_for` in bootstrap)
 - #145311 (ci: clean windows disk space in background)
 - #145340 (Split codegen backend check step into two and don't run it with `x check compiler`)
 - #145408 (Deduplicate -L search paths)
 - #145412 (Windows: Replace `GetThreadId`+`GetCurrentThread` with `GetCurrentThreadId`)
 - #145413 (bootstrap: Reduce dependencies)
 - #145426 (Fix typos in bootstrap.example.toml)
 - #145430 (Fix wrong spans with external macros in the `dropping_copy_types` lint)
 - #145431 (Enhance UI test output handling for runtime errors)
 - #145448 (Autolabel `src/tools/{rustfmt,rust-analyzer}` changes with `T-{rustfmt,rust-analyzer}`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0734cbd into rust-lang:master Aug 15, 2025
10 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 15, 2025
rust-timer added a commit that referenced this pull request Aug 15, 2025
@rust-timer
Unrolled build for #145340
6ba1784 
Rollup merge of #145340 - Kobzol:bootstrap-codegen-backend-check-split, r=jieyouxu

Split codegen backend check step into two and don't run it with `x check compiler`

This reduces the amount of work that is done during `x check compiler`. We still check both backends during `x check` by defaut, even if they are not in `rust.codegen-backends`, as just checking them shouldn't require expensive preparations, like building GCC.

r? `@jieyouxu`
@Kobzol Kobzol deleted the bootstrap-codegen-backend-check-split branch August 15, 2025 19:02
@Kobzol
Copy link
Member Author

Kobzol commented Aug 15, 2025

Hmm, I seem to have removed all Clippy snapshot tests during the latest rebase or something, lol. I'll readd them in the next PR.

@Kobzol Kobzol mentioned this pull request Aug 15, 2025
Merged
@github-actions github-actions bot mentioned this pull request Aug 18, 2025
Merged
bors added a commit that referenced this pull request Aug 22, 2025
@bors
Auto merge of #145472 - Kobzol:bootstrap-dist, r=jieyouxu
c8c0119 
Enforce in bootstrap that dist and install must have stage at least 1

This is a continuation of my efforts to fix staging in bootstrap after the stage0 redesign. This PR gets rid of all `compiler_for` usages in the `dist` steps 🎉 The only remaining usages are in the `test` steps, which are my next goal, and which will be the final boss.. both because they are quite tricky, and because most of the the rest of the steps have been already fixed.

The changes are relatively straightforward, `x dist` defaults to stage 2, so in that case we want to use a stage 1 build compiler for everything (except stdlib, but we usually use it even there because of uplifting).

What I didn't fix yet are the docs steps, because they are *very* implicit right now, and fixing them deserves its own PR.

The first commit reverts the tests that I accidentally removed in #145340 🤦‍♂️ I did it in this PR to avoid further git conflicts..

Best reviewed commit-by-commit.

r? `@jieyouxu`

try-job: dist-i686-linux
try-job: dist-armhf-linux
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-x86_64-apple
bors added a commit that referenced this pull request Aug 25, 2025
@bors
Auto merge of #145472 - Kobzol:bootstrap-dist, r=jieyouxu
54c5812 
Enforce in bootstrap that dist and install must have stage at least 1

This is a continuation of my efforts to fix staging in bootstrap after the stage0 redesign. This PR gets rid of all `compiler_for` usages in the `dist` steps 🎉 The only remaining usages are in the `test` steps, which are my next goal, and which will be the final boss.. both because they are quite tricky, and because most of the the rest of the steps have been already fixed.

The changes are relatively straightforward, `x dist` defaults to stage 2, so in that case we want to use a stage 1 build compiler for everything (except stdlib, but we usually use it even there because of uplifting).

What I didn't fix yet are the docs steps, because they are *very* implicit right now, and fixing them deserves its own PR.

The first commit reverts the tests that I accidentally removed in #145340 🤦‍♂️ I did it in this PR to avoid further git conflicts..

Best reviewed commit-by-commit.

r? `@jieyouxu`

try-job: dist-i686-linux
try-job: dist-armhf-linux
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-x86_64-apple
try-job: x86_64-msvc-2
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Aug 27, 2025
@bors
Auto merge of #145472 - Kobzol:bootstrap-dist, r=jieyouxu
bf2e306 
Enforce in bootstrap that dist and install must have stage at least 1

This is a continuation of my efforts to fix staging in bootstrap after the stage0 redesign. This PR gets rid of all `compiler_for` usages in the `dist` steps 🎉 The only remaining usages are in the `test` steps, which are my next goal, and which will be the final boss.. both because they are quite tricky, and because most of the the rest of the steps have been already fixed.

The changes are relatively straightforward, `x dist` defaults to stage 2, so in that case we want to use a stage 1 build compiler for everything (except stdlib, but we usually use it even there because of uplifting).

What I didn't fix yet are the docs steps, because they are *very* implicit right now, and fixing them deserves its own PR.

The first commit reverts the tests that I accidentally removed in rust-lang/rust#145340 🤦‍♂️ I did it in this PR to avoid further git conflicts..

Best reviewed commit-by-commit.

r? `@jieyouxu`

try-job: dist-i686-linux
try-job: dist-armhf-linux
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-x86_64-apple
try-job: x86_64-msvc-2
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Sep 8, 2025
@bors
Auto merge of #145472 - Kobzol:bootstrap-dist, r=jieyouxu
33c1775 
Enforce in bootstrap that dist and install must have stage at least 1

This is a continuation of my efforts to fix staging in bootstrap after the stage0 redesign. This PR gets rid of all `compiler_for` usages in the `dist` steps 🎉 The only remaining usages are in the `test` steps, which are my next goal, and which will be the final boss.. both because they are quite tricky, and because most of the the rest of the steps have been already fixed.

The changes are relatively straightforward, `x dist` defaults to stage 2, so in that case we want to use a stage 1 build compiler for everything (except stdlib, but we usually use it even there because of uplifting).

What I didn't fix yet are the docs steps, because they are *very* implicit right now, and fixing them deserves its own PR.

The first commit reverts the tests that I accidentally removed in rust-lang/rust#145340 🤦‍♂️ I did it in this PR to avoid further git conflicts..

Best reviewed commit-by-commit.

r? `@jieyouxu`

try-job: dist-i686-linux
try-job: dist-armhf-linux
try-job: dist-x86_64-linux
try-job: dist-x86_64-msvc
try-job: dist-apple-various
try-job: dist-x86_64-apple
try-job: x86_64-msvc-2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

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

Milestone

1.91.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Kobzol @rustbot @jieyouxu @bors