Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 3, 2023

This was changed from stage 0 to 1 in #108905, but I'm not sure why. Change it to top_stage instead to allow people to choose the stage.

This should save quite a bit of time in the mingw-check builder, which explicitly runs x test --stage 0 compiletest.

Note that this also fixes a latent bug that depended on running x build compiler before x doc compiler, as well as a couple cleanups related to symlinks (which made the latent bug easier to find).

cc @pietroalbini

This was changed from stage 0 to 1 in rust-lang#108905, but I'm not
sure why. Change it to `top_stage` instead to allow people to choose the stage.

This should save quite a bit of time in the `mingw-check` builder, which explicitly runs `x test --stage 0 compiletest`.
@rustbot
Copy link
Collaborator

rustbot commented Jun 3, 2023

r? @Mark-Simulacrum

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

@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 Jun 3, 2023
@rust-log-analyzer

This comment has been minimized.

jyn514 added 3 commits June 3, 2023 14:31
this is consistent with std and makes it much easier to understand what's actually happening
this gives a more helpful backtrace if it fails

before:
```
  thread 'main' panicked at 'symlink_dir_force(&builder.config, &out, &out_dir) failed with No such file or directory (os error 2)', doc.rs:697:9
```

after:
```
thread 'main' panicked at 'symlink_dir(config, original, link) failed with No such file or directory (os error 2) ("failed to create link from /home/jyn/src/rust2/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/doc -> /home/jyn/src/rust2/build/x86_64-unknown-linux-gnu/compiler-doc")', doc.rs:975:5
```
@pietroalbini
Copy link
Member

...not sure why I did that, but maybe it was because I needed the new --print=all-target-specs-json during tests? What happens if you revert it to zero?

@jyn514
Copy link
Member Author

jyn514 commented Jun 9, 2023

it works fine - this is the stage compiletest is built with, which has no relation to the compiler under test.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Jun 10, 2023

📌 Commit d613134 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 Jun 10, 2023
@bors
Copy link
Collaborator

bors commented Jun 10, 2023

⌛ Testing commit d613134 with merge b8a5001...

@bors
Copy link
Collaborator

bors commented Jun 11, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 11, 2023
@bors bors merged commit b8a5001 into rust-lang:master Jun 11, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b8a5001): 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.1% [-2.1%, -2.1%] 1
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: 649.872s -> 649.051s (-0.13%)

@jyn514 jyn514 deleted the faster-mingw-check branch June 11, 2023 02:31
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.

7 participants