Only track mentioned places for jump threading #127087

cjgillot · 2024-06-28T14:24:18Z

This PR aims to reduce the state space size in jump threading and dataflow const-prop opts.

The current implementation walks the types of all locals, and creates a place for each possible projection. This can easily lead to a large number of places and tracked values, most being useless to the actual pass.

With this PR, we instead collect places that appear syntactically in the MIR (first commit). However, this is not sufficient (second commit), and we miss places that we could track in aggregate assignments. The third commit tracks such assignments to mirror place projections, see the inline comment.

This is complementary to #127036

r? @oli-obk

rustbot · 2024-06-28T14:24:26Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

cjgillot · 2024-06-28T14:25:14Z

@bors try @rust-timer queue

Only track mentionned places for jump threading This PR aims to reduce the state space size in jump threading and dataflow const-prop opts. The current implementation walks the types of all locals, and creates a place for each possible projection. This can easily lead to a large number of places and tracked values, most being useless to the actual pass. With this PR, we instead collect places that appear syntactically in the MIR (first commit). However, this is not sufficient (second commit), and we miss places that we could track in aggregate assignments. The third commit tracks such assignments to mirror place projections, see the inline comment. This is complementary to rust-lang#127036 r? `@oli-obk`

bors · 2024-06-28T14:26:25Z

⌛ Trying commit 845d318 with merge fa4f9fd...

bors · 2024-06-28T16:13:29Z

☀️ Try build successful - checks-actions
Build commit: fa4f9fd (fa4f9fd6695bbe46b01339f7bf457c97f7b493bb)

rust-timer · 2024-06-28T17:53:52Z

Finished benchmarking commit (fa4f9fd): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@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.7%	[0.5%, 1.2%]	3
Regressions ❌ (secondary)	0.3%	[0.2%, 0.4%]	9
Improvements ✅ (primary)	-0.6%	[-1.2%, -0.2%]	8
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-1.2%, 1.2%]	11

Max RSS (memory usage)

Results (primary 1.2%)

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)	2.9%	[2.1%, 3.7%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[-2.3%, 3.7%]	3

Cycles

Results (primary 0.9%, secondary 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.9%	[0.6%, 1.2%]	2
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.9%	[0.6%, 1.2%]	2

Binary size

Results (primary -0.1%, secondary -0.4%)

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.1%	[0.0%, 1.5%]	31
Regressions ❌ (secondary)	0.2%	[0.0%, 0.4%]	2
Improvements ✅ (primary)	-0.4%	[-1.0%, -0.0%]	18
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.2%]	38
All ❌✅ (primary)	-0.1%	[-1.0%, 1.5%]	49

Bootstrap: 696.308s -> 697.033s (0.10%)
Artifact size: 326.72 MiB -> 326.78 MiB (0.02%)

tgross35 · 2024-06-28T17:55:00Z

(s/mentionned/mentioned in the PR title before you merge)

cjgillot · 2024-06-29T09:30:15Z

Perf: for the 2 most prominent regressions (syn and ripgrep), the time in jump-threading is reduced -40%, and extra time is spent in LLVM.

bors · 2024-07-03T21:38:30Z

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

oli-obk

r=me (needs rebase)

rustbot · 2024-07-04T10:44:29Z

Some changes occurred in coverage tests.

cc @Zalathar

cjgillot · 2024-07-04T10:50:12Z

Second perf run to evaluate the effect of #127036

@bors try @rust-timer queue

cjgillot · 2024-07-04T10:50:52Z

Second perf run to evaluate the effect of #127036

@bors try @rust-timer queue

bors · 2024-07-04T10:51:22Z

⌛ Trying commit 82b6247 with merge 53ab1ce...

Only track mentioned places for jump threading This PR aims to reduce the state space size in jump threading and dataflow const-prop opts. The current implementation walks the types of all locals, and creates a place for each possible projection. This can easily lead to a large number of places and tracked values, most being useless to the actual pass. With this PR, we instead collect places that appear syntactically in the MIR (first commit). However, this is not sufficient (second commit), and we miss places that we could track in aggregate assignments. The third commit tracks such assignments to mirror place projections, see the inline comment. This is complementary to rust-lang#127036 r? `@oli-obk`

bors · 2024-07-04T12:38:12Z

☀️ Try build successful - checks-actions
Build commit: 53ab1ce (53ab1ce601eaa1e91fba073d3b73aa8c47ad648a)

rust-timer · 2024-07-04T15:07:54Z

Finished benchmarking commit (53ab1ce): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@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)	1.0%	[0.4%, 2.6%]	4
Regressions ❌ (secondary)	0.6%	[0.2%, 1.6%]	29
Improvements ✅ (primary)	-0.3%	[-0.6%, -0.2%]	5
Improvements ✅ (secondary)	-0.9%	[-1.7%, -0.3%]	12
All ❌✅ (primary)	0.3%	[-0.6%, 2.6%]	9

Max RSS (memory usage)

Results (primary 1.9%, secondary -1.4%)

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)	3.3%	[2.3%, 4.8%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-1.4%	[-3.0%, -0.6%]	7
All ❌✅ (primary)	1.9%	[-2.1%, 4.8%]	4

Cycles

Results (primary 0.6%, secondary 2.4%)

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)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	2.4%	[1.8%, 2.7%]	6
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[-1.1%, 2.3%]	2

Binary size

Results (primary -0.0%, secondary -0.4%)

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.2%	[0.0%, 1.5%]	23
Regressions ❌ (secondary)	0.2%	[0.0%, 0.4%]	2
Improvements ✅ (primary)	-0.2%	[-1.0%, -0.0%]	28
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.2%]	38
All ❌✅ (primary)	-0.0%	[-1.0%, 1.5%]	51

Bootstrap: 738.413s -> 726.291s (-1.64%)
Artifact size: 328.22 MiB -> 327.70 MiB (-0.16%)

bors · 2024-07-13T01:54:53Z

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

cjgillot · 2024-07-13T21:28:10Z

@bors r=oli-obk

bors · 2024-07-13T21:28:12Z

📌 Commit 6e3cff7 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2024-07-14T08:01:24Z

⌛ Testing commit 6e3cff7 with merge 0ffbddd...

bors · 2024-07-14T10:20:54Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 0ffbddd to master...

rust-timer · 2024-07-14T11:53:56Z

Finished benchmarking commit (0ffbddd): 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.5%	[0.4%, 0.6%]	3
Regressions ❌ (secondary)	1.1%	[0.2%, 1.6%]	7
Improvements ✅ (primary)	-0.6%	[-1.3%, -0.2%]	6
Improvements ✅ (secondary)	-0.6%	[-2.0%, -0.3%]	8
All ❌✅ (primary)	-0.2%	[-1.3%, 0.6%]	9

Max RSS (memory usage)

Results (primary -3.2%)

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)	4.0%	[4.0%, 4.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-5.0%	[-8.6%, -2.2%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.2%	[-8.6%, 4.0%]	5

Cycles

Results (primary -1.1%)

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)	-1.1%	[-1.3%, -0.8%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.1%	[-1.3%, -0.8%]	2

Binary size

Results (primary -0.1%, secondary -0.4%)

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.2%	[0.0%, 1.5%]	22
Regressions ❌ (secondary)	0.2%	[0.0%, 0.4%]	2
Improvements ✅ (primary)	-0.2%	[-1.0%, -0.0%]	30
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.2%]	38
All ❌✅ (primary)	-0.1%	[-1.0%, 1.5%]	52

Bootstrap: 704.399s -> 702.957s (-0.20%)
Artifact size: 328.72 MiB -> 328.69 MiB (-0.01%)

rylev · 2024-07-17T13:21:25Z

The perf impact was expected given the pre-merge runs and is less severe than it was pre-merge.

@rustbot label: +perf-regression-triaged

rustbot assigned oli-obk Jun 28, 2024

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

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

cjgillot added the A-mir-opt Area: MIR optimizations label Jun 28, 2024

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jun 28, 2024

cjgillot changed the title ~~Only track mentionned places for jump threading~~ Only track mentioned places for jump threading Jun 28, 2024

This comment has been minimized.

Sign in to view

cjgillot force-pushed the small-map branch from 846ccad to 3646c56 Compare June 30, 2024 13:53

oli-obk approved these changes Jul 4, 2024

View reviewed changes

cjgillot force-pushed the small-map branch from 3646c56 to 82b6247 Compare July 4, 2024 10:44

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 Jul 4, 2024

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 Jul 4, 2024

cjgillot added 4 commits July 13, 2024 11:54

Create mapped places upon seeing them in the body.

76f5bc6

Add test for copying aggregates.

af87662

Propagate places through assignments.

7ac7f13

Bless coverage.

6e3cff7

cjgillot force-pushed the small-map branch from 7a13fe4 to 6e3cff7 Compare July 13, 2024 12:02

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 Jul 13, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2024

bors merged commit 0ffbddd into rust-lang:master Jul 14, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jul 14, 2024

cjgillot deleted the small-map branch July 14, 2024 11:49

matthiaskrgr mentioned this pull request Jul 14, 2024

ICE. !base.layout().is_sized() #127737

Closed

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only track mentioned places for jump threading #127087

Only track mentioned places for jump threading #127087

cjgillot commented Jun 28, 2024

rustbot commented Jun 28, 2024

cjgillot commented Jun 28, 2024

This comment has been minimized.

bors commented Jun 28, 2024

This comment has been minimized.

bors commented Jun 28, 2024

This comment has been minimized.

rust-timer commented Jun 28, 2024

tgross35 commented Jun 28, 2024

cjgillot commented Jun 29, 2024 •

edited

Loading

This comment has been minimized.

bors commented Jul 3, 2024

oli-obk left a comment

rustbot commented Jul 4, 2024

cjgillot commented Jul 4, 2024

This comment has been minimized.

cjgillot commented Jul 4, 2024

This comment has been minimized.

bors commented Jul 4, 2024

This comment has been minimized.

bors commented Jul 4, 2024

This comment has been minimized.

rust-timer commented Jul 4, 2024

bors commented Jul 13, 2024

cjgillot commented Jul 13, 2024

bors commented Jul 13, 2024

bors commented Jul 14, 2024

bors commented Jul 14, 2024

rust-timer commented Jul 14, 2024

rylev commented Jul 17, 2024

Only track mentioned places for jump threading #127087

Only track mentioned places for jump threading #127087

Conversation

cjgillot commented Jun 28, 2024

rustbot commented Jun 28, 2024

cjgillot commented Jun 28, 2024

This comment has been minimized.

bors commented Jun 28, 2024

This comment has been minimized.

bors commented Jun 28, 2024

This comment has been minimized.

rust-timer commented Jun 28, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

tgross35 commented Jun 28, 2024

cjgillot commented Jun 29, 2024 • edited Loading

This comment has been minimized.

bors commented Jul 3, 2024

oli-obk left a comment

Choose a reason for hiding this comment

rustbot commented Jul 4, 2024

cjgillot commented Jul 4, 2024

This comment has been minimized.

cjgillot commented Jul 4, 2024

This comment has been minimized.

bors commented Jul 4, 2024

This comment has been minimized.

bors commented Jul 4, 2024

This comment has been minimized.

rust-timer commented Jul 4, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

bors commented Jul 13, 2024

cjgillot commented Jul 13, 2024

bors commented Jul 13, 2024

bors commented Jul 14, 2024

bors commented Jul 14, 2024

rust-timer commented Jul 14, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

rylev commented Jul 17, 2024

cjgillot commented Jun 29, 2024 •

edited

Loading