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.

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

Move remaining tests with NLL differences to revisions #97258

Merged
merged 18 commits into from
May 23, 2022

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented May 21, 2022

Based on #97206

I've already filed issues for any important differences that I've spotted: #97252 #97253 #97256 #97267

There is a lot here, but each commit is self-contained as a separate directory. I can split into separate PRs as wanted or needed.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 21, 2022
@rust-highfive
Copy link
Collaborator

r? @cjgillot

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2022
@rust-log-analyzer

This comment has been minimized.

@cjgillot cjgillot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2022
@jackh726
Copy link
Member Author

@cjgillot while this is technically blocked on #97206, each commit is independent (including from that). I decided to just use that as a base, since it modifies NLL tests. It's also already approved and in the bors queue . So, I would appreciate a review whenever you have time (I wouldn't mind just being able to just have this approved for when the other lands, for example).

@jackh726 jackh726 force-pushed the nll-revisions branch 2 times, most recently from 482b7d3 to 4233ec6 Compare May 22, 2022 01:38
@jackh726
Copy link
Member Author

jackh726 commented May 22, 2022

@jackh726 jackh726 force-pushed the nll-revisions branch 3 times, most recently from 05e5740 to 765592b Compare May 22, 2022 07:16
@jackh726 jackh726 changed the title Move many more tests with NLL differences to revisions Move remaining tests with NLL differences to revisions May 22, 2022
@@ -1,4 +1,4 @@
// revisions: nll
// revisions: base nll
//[nll]compile-flags: -Z borrowck=mir

//[g2p]compile-flags: -Z borrowck=mir -Z two-phase-beyond-autoref
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this option still exist in the compiler?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure - preexisting thought and I'd rather not make this PR anything other than mechanical. (Though I should try to remember to come back to this at some point)

@cjgillot
Copy link
Contributor

@jackh726 are there cases you want to draw attention to? I did not really anything stand out, the changes seem mostly mechanical.
r=me once #97206 lands

@jackh726
Copy link
Member Author

Nope, no cases to draw attention to. I don't think there was anything really surprising in the nll diagnostics compared to base. Obviously, I already filed issues for the cases where we obviously are slightly worse. But there was nothing that is like "oh, that's not good".

@jackh726
Copy link
Member Author

@bors r=cjgillot p=1

(bitrotty)

@bors
Copy link
Contributor

bors commented May 22, 2022

📌 Commit 383fbee has been approved by cjgillot

@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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels May 22, 2022
@bors
Copy link
Contributor

bors commented May 22, 2022

⌛ Testing commit 383fbee with merge 07e7b43...

@bors
Copy link
Contributor

bors commented May 23, 2022

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 07e7b43 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2022
@bors bors merged commit 07e7b43 into rust-lang:master May 23, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 23, 2022
@jackh726 jackh726 deleted the nll-revisions branch May 23, 2022 00:09
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (07e7b43): comparison url.

Instruction count

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

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: mixed results
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count1 0 2 2 2 2
mean2 N/A 2.4% -2.9% -1.6% -2.9%
max N/A 3.9% -3.4% -1.7% -3.4%

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: no relevant changes found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count1 2 0 3 0 5
mean2 2.4% N/A -2.1% N/A -0.3%
max 2.9% N/A -2.5% N/A 2.9%

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

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes 2

  2. the arithmetic mean of the percent change 2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

7 participants