Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce PlaceBuilder cloning #103947

Merged
merged 4 commits into from
Nov 23, 2022
Merged

Reduce PlaceBuilder cloning #103947

merged 4 commits into from
Nov 23, 2022

Conversation

camsteffen
Copy link
Contributor

Some API tweaks with an eye towards reducing clones.

@rustbot
Copy link
Collaborator

rustbot commented Nov 4, 2022

r? @cjgillot

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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 Nov 4, 2022
@Kobzol
Copy link
Contributor

Kobzol commented Nov 4, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 4, 2022
@bors
Copy link
Contributor

bors commented Nov 4, 2022

⌛ Trying commit a725ae151ed917cfc41d742ee963609256a140b2 with merge 1606b503f0d3c68a726790c85dca681060ee46a0...

@bors
Copy link
Contributor

bors commented Nov 4, 2022

☀️ Try build successful - checks-actions
Build commit: 1606b503f0d3c68a726790c85dca681060ee46a0 (1606b503f0d3c68a726790c85dca681060ee46a0)

@rust-timer
Copy link
Collaborator

Queued 1606b503f0d3c68a726790c85dca681060ee46a0 with parent 2efb0cd, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1606b503f0d3c68a726790c85dca681060ee46a0): 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-review -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
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)		 1.3% [1.2%, 1.4%] 2
Regressions ❌
(secondary)		 3.5% [3.5%, 3.5%] 1
Improvements ✅
(primary)		 -0.7% [-0.7%, -0.7%] 1
Improvements ✅
(secondary)		 -4.4% [-4.4%, -4.4%] 1
All ❌✅ (primary) 0.6% [-0.7%, 1.4%] 3

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 4, 2022
cjgillot
cjgillot reviewed Nov 4, 2022
View reviewed changes
compiler/rustc_mir_build/src/build/expr/as_place.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/build/matches/util.rs Outdated
let mut place = match place.try_upvars_resolved(cx) {
Ok(val) | Err(val) => val,
};
let _is_resolved = place.resolve_upvar_mut(cx);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we call to_place directly here?

Copy link
Contributor Author

@camsteffen camsteffen Nov 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that panics if the upvar can't be resolved.

@cjgillot cjgillot 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 Nov 12, 2022
@camsteffen
Copy link
Contributor Author

I factored out resolve_upvar_mut.

@camsteffen camsteffen 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 Nov 18, 2022
@cjgillot
Copy link
Contributor

Great, thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Nov 21, 2022

📌 Commit 9cf6ce0 has been approved by cjgillot

It is now in the queue for this repository.

@bors 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 Nov 21, 2022
@bors
Copy link
Contributor

bors commented Nov 22, 2022

⌛ Testing commit 9cf6ce0 with merge 12079974cf83b9d5a93d614c89c466f90f162c46...

@Manishearth
Copy link
Member

@bors retry

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@bors
Copy link
Contributor

bors commented Nov 23, 2022

⌛ Testing commit 9cf6ce0 with merge 80b3c6d...

@bors
Copy link
Contributor

bors commented Nov 23, 2022

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 80b3c6d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 23, 2022
@bors bors merged commit 80b3c6d into rust-lang:master Nov 23, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 23, 2022
@bors bors mentioned this pull request Nov 23, 2022
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (80b3c6d): comparison URL.

Overall result: ✅ 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
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 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)		 2.3% [2.3%, 2.3%] 1
Improvements ✅
(primary)		 -1.4% [-1.4%, -1.4%] 1
Improvements ✅
(secondary)		 -3.8% [-3.8%, -3.8%] 1
All ❌✅ (primary) -1.4% [-1.4%, -1.4%] 1

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)		 3.2% [3.2%, 3.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.9% [-2.9%, -2.8%] 3
All ❌✅ (primary) - - 0

@camsteffen camsteffen deleted the place-clones branch November 23, 2022 18:59
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#103947 - camsteffen:place-clones, r=cjgillot
84a2c00 
Reduce `PlaceBuilder` cloning

Some API tweaks with an eye towards reducing clones.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

Assignees

@cjgillot cjgillot

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
8 participants
@camsteffen @rustbot @Kobzol @rust-timer @bors @cjgillot @Manishearth @rust-log-analyzer