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

remove allow(rustc::potential_query_instability) in rustc_span #99126

Merged
merged 1 commit into from Jul 14, 2022

Conversation

NiklasJonsson
Copy link
Contributor

Also, avoid sorting before debug output as iteration order can now be
relied upon.

Related #84447

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

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

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2022
@petrochenkov
Copy link
Contributor

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

bors commented Jul 11, 2022

⌛ Trying commit 54d87271cbab4185098220b4e507f02a0c6d6561 with merge 93c95bf7f9600dcae71a4e3e88e33985b80ebed2...

@petrochenkov petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2022
@bors
Copy link
Contributor

bors commented Jul 11, 2022

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

@rust-timer
Copy link
Collaborator

Queued 93c95bf7f9600dcae71a4e3e88e33985b80ebed2 with parent 9fb32dc, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (93c95bf7f9600dcae71a4e3e88e33985b80ebed2): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
0.3% 0.5% 17
Regressions 😿
(secondary)
0.6% 1.7% 27
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-4.0% -4.1% 2
All 😿🎉 (primary) 0.3% 0.5% 17

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvements found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
3.4% 4.4% 8
Improvements 🎉
(primary)
-1.8% -3.8% 13
Improvements 🎉
(secondary)
-1.9% -2.7% 17
All 😿🎉 (primary) -1.8% -3.8% 13

Cycles

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)
-8.6% -9.8% 4
All 😿🎉 (primary) N/A N/A 0

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.

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-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 added perf-regression Performance regression. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jul 11, 2022
@petrochenkov
Copy link
Contributor

It appears that in all these cases it's better to keep FxHashMap because it's faster and the iteration doesn't actually result in instability.

Also it's probably move allow(rustc::potential_query_instability) to more specific locations instead of the whole crate.
@rustbot author

@rustbot 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 Jul 12, 2022
@NiklasJonsson
Copy link
Contributor Author

Also it's probably move allow(rustc::potential_query_instability) to more specific locations instead of the whole crate.

Yeah, makes sense. I'll move it to reduce the scope.

@petrochenkov petrochenkov 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 Jul 12, 2022
@petrochenkov
Copy link
Contributor

@NiklasJonsson
Could you move the allow attributes to statements that actually do the iteration.
So that comments explaining why it's ok to iterate and the allow attributes are in the same place.

r=me after doing that and squashing commits into one.
@rustbot author

@rustbot 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 Jul 13, 2022
@NiklasJonsson
Copy link
Contributor Author

NiklasJonsson commented Jul 13, 2022

Could you move the allow attributes to statements that actually do the iteration.

Didn't know you could put attributes directly on statements. Useful!

r=me after doing that

Not sure what r=me means, is it a rustbot command?

@NiklasJonsson
Copy link
Contributor Author

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

@rustbot 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 Jul 13, 2022
@petrochenkov
Copy link
Contributor

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 13, 2022

📌 Commit f94484f has been approved by petrochenkov

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 Jul 13, 2022
@petrochenkov
Copy link
Contributor

petrochenkov commented Jul 13, 2022

Not sure what r=me means, is it a rustbot command?

Yes, @ bors r=approver_name is an "approve on behalf of approver_name", the comment was mostly targeted at other people with approval rights in case I get busy and don't approve it myself.

@bors
Copy link
Contributor

bors commented Jul 13, 2022

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Jul 13, 2022

📌 Commit f94484f has been approved by `approver_name``

It is now in the queue for this repository.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 13, 2022

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Jul 13, 2022

📌 Commit f94484f has been approved by petrochenkov

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#97720 (Always create elided lifetime parameters for functions)
 - rust-lang#98315 (Stabilize `core::ffi:c_*` and rexport in `std::ffi`)
 - rust-lang#98705 (Implement `for<>` lifetime binder for closures)
 - rust-lang#99126 (remove allow(rustc::potential_query_instability) in rustc_span)
 - rust-lang#99139 (Give a better error when `x dist` fails for an optional tool)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 85159a4 into rust-lang:master Jul 14, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 14, 2022
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 18, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#97720 (Always create elided lifetime parameters for functions)
 - rust-lang#98315 (Stabilize `core::ffi:c_*` and rexport in `std::ffi`)
 - rust-lang#98705 (Implement `for<>` lifetime binder for closures)
 - rust-lang#99126 (remove allow(rustc::potential_query_instability) in rustc_span)
 - rust-lang#99139 (Give a better error when `x dist` fails for an optional tool)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
perf-regression Performance regression. 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.

None yet

6 participants