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

continue nll transition by removing stuff #98584

Merged
merged 6 commits into from
Jul 5, 2022
Merged

continue nll transition by removing stuff #98584

merged 6 commits into from
Jul 5, 2022

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jun 27, 2022 •
edited
Loading

r? @jackh726 for now

building on #98641

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 27, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 27, 2022
@bors
Copy link
Contributor

bors commented Jun 28, 2022

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

@rustbot
Copy link
Collaborator

rustbot commented Jun 29, 2022

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@lcnr lcnr marked this pull request as ready for review June 29, 2022 16:41
@lcnr
Copy link
Contributor Author

lcnr commented Jun 29, 2022 •
edited
Loading

So, I still want to remove cause.body_id for Obligation, but that body_id is used in a bunch of places. What we probably want is to instead only contain a HirId as the source of obligations instead of Span + body_id.

edit: storing a HirId doesn't work for mir typeck 😢

@lcnr
Copy link
Contributor Author

lcnr commented Jun 29, 2022

anyways, I think this by itself is already ready for review

@lcnr lcnr changed the title [wip] continue nll transition by removing stuff continue nll transition by removing stuff Jun 29, 2022
@jackh726
Copy link
Member

Woot

@lcnr
Copy link
Contributor Author

lcnr commented Jun 29, 2022 •
edited
Loading

will wait with perf for #98641 to get merged because that one is already an improvement by itself

@bors
Copy link
Contributor

bors commented Jul 1, 2022

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

@lcnr lcnr force-pushed the region-stuff-more-beans branch from ff8f8bb to 9f95c60 Compare July 4, 2022 12:38
@lcnr
Copy link
Contributor Author

lcnr commented Jul 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 Jul 4, 2022
@bors
Copy link
Contributor

bors commented Jul 4, 2022

⌛ Trying commit 9f95c60 with merge a0e3c03d817ba6c1911e8451ea12867b6e75a770...

@bors
Copy link
Contributor

bors commented Jul 4, 2022

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

@rust-timer
Copy link
Collaborator

Queued a0e3c03d817ba6c1911e8451ea12867b6e75a770 with parent a3beeaa, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a0e3c03d817ba6c1911e8451ea12867b6e75a770): comparison url.

Instruction count

  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -0.9% -1.7% 67
Improvements 🎉
(secondary)		 -1.1% -2.8% 62
All 😿🎉 (primary) -0.9% -1.7% 67

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -0.7% -1.2% 2
Improvements 🎉
(secondary)		 -1.8% -2.1% 4
All 😿🎉 (primary) -0.7% -1.2% 2

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -1.5% -1.6% 2
Improvements 🎉
(secondary)		 -2.3% -2.4% 7
All 😿🎉 (primary) -1.5% -1.6% 2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 4, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Jul 5, 2022

alright 👍

@oli-obk
Copy link
Contributor

oli-obk commented Jul 5, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2022

📌 Commit 9f95c60 has been approved by oli-obk

@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 Jul 5, 2022
@bors
Copy link
Contributor

bors commented Jul 5, 2022

⌛ Testing commit 9f95c60 with merge efb171e...

@bors
Copy link
Contributor

bors commented Jul 5, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2022
@bors bors merged commit efb171e into rust-lang:master Jul 5, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 5, 2022
@bors bors mentioned this pull request Jul 5, 2022
Merged
@lcnr lcnr deleted the region-stuff-more-beans branch July 5, 2022 18:15
This was referenced Jul 5, 2022
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (efb171e): comparison url.

Instruction count

  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -1.0% -2.3% 66
Improvements 🎉
(secondary)		 -1.2% -3.6% 63
All 😿🎉 (primary) -1.0% -2.3% 66

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -2.5% -4.7% 4
All 😿🎉 (primary) N/A N/A 0

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -2.2% -2.6% 2
Improvements 🎉
(secondary)		 -2.7% -3.5% 17
All 😿🎉 (primary) -2.2% -2.6% 2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@lcnr lcnr mentioned this pull request Dec 8, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jackh726 jackh726

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.64.0
Development

Successfully merging this pull request may close these issues.
7 participants
@lcnr @bors @rustbot @jackh726 @rust-timer @oli-obk @rust-highfive