Optimize `mk_region` by nnethercote · Pull Request #108020 · rust-lang/rust

nnethercote · 2023-02-14T02:20:33Z

PR #107869 avoiding some interning under mk_ty by special-casing Ty variants with simple (integer) bodies. This PR does something similar for regions.

r? @compiler-errors

rustbot · 2023-02-14T02:20:41Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors

r=me when perf comes back green, looks good to me.

edit: oh, also seems to need a rebase.

nnethercote · 2023-02-14T03:05:39Z

Thanks for the fast review!

@bors try @rust-timer queue

bors · 2023-02-14T03:05:48Z

⌛ Trying commit a6d704eb87efb0a15e1d6b49ab44a8088ae5576f with merge 87ab11387193414f9cbceff868dd2f1f59f60803...

bors · 2023-02-14T05:20:36Z

☀️ Try build successful - checks-actions
Build commit: 87ab11387193414f9cbceff868dd2f1f59f60803 (87ab11387193414f9cbceff868dd2f1f59f60803)

nnethercote · 2023-02-14T05:27:35Z

BTW, I tried similar things with mk_predicate, but predicates are more complex. There are no variants containing just an integer, for example. The existing reuse_or_mk_predicate function is effective, I couldn't improve on that.

rust-timer · 2023-02-14T06:37:43Z

Finished benchmarking commit (87ab11387193414f9cbceff868dd2f1f59f60803): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

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

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.6%	[0.6%, 0.6%]	1
Regressions ❌ (secondary)	2.1%	[1.8%, 3.1%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.6%	[-2.1%, -0.7%]	5
All ❌✅ (primary)	0.6%	[0.6%, 0.6%]	1

Cycles

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

oli-obk · 2023-02-14T07:06:05Z

@bors r=compiler-errors

bors · 2023-02-14T07:06:07Z

📌 Commit a6d704eb87efb0a15e1d6b49ab44a8088ae5576f has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-02-14T21:58:20Z

☔ The latest upstream changes (presumably #108052) made this pull request unmergeable. Please resolve the merge conflicts.

It's not used on any hot paths, and so has little perf benefit, and it interferes with the optimizations in the following commits.

Much like there are specialized variants of `mk_ty`. This will enable some optimization in the next commit. Also rename the existing `re_error*` functions as `mk_re_error*`, for consistency.

nnethercote · 2023-02-14T22:16:29Z

I rebased.

@bors r=compiler-errors

bors · 2023-02-14T22:16:30Z

📌 Commit 9a53cee has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2023-02-15T17:30:41Z

@bors retry

rust-log-analyzer · 2023-02-16T04:04:09Z

The job mingw-check failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

curl: (22) The requested URL returned error: 404
error: failed to download llvm from ci
help: old builds get deleted after a certain time
help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
[llvm]
download-ci-llvm = false
Build completed unsuccessfully in 0:00:00

bors · 2023-02-16T16:11:57Z

⌛ Testing commit 9a53cee with merge c5d1b3e...

bors · 2023-02-16T19:20:55Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing c5d1b3e to master...

bors · 2023-02-16T19:20:55Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing c5d1b3e to master...

rust-timer · 2023-02-16T20:41:02Z

Finished benchmarking commit (c5d1b3e): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-0.9%	[-0.9%, -0.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.9%	[-0.9%, -0.9%]	1

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)	3.1%	[2.4%, 4.9%]	6
Improvements ✅ (primary)	-4.6%	[-4.6%, -4.6%]	1
Improvements ✅ (secondary)	-2.8%	[-4.6%, -1.0%]	5
All ❌✅ (primary)	-4.6%	[-4.6%, -4.6%]	1

Cycles

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

Upstream PRs that require local changes: - Don't ICE in might_permit_raw_init if reference is polymorphic rust-lang/rust#108012 - Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047 - Optimize mk_region rust-lang/rust#108020 Co-authored-by: Qinheping Hu <qinhh@amazon.com>

- Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 - Unify validity checks into a single query rust-lang/rust#108364 - Rename interner funcs rust-lang/rust#108250 - Optimize mk_region rust-lang/rust#108020 - Clarify iterator interners rust-lang/rust#108112

rustbot assigned compiler-errors Feb 14, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 14, 2023

compiler-errors approved these changes Feb 14, 2023
View reviewed changes

Comment threadcompiler/rustc_mir_transform/src/large_enums.rs Outdated

nnethercote force-pushed the opt-mk_region branch from bea00b5 to a6d704eCompare February 14, 2023 03:04

This comment has been minimized.
Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 14, 2023

This comment has been minimized.
Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 14, 2023

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 Feb 14, 2023

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 14, 2023

nnethercote added 4 commits February 15, 2023 09:02

Remove reuse_or_mk_region.
7439028
It's not used on any hot paths, and so has little perf benefit, and it interferes with the optimizations in the following commits.

Add specialized variants of mk_region.
cef9004
Much like there are specialized variants of `mk_ty`. This will enable some optimization in the next commit. Also rename the existing `re_error*` functions as `mk_re_error*`, for consistency.

Pre-intern some ReVars and ReLateBounds.
a4d3c9a

Replace an unnecessary mk_ty call with mk_array.
9a53cee

nnethercote force-pushed the opt-mk_region branch from a6d704e to 9a53ceeCompare February 14, 2023 22:11

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 Feb 15, 2023

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 Feb 15, 2023

nnethercote mentioned this pull request Feb 16, 2023
Clarify iterator interners #108112
Merged

bors added merged-by-bors This PR was explicitly merged by bors. labels Feb 16, 2023

bors merged commit c5d1b3e into rust-lang:masterFeb 16, 2023

rustbot added this to the 1.69.0 milestone Feb 16, 2023

This was referenced Feb 16, 2023
Switch to EarlyBinder for type_of query #107753
Merged
always resolve to universal regions if possible #108121
Merged

nnethercote deleted the opt-mk_region branch February 16, 2023 20:42

qinheping mentioned this pull request Mar 10, 2023
Upgrade toolchain to nightly-2023-03-09 model-checking/kani#2293
Closed
4 tasks

tautschnig mentioned this pull request Apr 16, 2023
Upgrade Rust toolchain to nightly-2023-02-17 model-checking/kani#2380
Merged
4 tasks

Uh oh!

Uh oh!

Conversation

nnethercote commented Feb 14, 2023

Uh oh!

rustbot commented Feb 14, 2023

Uh oh!

compiler-errors left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nnethercote commented Feb 14, 2023

Uh oh!

This comment has been minimized.

bors commented Feb 14, 2023

Uh oh!

bors commented Feb 14, 2023

Uh oh!

This comment has been minimized.

nnethercote commented Feb 14, 2023

Uh oh!

rust-timer commented Feb 14, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

oli-obk commented Feb 14, 2023

Uh oh!

bors commented Feb 14, 2023

Uh oh!

bors commented Feb 14, 2023

Uh oh!

nnethercote commented Feb 14, 2023

Uh oh!

bors commented Feb 14, 2023

Uh oh!

compiler-errors commented Feb 15, 2023

Uh oh!

rust-log-analyzer commented Feb 16, 2023

Uh oh!

bors commented Feb 16, 2023

Uh oh!

bors commented Feb 16, 2023

Uh oh!

bors commented Feb 16, 2023

Uh oh!

rust-timer commented Feb 16, 2023

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

compiler-errors left a comment •
edited
Loading