Skip to content

Consolidate staging for compiletest steps in bootstrap #146076

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
Merged
merged 7 commits into from
Sep 2, 2025
Merged

Consolidate staging for compiletest steps in bootstrap #146076

merged 7 commits into from
Sep 2, 2025

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Sep 1, 2025

This PR finishes the initial pass of refactorings that fixed up staging of various bootstrap steps after the stage0 redesign. Now the real refactorings can begin =D

It fixes the unnecessary stage2 build of cargo for run-make tests (https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/run-make.20cargo.20staging/with/536662651), and also consolidates staging of messages printed by bootstrap for test steps (Testing stageN... etc.).

r? @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Sep 1, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@practicalrs
Copy link
Contributor

@Kobzol

Is there any RFC or blog post that describes the intended changes and goals of the whole refactoring?

@Kobzol
Copy link
Member Author

Kobzol commented Sep 1, 2025 •
edited
Loading

Essentially this: https://blog.rust-lang.org/inside-rust/2025/05/29/redesigning-the-initial-bootstrap-sequence/. This landed ~3 months ago, and since then I'm trying to fix various bugs and issues around it.

@Kobzol Kobzol force-pushed the bootstrap-compiletest branch from e5a53f2 to cc625c6 Compare September 1, 2025 09:29
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol force-pushed the bootstrap-compiletest branch from cc625c6 to 66d0607 Compare September 1, 2025 11:08
jieyouxu
jieyouxu approved these changes Sep 1, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

Thanks, r=me with two comment nits

View changes since this review

@Kobzol Kobzol force-pushed the bootstrap-compiletest branch from 66d0607 to 6f5fc69 Compare September 1, 2025 12:30
@Kobzol
Copy link
Member Author

Kobzol commented Sep 1, 2025

@bors r=jieyouxu rollup=never

@bors
Copy link
Collaborator

bors commented Sep 1, 2025

📌 Commit 6f5fc69 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2025
@bors
Copy link
Collaborator

bors commented Sep 1, 2025

⌛ Testing commit 6f5fc69 with merge a56e02f...

bors added a commit that referenced this pull request Sep 1, 2025
@bors
Auto merge of #146076 - Kobzol:bootstrap-compiletest, r=jieyouxu
a56e02f 
Consolidate staging for compiletest steps in bootstrap

This PR finishes the initial pass of refactorings that fixed up staging of various bootstrap steps after the stage0 redesign. Now the *real* refactorings can begin =D

It fixes the unnecessary stage2 build of cargo for run-make tests (https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/run-make.20cargo.20staging/with/536662651), and also consolidates staging of messages printed by bootstrap for test steps (`Testing stageN...` etc.).

r? `@jieyouxu`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

jieyouxu commented Sep 1, 2025

Oh right, ui-fulldeps...

@bors
Copy link
Collaborator

bors commented Sep 1, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 1, 2025
@Kobzol
Copy link
Member Author

Kobzol commented Sep 1, 2025

Hmm, I tested this before, maybe it regressed.

@Kobzol
Copy link
Member Author

Kobzol commented Sep 1, 2025

@bors try jobs=x86_64-gnu-llvm-20-1,x86_64-gnu-llvm-20-2,x86_64-gnu-llvm-20-3

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Sep 1, 2025
@rust-bors
Auto merge of #146076 - Kobzol:bootstrap-compiletest, r=<try>
10cce20 
Consolidate staging for compiletest steps in bootstrap

try-job: x86_64-gnu-llvm-20-1
try-job: x86_64-gnu-llvm-20-2
try-job: x86_64-gnu-llvm-20-3
@rust-bors
Copy link

rust-bors bot commented Sep 1, 2025

☀️ Try build successful (CI)
Build commit: 10cce20 (10cce209c36a13e8b4e6d62b92bacd5adccb52bd, parent: c0bb3b98bb7aac24a37635e5d36d961e0b14f435)

@Kobzol
Copy link
Member Author

Kobzol commented Sep 1, 2025

@bors r=jieyouxu

Ok that was a silly bug, I shouldn't have replaced that if condition :)

@bors
Copy link
Collaborator

bors commented Sep 1, 2025

📌 Commit af627f5 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2025
@bors
Copy link
Collaborator

bors commented Sep 2, 2025

⌛ Testing commit af627f5 with merge 51ff895...

@bors
Copy link
Collaborator

bors commented Sep 2, 2025

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 51ff895 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 2, 2025
@bors bors merged commit 51ff895 into rust-lang:master Sep 2, 2025
12 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Sep 2, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 2, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 94722ca (parent) -> 51ff895 (this PR)

Test differences

Show 5 test diffs

Stage 0

  • core::builder::tests::snapshot::test_compiletest_suites_stage1: [missing] -> pass (J0)
  • core::builder::tests::snapshot::test_compiletest_suites_stage2: [missing] -> pass (J0)
  • core::builder::tests::snapshot::test_compiletest_suites_stage2_cross: [missing] -> pass (J0)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 51ff895062ba60a7cba53f57af928c3fb7b0f2f4 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. pr-check-1: 1768.2s -> 1365.6s (-22.8%)
  2. dist-apple-various: 4699.4s -> 3637.7s (-22.6%)
  3. aarch64-gnu-debug: 4819.6s -> 3869.1s (-19.7%)
  4. dist-x86_64-netbsd: 5779.2s -> 4765.1s (-17.5%)
  5. x86_64-gnu-debug: 7840.8s -> 6684.6s (-14.7%)
  6. x86_64-gnu-llvm-19: 2792.0s -> 2382.0s (-14.7%)
  7. i686-gnu-2: 6232.5s -> 5368.7s (-13.9%)
  8. x86_64-gnu-tools: 3935.5s -> 3412.2s (-13.3%)
  9. i686-gnu-nopt-1: 8303.1s -> 7345.3s (-11.5%)
  10. x86_64-gnu-llvm-20-3: 7060.5s -> 6267.9s (-11.2%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

This was referenced Sep 3, 2025
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (51ff895): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

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

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: 464.662s -> 465.874s (0.26%)
Artifact size: 388.26 MiB -> 388.34 MiB (0.02%)

@Kobzol Kobzol deleted the bootstrap-compiletest branch September 3, 2025 05:43
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
A-testsuite Area: The testsuite used to check the correctness of rustc 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
Milestone
1.91.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Kobzol @rust-log-analyzer @practicalrs @bors @jieyouxu @rust-timer @rustbot