Rollup of 5 pull requests #125665

matthiaskrgr · 2024-05-28T16:04:34Z

Successful merges:

NVPTX: Avoid PassMode::Direct for args in C abi #117671 (NVPTX: Avoid PassMode::Direct for args in C abi)
Migrate run-make/allow-warnings-cmdline-stability to rmake.rs #125573 (Migrate run-make/allow-warnings-cmdline-stability to rmake.rs)
Add a "Setup Python" action for github-hosted runners and remove unnecessary CUSTOM_MINGW environment variable #125590 (Add a "Setup Python" action for github-hosted runners and remove unnecessary CUSTOM_MINGW environment variable)
Make ProofTreeBuilder actually generic over Interner #125598 (Make ProofTreeBuilder actually generic over Interner)
rustfmt fixes #125637 (rustfmt fixes)

r? @ghost
@rustbot modify labels: rollup

This comment -- "by default we ignore everything in the repository" -- was added in rust-lang#65939 when rustfmt was first being introduced for this repository and (briefly) every directory was ignored. Since then lots of directories have opted in to formatting, so it is no longer true.

Some are too long, some aren't complete sentences, some are complete sentences but don't bother with an upper case letter at the start. All annoying and hurt readability.

It's reasonable to want to, but in the current implementation this causes multiple problems. - All the `rmake.rs` files are formatted every time even when they haven't changed. This is because they get whitelisted unconditionally in the `OverrideBuilder`, before the changed files get added. - The way `OverrideBuilder` works, if any files gets whitelisted then no unmentioned files will get traversed. This is surprising, and means that the `rmake.rs` entries broke the use of explicit paths to `x fmt`, and also broke `GITHUB_ACTIONS=true git check --fmt`. The commit removes the `rmake.rs` entries, fixes the formatting of a couple of files that were misformatted (not previously caught due to the `GITHUB_ACTIONS` breakage), and bans `!`-prefixed entries in `rustfmt.toml` because they cause all these problems.

…ct, r=davidtwco NVPTX: Avoid PassMode::Direct for args in C abi Fixes rust-lang#117480 I must admit that I'm confused about `PassMode` altogether, is there a good sum-up threads for this anywhere? I'm especially confused about how "indirect" and "byval" goes together. To me it seems like "indirect" basically means "use a indirection through a pointer", while "byval" basically means "do not use indirection through a pointer". The return used to keep `PassMode::Direct` for small aggregates. It turns out that `make_indirect` messes up the tests and one way to fix it is to keep `PassMode::Direct` for all aggregates. I have mostly seen this PassMode mentioned for args. Is it also a problem for returns? When experimenting with `byval` as an alternative i ran into [this assert](https://github.com/rust-lang/rust/blob/61a3eea8043cc1c7a09c2adda884e27ffa8a1172/compiler/rustc_codegen_llvm/src/abi.rs#L463C22-L463C22) I have added tests for the same kind of types that is already tested for the "ptx-kernel" abi. The tests cannot be enabled until something like rust-lang#117458 is completed and merged. CC: ``@RalfJung`` since you seem to be the expert on this and have already helped me out tremendously CC: ``@RDambrosio016`` in case this influence your work on `rustc_codegen_nvvm` ``@rustbot`` label +O-NVPTX

…ngs-cmdline-stability, r=jieyouxu Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs` Part of rust-lang#121876. r? ``@jieyouxu``

Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable The Setup Python action isn't strictly necessary ([even on Windows](rust-lang#125584)) but it is [recommend by GitHub](https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#specifying-a-python-version). The `CUSTOM_MINGW` environment variable is redundant now as it's always set for mingw and always unset otherwise. try-job: x86_64-mingw try-job: x86_64-mingw try-job: dist-x86_64-msvc try-job: dist-x86_64-mingw

…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

…aumeGomez rustfmt fixes The `rmake.rs` entries in `rustfmt.toml` are causing major problems for `x fmt`. This PR removes them and does some minor related cleanups. r? ``@GuillaumeGomez``

matthiaskrgr · 2024-05-28T16:04:50Z

@bors r+ rollup=never=5

bors · 2024-05-28T16:04:53Z

📌 Commit faabc74 has been approved by matthiaskrgr

It is now in the queue for this repository.

matthiaskrgr · 2024-05-28T17:15:42Z

@bors r+ rollup=never p=5

bors · 2024-05-28T17:15:44Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Omit non-needs_drop drop_in_place in vtables #122662

bors · 2024-05-28T17:15:45Z

📌 Commit faabc74 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-05-28T18:21:28Z

⌛ Testing commit faabc74 with merge 274499d...

bors · 2024-05-28T20:29:57Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 274499d to master...

rust-timer · 2024-05-28T20:31:23Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117671	NVPTX: Avoid PassMode::Direct for args in C abi	`2e5a135209ab2b808ce0028b3c31557508aefcae` (link)
#125573	Migrate `run-make/allow-warnings-cmdline-stability` to `rma…	`bc4f3d2252f7a9f7186bd560858f155b30fdbbec` (link)
#125590	Add a "Setup Python" action for github-hosted runners and r…	`4e91a288443016117dd680d93ef811c7a9ca9cc6` (link)
#125598	Make `ProofTreeBuilder` actually generic over `Interner`	`f2d4586fc12e6b275d8196717495bd7e3bd63960` (link)
#125637	rustfmt fixes	`d465eaa0eedf8d7be4907976de28f8a78037caa9` (link)

previous master: 8c4db851a7

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 · 2024-05-28T23:41:33Z

Finished benchmarking commit (274499d): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	0.4%	[0.2%, 0.5%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

Max RSS (memory usage)

Results (primary -2.0%)

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)	-2.0%	[-2.2%, -1.8%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.0%	[-2.2%, -1.8%]	2

Cycles

Results (secondary 2.7%)

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.7%	[2.2%, 3.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 668.572s -> 668.568s (-0.00%)
Artifact size: 318.08 MiB -> 318.11 MiB (0.01%)

pnkfelix · 2024-06-03T18:36:16Z

visiting for weekly rustc-perf triage

helloworld is sole primary regression.
marking as triaged (my own opinion is that helloworld is a useful canary when it regresses by a more significant amount than this)

(also the 30-day history shows the story for helloworld to be quite a bit more complicated than what is presented by the effects of this single PR, there are lots of spikes mixed in there)

@rustbot label: +perf-regression-triaged

Kjetil Kjeka and others added 16 commits May 10, 2024 18:39

NVPTX: Avoid PassMode::Direct for args in C abi

ead02ba

Cleanup custom mingw in CI

f63931b

Add "Setup Python" action to github-hosted runners

19cfe8d

Update description of install-mingw

f931290

Add assert_not_contains to run-make-support library

5673337

Migrate run-make/allow-warnings-cmdline-stability to rmake.rs

404d47e

Fix comments.

4702a1c

Some are too long, some aren't complete sentences, some are complete sentences but don't bother with an upper case letter at the start. All annoying and hurt readability.

EvalCtxt::tcx() -> EvalCtxt::interner()

50a5da1

Make ProofTreeBuilder actually generic over interner

f494036

Rollup merge of rust-lang#125573 - GuillaumeGomez:migrate-allow-warni…

78b4caf

…ngs-cmdline-stability, r=jieyouxu Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs` Part of rust-lang#121876. r? ``@jieyouxu``

Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…

de2bf36

…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr

Rollup merge of rust-lang#125637 - nnethercote:rustfmt-fixes, r=Guill…

faabc74

…aumeGomez rustfmt fixes The `rmake.rs` entries in `rustfmt.toml` are causing major problems for `x fmt`. This PR removes them and does some minor related cleanups. r? ``@GuillaumeGomez``

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 May 28, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label May 28, 2024

bors merged commit 274499d into rust-lang:master May 28, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 28, 2024

This was referenced May 28, 2024

add a normalizes-to fast path #125334

Open

Implement needs_async_drop in rustc and optimize async drop glue #124662

Merged

Increase vtable layout size #123572

Merged

rustbot added the perf-regression Performance regression. label May 28, 2024

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #125665

Rollup of 5 pull requests #125665

matthiaskrgr commented May 28, 2024

matthiaskrgr commented May 28, 2024

bors commented May 28, 2024

matthiaskrgr commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

rust-timer commented May 28, 2024

rust-timer commented May 28, 2024

pnkfelix commented Jun 3, 2024

Rollup of 5 pull requests #125665

Rollup of 5 pull requests #125665

Conversation

matthiaskrgr commented May 28, 2024

matthiaskrgr commented May 28, 2024

bors commented May 28, 2024

matthiaskrgr commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

bors commented May 28, 2024

rust-timer commented May 28, 2024

rust-timer commented May 28, 2024

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

pnkfelix commented Jun 3, 2024