Skip to content

bootstrap: flip compile::Rustc vs compile::Assemble #135023

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
Jan 2, 2025

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Jan 2, 2025

The PathSet prefix matching unfortunately also has implications for ./x build compiler --stage 0, because the path filter "compiler" gets consumed by compile::Rustc step first after PathSet prefix matching, whereas before PathSet prefix matching, compile::Rustc would not have consumed "compiler".

This merely papers over #134970 to unblock contributors from using ./x build compiler --stage 0.

The PathSet prefix matching behavior is tracked in #135022.

Closes #134970.

The PathSet prefix matching unfortunately also has implications for `./x
build compiler`, because the path filter `"compiler"` gets consumed by
`compile::Rustc` step first after PathSet prefix matching, whereas
before PathSet prefix matching, the later-registered `compile::Assemble`
step would've consumed the `"compiler"` path filter.

This merely papers over the issue with PathSet prefix handling to
unblock contributors for using `./x build compiler`.
@rustbot
Copy link
Collaborator

rustbot commented Jan 2, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 2, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 2, 2025

r? @onur-ozkan (you likely have more context)

@rustbot rustbot assigned onur-ozkan and unassigned Mark-Simulacrum Jan 2, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 2, 2025

Tested manually by deleting a load-bearing method in rustc_abi and seeing that the compiler indeed does not build, unlike on master currently.

@onur-ozkan
Copy link
Member

feel free to r=me

@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 2, 2025

This wouldn't be observable in CI anyway, so
@bors r=@onur-ozkan rollup

@bors
Copy link
Collaborator

bors commented Jan 2, 2025

📌 Commit 552c1f5 has been approved by onur-ozkan

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 Jan 2, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 2, 2025

@bors p=1 (contributor roadblock, but feel free to include this in a rollup if someone is making one)

@jieyouxu jieyouxu changed the title bootstrap: temporarily flip compile::Rustc vs compile::Assemble bootstrap: flip compile::Rustc vs compile::Assemble Jan 2, 2025
@bors
Copy link
Collaborator

bors commented Jan 2, 2025

⌛ Testing commit 552c1f5 with merge 6ca6659...

@bors
Copy link
Collaborator

bors commented Jan 2, 2025

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 6ca6659 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2025
@bors bors merged commit 6ca6659 into rust-lang:master Jan 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 2, 2025
@jieyouxu jieyouxu deleted the boop branch January 2, 2025 17:07
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6ca6659): 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 (secondary -1.8%)

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

Cycles

Results (secondary 2.1%)

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

Binary size

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

Bootstrap: 763.526s -> 763.315s (-0.03%)
Artifact size: 325.58 MiB -> 325.45 MiB (-0.04%)

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
6 participants