Skip to content

Rollup of 19 pull requests #145043

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 57 commits into from
Aug 7, 2025
Merged

Rollup of 19 pull requests #145043

merged 57 commits into from
Aug 7, 2025

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Aug 7, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jogru0 and others added 30 commits April 24, 2025 21:14
Add target features for sm_* and ptx*, both of which form a partial
order, but cannot be combined to a single partial order. These mirror
the LLVM target features, but we do not provide LLVM target
processors (which imply both an sm_* and ptx* feature).

Add some documentation for the nvptx target.
Normally LLVM and rustc agree about what features are implied by
target-cpu, but for NVPTX, LLVM considers sm_* and ptx* features to be
exclusive, which makes sense for codegen purposes. But in Rust, we want
to think of them as:

  sm_{sver} means that the target supports the hardware features of sver

  ptx{pver} means the driver supports PTX ISA pver

Intrinsics usually require a minimum sm_{sver} and ptx{pver}.

Prior to this commit, -Ctarget-cpu=sm_70 would activate only sm_70 and
ptx60 (the minimum PTX version that supports sm_70, which maximizes
driver compatibility). With this commit, it also activates all the
implied target features (sm_20, ..., sm_62; ptx32, ..., ptx50).
This is already warn-by-default, and a future compatibility warning
(FCW) that warns in dependencies. Upgrade it to deny-by-default, as the
next step towards hard error.
We noticed when building rustc multiple time in a roll, some files
will not be consistent across the build despite the fact that they
are built from same source under the same environment. This patch
addresses the inconsistency issue we found on libunwind.a by sorting
the order of the files passed to the linker.
The `--enable-offload` and `--enable--enzyme` arguments don't seem to work.

Changing them to `--enable-llvm-offload` and `--enable-llvm-enzyme` resulted in the `boostrap.toml` file generating succesfully.
Make suggestions to remove params and super traits tool-only, and make
the suggestion span more accurate.

```
error[E0567]: auto traits cannot have generic parameters
  --> $DIR/auto-trait-validation.rs:6:19
   |
LL | auto trait Generic<T> {}
   |            -------^^^
   |            |
   |            auto trait cannot have generic parameters

error[E0568]: auto traits cannot have super traits or lifetime bounds
  --> $DIR/auto-trait-validation.rs:8:20
   |
LL | auto trait Bound : Copy {}
   |            -----   ^^^^
   |            |
   |            auto traits cannot have super traits or lifetime bounds
```

```
error[E0380]: auto traits cannot have associated items
  --> $DIR/issue-23080.rs:5:8
   |
LL | unsafe auto trait Trait {
   |                   ----- auto traits cannot have associated items
LL |     fn method(&self) {
   |        ^^^^^^
```
Add instructions to test wasi (wasm32-wasip1) specific tests
There's already a link in the other direction, so this seems fairly logical.
This avoids scheduling drops and immediately unscheduling them. Drops
for guard bindings/temporaries are still scheduled and unscheduled as
before.
@rustbot rustbot added F-explicit_tail_calls `#![feature(explicit_tail_calls)]` 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 7, 2025
@Zalathar
Copy link
Contributor Author

Zalathar commented Aug 7, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 7, 2025

📌 Commit bd8e7fd has been approved by Zalathar

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 Aug 7, 2025
@Zalathar
Copy link
Contributor Author

Zalathar commented Aug 7, 2025

Once again pre-running some jobs that have failed a lot recently:

@bors try jobs=test-various,dist-ohos-x86_64

@rust-bors
Copy link

rust-bors bot commented Aug 7, 2025

⌛ Trying commit bd8e7fd with merge 9911024

To cancel the try build, run the command @bors try cancel.

rust-bors bot added a commit that referenced this pull request Aug 7, 2025
Rollup of 19 pull requests

try-job: test-various
try-job: dist-ohos-x86_64
@rust-bors
Copy link

rust-bors bot commented Aug 7, 2025

☀️ Try build successful (CI)
Build commit: 9911024 (9911024e95777865cf5275df1271dddfd2289621, parent: 61cb1e97fcf954c37d0a457a8084ed9ad8b3cb82)

@bors
Copy link
Collaborator

bors commented Aug 7, 2025

⌛ Testing commit bd8e7fd with merge 321a89b...

@bors
Copy link
Collaborator

bors commented Aug 7, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 321a89b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 7, 2025
@bors bors merged commit 321a89b into rust-lang:master Aug 7, 2025
12 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 7, 2025
Copy link
Contributor

github-actions bot commented Aug 7, 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 cd43430 (parent) -> 321a89b (this PR)

Test differences

Show 3126 test diffs

Stage 1

  • [crashes] tests/crashes/144293-indirect-ops-llvm.rs: [missing] -> pass (J1)
  • [ui] tests/ui/explicit-tail-calls/drop-order.rs: ignore (ignored always (tail calls are not implemented in rustc_codegen_ssa yet, so this causes 🧊)) -> pass (J1)
  • [ui] tests/ui/explicit-tail-calls/indexer.rs: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/implied-features-nvptx.rs: [missing] -> ignore (only executed when the architecture is nvptx64) (J1)
  • ops::control_flow::control_flow_break_ok: [missing] -> pass (J3)
  • ops::control_flow::control_flow_continue_ok: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/explicit-tail-calls/drop-order.rs: ignore (ignored always (tail calls are not implemented in rustc_codegen_ssa yet, so this causes 🧊)) -> pass (J0)
  • [ui] tests/ui/explicit-tail-calls/indexer.rs: [missing] -> pass (J0)
  • [ui] tests/ui/target-feature/implied-features-nvptx.rs: [missing] -> ignore (only executed when the architecture is nvptx64) (J0)
  • [crashes] tests/crashes/144293-indirect-ops-llvm.rs: [missing] -> pass (J2)

Additionally, 3116 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 321a89bec57b8ca723d1af8f784490b950458c6a --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. dist-aarch64-apple: 5300.9s -> 7501.2s (41.5%)
  2. aarch64-apple: 6433.3s -> 7877.4s (22.4%)
  3. dist-x86_64-apple: 9551.4s -> 11646.9s (21.9%)
  4. x86_64-apple-2: 5836.1s -> 6663.7s (14.2%)
  5. dist-riscv64-linux: 4837.5s -> 5279.0s (9.1%)
  6. dist-ohos-armv7: 4039.8s -> 4390.2s (8.7%)
  7. dist-ohos-aarch64: 4238.6s -> 4592.2s (8.3%)
  8. dist-loongarch64-musl: 5154.1s -> 5580.8s (8.3%)
  9. dist-arm-linux-gnueabi: 4916.2s -> 5314.4s (8.1%)
  10. x86_64-msvc-ext2: 5814.5s -> 6243.4s (7.4%)
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.

@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137831 Tweak auto trait errors 19620553800ec57e937ea21fbc556494a5b35c53 (link)
#138689 add nvptx_target_feature 164bb7838f69effd8a28373bf277a816ee2755c9 (link)
#140267 implement continue_ok and break_ok for ControlFlow c02fcb83f61bf0e7418a5a6a5b4e51fa7e9ecf2e (link)
#143028 emit StorageLive and schedule StorageDead for let-`el… f9040d6590f5bea4efdc614a42bd3fc93b9bb917 (link)
#143764 lower pattern bindings in the order they're written and bas… 30ac6b4cf0c53d3789e789252628fe621e39ce40 (link)
#143808 Port #[should_panic] to the new attribute parsing infrast… d2f7fc0b8f0c4920d899e7c6e18a9c01a0af4767 (link)
#143906 Miri: non-deterministic floating point operations in `forei… db1866394568e90c087d720679a8e198f39b9eb0 (link)
#143929 Mark all deprecation lints in name resolution as deny-by-de… c5a051b25975e314ef5b0891cf7731c02ffccfa7 (link)
#144133 Stabilize const TypeId::of 381e87720d345c454c3af58fe24cd3fdd9253e51 (link)
#144369 Upgrade semicolon_in_expressions_from_macros from warn to d… 77a0c55ab809ade37e0910a52289043424e17de7 (link)
#144439 Introduce ModernIdent type to unify macro 2.0 hygiene handl… b5d3bba45381e25a0f40ddd1338f5b8fc3691220 (link)
#144473 Address libunwind.a inconsistency issues in the bootstrap p… 877d53ba3da2f4424ef55c11249278419d66797b (link)
#144601 Allow cargo fix to partially apply `mismatched_lifetime_s… e463f764d9edb5737f71a1273a5577fac32e110a (link)
#144650 Additional tce tests 002324ca8935e9a5af020cda4408f45558111c4f (link)
#144659 bootstrap: refactor mingw dist and fix gnullvm 7e4afe7ef7567acd05d1e074f97b115fe056788d (link)
#144682 Stabilize strict_overflow_ops 6dceffe4d2274c08af3d3c45adc8eed3c04b0edb (link)
#145026 Update books cb16d0130cbced0eed44d38c075dda3c73a32c03 (link)
#145033 Reimplement print_region in type_name.rs. 9a588049737fd14e1730b2e9ef67f1c8a613ce35 (link)
#145040 rustc-dev-guide subtree update fc1468152e703c35ad8215a26ac505e784b8c0e3 (link)

previous master: cd434309ef

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (321a89b): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.4% [0.2%, 0.5%] 4
Regressions ❌
(secondary)
0.3% [0.1%, 0.5%] 8
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 2
All ❌✅ (primary) 0.4% [0.2%, 0.5%] 4

Max RSS (memory usage)

Results (primary -1.3%, secondary 1.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.2% [0.5%, 2.0%] 2
Regressions ❌
(secondary)
3.1% [1.6%, 5.9%] 11
Improvements ✅
(primary)
-2.6% [-4.8%, -1.6%] 4
Improvements ✅
(secondary)
-2.1% [-3.3%, -0.8%] 6
All ❌✅ (primary) -1.3% [-4.8%, 2.0%] 6

Cycles

Results (secondary -1.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
5.3% [2.1%, 7.0%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.1% [-5.5%, -2.2%] 10
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Bootstrap: 465.283s -> 464.69s (-0.13%)
Artifact size: 377.41 MiB -> 377.37 MiB (-0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Aug 7, 2025
@Zalathar Zalathar deleted the rollup-3dbvdrm branch August 8, 2025 01:14
@Zalathar
Copy link
Contributor Author

Zalathar commented Aug 8, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide F-explicit_tail_calls `#![feature(explicit_tail_calls)]` merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.