Rollup of 6 pull requests #112877

Noratrieb · 2023-06-21T05:37:04Z

Successful merges:

Implement PartialOrd for Vecs over different allocators #112632 (Implement PartialOrd for Vecs over different allocators)
Make closure_saved_names_of_captured_variables a query. #112759 (Make closure_saved_names_of_captured_variables a query. )
Add a fully fledged Clause type, rename old Clause to ClauseKind #112772 (Add a fully fledged Clause type, rename old Clause to ClauseKind)
Syntactically accept become expressions (explicit tail calls experiment) #112790 (Syntactically accept become expressions (explicit tail calls experiment))
More codegen cleanups #112830 (More codegen cleanups)
Add retag in MIR transform: Adt for Unique may contain a reference #112844 (Add retag in MIR transform: Adt for Unique may contain a reference)

r? @ghost
@rustbot modify labels: rollup

They both match on a `WorkItem`. It's simpler to do it all in one place.

There's no need to store it in `Queries`. We can just use a local variable, because it's always used shortly after it's produced. The commit also removes the `tcx.analysis()` call in `ongoing_codegen`, because it's easy to ensure that's done beforehand. All this makes the dataflow within `run_compiler` easier to follow, at the cost of making one test slightly more verbose, which I think is a good tradeoff.

…olnay Implement PartialOrd for `Vec`s over different allocators It is already possible to `PartialEq` `Vec`s with different allocators, but that is not the case with `PartialOrd`.

Make closure_saved_names_of_captured_variables a query. As we will start removing debuginfo during MIR optimizations, we need to keep them somewhere.

Add a fully fledged `Clause` type, rename old `Clause` to `ClauseKind` Does two basic things before I put up a more delicate set of PRs (along the lines of rust-lang#112714, but hopefully much cleaner) that migrate existing usages of `ty::Predicate` to `ty::Clause` (`predicates_of`/`item_bounds`/`ParamEnv::caller_bounds`). 1. Rename `Clause` to `ClauseKind`, so it's parallel with `PredicateKind`. 2. Add a new `Clause` type which is parallel to `Predicate`. * This type exposes `Clause::kind(self) -> Binder<'tcx, ClauseKind<'tcx>>` which is parallel to `Predicate::kind` 😸 The new `Clause` type essentially acts as a newtype wrapper around `Predicate` that asserts that it is specifically a `PredicateKind::Clause`. Turns out from experimentation[^1] that this is not negative performance-wise, which is wonderful, since this a much simpler design than something that requires encoding the discriminant into the alignment bits of a predicate kind, or something else like that... r? ``@lcnr`` or ``@oli-obk`` [^1]: rust-lang#112714 (comment)

…trieb Syntactically accept `become` expressions (explicit tail calls experiment) This adds `ast::ExprKind::Become`, implements parsing and properly gates the feature. cc `@scottmcm`

… r=oli-obk More codegen cleanups Some additional cleanups I found while looking closely at this code, following up from rust-lang#112827. r= `@oli-obk`

Add retag in MIR transform: `Adt` for `Unique` may contain a reference Following rust-lang#112662 , `may_contain_reference` in `rustc_mir_transform::add_retag` underapproximates too much the types that require retagging. r? ``@RalfJung``

Noratrieb · 2023-06-21T05:37:23Z

@bors r+ rollup=never p=6

bors · 2023-06-21T05:37:26Z

📌 Commit 82e6a16 has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2023-06-21T08:00:27Z

⌛ Testing commit 82e6a16 with merge 97bf23d...

bors · 2023-06-21T10:53:22Z

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing 97bf23d to master...

rust-timer · 2023-06-21T10:55:06Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#112844	4099ef6bc6cb28277ddefa3ec21b0f17a7fd9481
#112830	a9da8883befb892f66e7faf7ecb553b84378645b
#112790	748e77ec03f8b71483e02ac52b1e1434024c74bb
#112772	dad8cbecbcae8b2207db82233331bda53cea712b
#112759	fdc73c5110e9da83a7911436fdcbdc565bd61bdb
#112632	93a4575ddfcc4b8aa1fc7890751849dd4424ffcf

previous master: 67da586efe

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 · 2023-06-21T12:46:28Z

Finished benchmarking commit (97bf23d): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.4%	[0.4%, 0.4%]	4
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	2
Improvements ✅ (primary)	-2.9%	[-2.9%, -2.9%]	1
Improvements ✅ (secondary)	-78.9%	[-78.9%, -78.9%]	1
All ❌✅ (primary)	-0.3%	[-2.9%, 0.4%]	5

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)	1.2%	[0.5%, 2.0%]	20
Regressions ❌ (secondary)	4.5%	[4.5%, 4.5%]	1
Improvements ✅ (primary)	-1.5%	[-2.5%, -0.5%]	2
Improvements ✅ (secondary)	-20.4%	[-20.4%, -20.4%]	1
All ❌✅ (primary)	0.9%	[-2.5%, 2.0%]	22

Cycles

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

Binary size

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.3%	[0.0%, 0.9%]	110
Regressions ❌ (secondary)	0.6%	[0.0%, 1.5%]	49
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.0%, 0.9%]	110

Bootstrap: 657.896s -> 657.151s (-0.11%)

Kobzol · 2023-06-21T12:49:59Z

@rust-timer build a9da8883befb892f66e7faf7ecb553b84378645b

rust-timer · 2023-06-21T14:03:11Z

Finished benchmarking commit (a9da8883befb892f66e7faf7ecb553b84378645b): comparison URL.

Overall result: no relevant changes - no action needed

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)	1.0%	[0.7%, 1.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.3%	[-3.3%, -3.3%]	1
All ❌✅ (primary)	1.0%	[0.7%, 1.3%]	2

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: 657.896s -> 656.742s (-0.18%)

Kobzol · 2023-06-21T14:17:24Z

@rust-timer build fdc73c5110e9da83a7911436fdcbdc565bd61bdb

rust-timer · 2023-06-21T16:32:55Z

Finished benchmarking commit (fdc73c5110e9da83a7911436fdcbdc565bd61bdb): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

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.4%	[0.3%, 0.4%]	5
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	2
Improvements ✅ (primary)	-2.8%	[-2.8%, -2.8%]	1
Improvements ✅ (secondary)	-78.9%	[-78.9%, -78.9%]	1
All ❌✅ (primary)	-0.2%	[-2.8%, 0.4%]	6

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)	1.2%	[0.5%, 1.7%]	20
Regressions ❌ (secondary)	4.5%	[4.5%, 4.5%]	1
Improvements ✅ (primary)	-2.0%	[-3.3%, -0.5%]	3
Improvements ✅ (secondary)	-11.6%	[-20.5%, -2.7%]	2
All ❌✅ (primary)	0.7%	[-3.3%, 1.7%]	23

Cycles

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

Binary size

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.3%	[0.0%, 0.9%]	110
Regressions ❌ (secondary)	0.6%	[0.0%, 1.5%]	49
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.0%, 0.9%]	110

Bootstrap: 657.896s -> 658.601s (0.11%)

Noratrieb · 2023-06-21T16:39:17Z

@cjgillot awesome accidental optimization work :3

Rollup of 6 pull requests Successful merges: - rust-lang#112632 (Implement PartialOrd for `Vec`s over different allocators) - rust-lang#112759 (Make closure_saved_names_of_captured_variables a query. ) - rust-lang#112772 (Add a fully fledged `Clause` type, rename old `Clause` to `ClauseKind`) - rust-lang#112790 (Syntactically accept `become` expressions (explicit tail calls experiment)) - rust-lang#112830 (More codegen cleanups) - rust-lang#112844 (Add retag in MIR transform: `Adt` for `Unique` may contain a reference) r? `@ghost` `@rustbot` modify labels: rollup

gootorov and others added 19 commits June 18, 2023 06:09

alloc: Implement PartialOrd for Vecs over different allocators

ed82c05

Syntatically accept become expressions

d7713fe

Implement become expression formatting in rustfmt

0355d41

Support ast::ExprKind::Become in clippy

b967f5c

s/Clause/ClauseKind

fca56a8

Fully fledged Clause type

21226ee

doc

dcee3ab

Make closure_saved_names_of_captured_variables a query.

7d5b2e4

Store generator field names in GeneratorLayout.

3a1edd8

Remove duplicated comment.

689607e

Adt for Unique may contain a reference

74aad5c

Inline and remove WorkItem::start_profiling and execute_work_item.

c696307

They both match on a `WorkItem`. It's simpler to do it all in one place.

Rollup merge of rust-lang#112632 - gootorov:vec_alloc_partialeq, r=dt…

78a90cb

…olnay Implement PartialOrd for `Vec`s over different allocators It is already possible to `PartialEq` `Vec`s with different allocators, but that is not the case with `PartialOrd`.

Rollup merge of rust-lang#112759 - cjgillot:closure-names, r=oli-obk

34c8e53

Make closure_saved_names_of_captured_variables a query. As we will start removing debuginfo during MIR optimizations, we need to keep them somewhere.

Rollup merge of rust-lang#112790 - WaffleLapkin:syntactically, r=Nils…

c6710d1

…trieb Syntactically accept `become` expressions (explicit tail calls experiment) This adds `ast::ExprKind::Become`, implements parsing and properly gates the feature. cc `@scottmcm`

Rollup merge of rust-lang#112830 - nnethercote:more-codegen-cleanups,…

904994e

… r=oli-obk More codegen cleanups Some additional cleanups I found while looking closely at this code, following up from rust-lang#112827. r= `@oli-obk`

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 21, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2023

bors merged commit 97bf23d into rust-lang:master Jun 21, 2023
11 checks passed

rustbot added this to the 1.72.0 milestone Jun 21, 2023

This was referenced Jun 21, 2023

Move CacheDecoder to rustc_query_impl #111842

Closed

Make associated type bounds in supertrait position implied #112629

Merged

Migrate item_bounds to ty::Clause #112870

Merged

rustbot added the perf-regression Performance regression. label Jun 21, 2023

This comment has been minimized.

Sign in to view

Noratrieb deleted the rollup-5g5hegl branch June 21, 2023 15:10

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Jun 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #112877

Rollup of 6 pull requests #112877

Noratrieb commented Jun 21, 2023

Noratrieb commented Jun 21, 2023

bors commented Jun 21, 2023

bors commented Jun 21, 2023

bors commented Jun 21, 2023

rust-timer commented Jun 21, 2023

rust-timer commented Jun 21, 2023

Kobzol commented Jun 21, 2023

This comment has been minimized.

rust-timer commented Jun 21, 2023

Kobzol commented Jun 21, 2023

This comment has been minimized.

rust-timer commented Jun 21, 2023

Noratrieb commented Jun 21, 2023

Rollup of 6 pull requests #112877

Rollup of 6 pull requests #112877

Conversation

Noratrieb commented Jun 21, 2023

Noratrieb commented Jun 21, 2023

bors commented Jun 21, 2023

bors commented Jun 21, 2023

bors commented Jun 21, 2023

rust-timer commented Jun 21, 2023

rust-timer commented Jun 21, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Kobzol commented Jun 21, 2023

This comment has been minimized.

rust-timer commented Jun 21, 2023

Overall result: no relevant changes - no action needed

Kobzol commented Jun 21, 2023

This comment has been minimized.

rust-timer commented Jun 21, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Noratrieb commented Jun 21, 2023