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

Revert "Rollup merge of #92006 - oli-obk:welcome_opaque_types_into_th… #92928

Closed
wants to merge 1 commit into from
Closed

Revert "Rollup merge of #92006 - oli-obk:welcome_opaque_types_into_th… #92928

wants to merge 1 commit into from

Conversation

matthiaskrgr
Copy link
Member

…e_fold, r=nikomatsakis"

This reverts commit b45a819, reversing
changes made to e045c79.

@matthiaskrgr
Revert "Rollup merge of rust-lang#92006 - oli-obk:welcome_opaque_type…
fd04250 
…s_into_the_fold, r=nikomatsakis"

This reverts commit b45a819, reversing
changes made to e045c79.
@rust-highfive
Copy link
Collaborator

r? @estebank

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

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

@bors try @rust-timer queue

trying to see if this fixes the perf regression of #92844 (comment)

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

bors commented Jan 15, 2022

⌛ Trying commit fd04250 with merge 8c4a951b919d548bba16b6f209ed05b1647eba2c...

@matthiaskrgr
Copy link
Member Author

r? @ghost

@bors
Copy link
Contributor

bors commented Jan 15, 2022

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

@rust-timer
Copy link
Collaborator

Queued 8c4a951b919d548bba16b6f209ed05b1647eba2c with parent 38c22af, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8c4a951b919d548bba16b6f209ed05b1647eba2c): comparison url.

Summary: This change led to very large relevant improvements 🎉 in compiler performance.

  • Very large improvement in instruction counts (up to -7.5% on full builds of keccak)

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 led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 15, 2022
@matthiaskrgr matthiaskrgr changed the title [DO NOT MERGE] Revert "Rollup merge of #92006 - oli-obk:welcome_opaque_types_into_th… Revert "Rollup merge of #92006 - oli-obk:welcome_opaque_types_into_th… Jan 15, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 15, 2022
Merged
@matthiaskrgr
Copy link
Member Author

r? @oli-obk
Should we revert for now, or do have some ideas how to mitigate the impact?

@rust-highfive rust-highfive assigned oli-obk and unassigned estebank Jan 15, 2022
jackh726
jackh726 reviewed Jan 15, 2022
View reviewed changes
compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
while !obligations.is_empty() {
trace!("{:#?}", obligations);
let mut progress = false;
for obligation in std::mem::take(&mut obligations) {
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if this hurts perf. We create a new Vec when we take, so we have to reallocate when new obligations are pushed.

Copy link
Contributor

Choose a reason for hiding this comment

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

trying this out in #93007

@oli-obk
Copy link
Contributor

oli-obk commented Jan 15, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 15, 2022

📌 Commit fd04250 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 Jan 15, 2022
@oli-obk oli-obk mentioned this pull request Jan 17, 2022
Closed
@tmiasko tmiasko mentioned this pull request Jan 17, 2022
Merged
@oli-obk
Copy link
Contributor

oli-obk commented Jan 18, 2022

@bors r-

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 18, 2022
@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 18, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jan 18, 2022

@bors try @rust-timer queue

Let's run this again, apperently keccak is spurious recently

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

bors commented Jan 18, 2022

⌛ Trying commit fd04250 with merge 8bf5d7c746e31951e97de80d2fa1362a1d9bbd1c...

@bors
Copy link
Contributor

bors commented Jan 18, 2022

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

@rust-timer
Copy link
Collaborator

Queued 8bf5d7c746e31951e97de80d2fa1362a1d9bbd1c with parent e4ff903, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8bf5d7c746e31951e97de80d2fa1362a1d9bbd1c): comparison url.

Summary: This change led to small relevant mixed results 🤷 in compiler performance.

  • Small improvement in instruction counts (up to -0.4% on full builds of deeply-nested-async check)
  • Small regression in instruction counts (up to 0.4% on full builds of wg-grammar check)

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 led 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

@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 Jan 18, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jan 18, 2022

Yea, looks like my PR wasn't the reason for the regression, so we don't need to revert?

@jackh726
Copy link
Member

I agree; I think this could be closed.

@oli-obk oli-obk closed this Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@jackh726 jackh726 jackh726 left review comments

Assignees

@oli-obk oli-obk

Labels
perf-regression Performance regression. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@matthiaskrgr @rust-highfive @rust-timer @bors @oli-obk @jackh726 @estebank @rustbot