Use PlaceRef abstractions more often #112693

ericmarkmartin · 2023-06-16T05:13:32Z

Associated issue: #80647

rustbot · 2023-06-16T05:13:40Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @b-naber (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

ericmarkmartin · 2023-06-16T05:15:04Z

@rustbot label +S-waiting-on-author -S-waiting-on-review

spastorino · 2023-06-19T18:48:09Z

@ericmarkmartin this is looking good IMO.

rustbot · 2023-06-19T23:14:51Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

ericmarkmartin · 2023-06-19T23:15:27Z

@rustbot label -S-waiting-on-author +S-waiting-on-review

compiler/rustc_mir_build/src/build/expr/as_place.rs

compiler/rustc_mir_build/src/build/matches/util.rs

cjgillot · 2023-06-23T08:52:37Z

compiler/rustc_mir_dataflow/src/move_paths/builder.rs

-                            },
+                                projection: tcx.mk_place_elems(place_ref.projection),
+                            }
+                            .project_deeper(&[elem], tcx),


Could you add a project_deeper method on PlaceRef, to avoid interning twice?

Or should BorrowedContent take a PlaceRef?

I think PlaceRef already had that. I'm not sure I'm really qualified to have a take on what BorrowedContent should take but even if it took a PlaceRef we'd need some way to produce the extended PlaceRef. We could also try building the iterator so that we have access to the subsequent projection in each iteration, but I'm not sure how worth it that is.

cjgillot · 2023-06-23T08:52:48Z

compiler/rustc_mir_dataflow/src/move_paths/builder.rs

+                        local: place.local,
+                        projection: tcx.mk_place_elems(place_ref.projection),
+                    }
+                    .project_deeper(&[elem], tcx)


cjgillot · 2023-06-23T08:53:32Z

compiler/rustc_mir_transform/src/inline.rs

+            let parent = Place {
+                local: place_ref.local,
+                projection: self.tcx.mk_place_elems(place_ref.projection),
+            };


Why can't we use place_ref directly here?

cjgillot · 2023-06-23T08:54:29Z

compiler/rustc_const_eval/src/transform/validate.rs

+                let parent = Place {
+                    local: place_ref.local,
+                    projection: self.tcx.mk_place_elems(place_ref.projection),
+                };


Can we use place_ref directly in this code?

cjgillot · 2023-06-25T13:00:34Z

Thanks! r=me with commits squashed.

spastorino · 2023-06-25T13:24:55Z

This looks great now, please squash the commits into one or into a few of meaningful commits and then we can merge. Thanks for your work.

ericmarkmartin · 2023-06-26T00:45:02Z

r? @cjgillot

spastorino · 2023-06-26T14:43:57Z

@bors r+

bors · 2023-06-26T14:43:59Z

📌 Commit c07c10d has been approved by spastorino

It is now in the queue for this repository.

ericmarkmartin · 2023-06-26T22:05:30Z

Thanks @spastorino and @cjgillot (and the rustc-dev-guide) for making the experience of writing my first PR to rust so pleasant!

bors · 2023-06-27T00:34:52Z

⌛ Testing commit c07c10d with merge b9ad9b7...

bors · 2023-06-27T03:14:36Z

☀️ Test successful - checks-actions
Approved by: spastorino
Pushing b9ad9b7 to master...

rust-timer · 2023-06-27T04:34:18Z

Finished benchmarking commit (b9ad9b7): 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)	1.0%	[0.7%, 1.4%]	5
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[-0.6%, 1.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)	-	-	0
Regressions ❌ (secondary)	1.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.8%, -2.1%]	2
All ❌✅ (primary)	-	-	0

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)	3.5%	[2.8%, 4.2%]	3
Regressions ❌ (secondary)	3.0%	[2.1%, 4.1%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.5%	[2.8%, 4.2%]	3

Binary size

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

Bootstrap: 662.213s -> 661.833s (-0.06%)

lqd · 2023-06-27T07:57:16Z

cargo and bitmaps noise, stabilized in the next merge.

@rustbot label: +perf-regression-triaged

spastorino · 2023-06-27T11:51:04Z

@ericmarkmartin thanks to you for the contribution. Let's keep in touch on Zulip in case you want to contribute more :).

rustbot assigned b-naber Jun 16, 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 Jun 16, 2023

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 16, 2023

rustbot assigned spastorino and unassigned b-naber Jun 16, 2023

This comment has been minimized.

Sign in to view

ericmarkmartin force-pushed the use-more-placeref branch from ae0c5b3 to 3263fee Compare June 18, 2023 06:22

ericmarkmartin marked this pull request as ready for review June 19, 2023 23:14

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2023

cjgillot reviewed Jun 23, 2023

View reviewed changes

use PlaceRef abstractions more consistently

c07c10d

ericmarkmartin force-pushed the use-more-placeref branch from 9ee0406 to c07c10d Compare June 26, 2023 00:38

rustbot assigned cjgillot and unassigned spastorino Jun 26, 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 Jun 26, 2023

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

bors merged commit b9ad9b7 into rust-lang:master Jun 27, 2023

rustbot added this to the 1.72.0 milestone Jun 27, 2023

This was referenced Jun 27, 2023

Implement jump threading MIR opt #107009

Merged

[perf] Enable some more MIR optimizations #111061

Draft

ericmarkmartin deleted the use-more-placeref branch June 27, 2023 04:05

bors mentioned this pull request Jun 27, 2023

Rewrite UnDerefer #112882

Merged

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

rustbot 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

Use PlaceRef abstractions more often #112693

Use PlaceRef abstractions more often #112693

ericmarkmartin commented Jun 16, 2023 •

edited

Loading

rustbot commented Jun 16, 2023

ericmarkmartin commented Jun 16, 2023

This comment has been minimized.

spastorino commented Jun 19, 2023

rustbot commented Jun 19, 2023

ericmarkmartin commented Jun 19, 2023

cjgillot Jun 23, 2023

cjgillot Jun 23, 2023

ericmarkmartin Jun 24, 2023

cjgillot Jun 23, 2023

cjgillot Jun 23, 2023

cjgillot Jun 23, 2023

cjgillot commented Jun 25, 2023

spastorino commented Jun 25, 2023

ericmarkmartin commented Jun 26, 2023

spastorino commented Jun 26, 2023

bors commented Jun 26, 2023

ericmarkmartin commented Jun 26, 2023

bors commented Jun 27, 2023

bors commented Jun 27, 2023

rust-timer commented Jun 27, 2023

lqd commented Jun 27, 2023

spastorino commented Jun 27, 2023

Use PlaceRef abstractions more often #112693

Use PlaceRef abstractions more often #112693

Conversation

ericmarkmartin commented Jun 16, 2023 • edited Loading

rustbot commented Jun 16, 2023

ericmarkmartin commented Jun 16, 2023

This comment has been minimized.

spastorino commented Jun 19, 2023

rustbot commented Jun 19, 2023

ericmarkmartin commented Jun 19, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cjgillot commented Jun 25, 2023

spastorino commented Jun 25, 2023

ericmarkmartin commented Jun 26, 2023

spastorino commented Jun 26, 2023

bors commented Jun 26, 2023

ericmarkmartin commented Jun 26, 2023

bors commented Jun 27, 2023

bors commented Jun 27, 2023

rust-timer commented Jun 27, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

lqd commented Jun 27, 2023

spastorino commented Jun 27, 2023

ericmarkmartin commented Jun 16, 2023 •

edited

Loading