Skip to content

Simplification of query forcing #85319

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
Merged
merged 5 commits into from
May 30, 2021
Merged

Simplification of query forcing #85319

merged 5 commits into from
May 30, 2021

Conversation

cjgillot
Copy link
Contributor

Extracted from #78780

@rust-highfive
Copy link
Contributor

r? @jackh726

(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 15, 2021
@cjgillot
Copy link
Contributor Author

@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 May 15, 2021
@bors
Copy link
Collaborator

bors commented May 15, 2021

⌛ Trying commit c95a568 with merge 33b3829763888e5ceeb3857c70ae07e617d89472...

@bors
Copy link
Collaborator

bors commented May 15, 2021

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

@rust-timer
Copy link
Collaborator

Queued 33b3829763888e5ceeb3857c70ae07e617d89472 with parent 428636f, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (33b3829763888e5ceeb3857c70ae07e617d89472): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 15, 2021
@jackh726
Copy link
Member

Perf looks good! But going to r? @Aaron1011 (to review or reassign) since this is an area I'm unfamiliar with.

@rust-highfive rust-highfive assigned Aaron1011 and unassigned jackh726 May 15, 2021
@Mark-Simulacrum
Copy link
Member

I can take a look at this.

Mark-Simulacrum
Mark-Simulacrum reviewed May 26, 2021
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

Might be best for a separate PR so we can evaluate performance on it standalone. Otherwise r=me, feel free to include here or not.

compiler/rustc_query_impl/src/plumbing.rs
}

false
force_query::<queries::$name<'_>, _>(tcx, dep_node)
Copy link
Member

Choose a reason for hiding this comment

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

Can we directly take a function pointer to this rather than (hoping) that LLVM sees through this layer of indirection?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I get a higher-ranked subtype error when trying to take a function pointer.

Copy link
Member

Choose a reason for hiding this comment

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

Hm, that seems unfortunate. Feel free to re-run perf and/or r=me as I said.

@Mark-Simulacrum
Copy link
Member

Perf hit on rustc_query_impl compilation: 105.485 to 112.492 (6.6%) seems a bit unfortunate. I wouldn't worry about it too much but just wanted to note that here; not really clear what's responsible for it in this PR.

@Mark-Simulacrum Mark-Simulacrum 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 May 26, 2021
@cjgillot
Copy link
Contributor Author

@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 May 29, 2021
@bors
Copy link
Collaborator

bors commented May 29, 2021

⌛ Trying commit f3ed997 with merge 2556e75c882abef9a681bb59e4dd51067fa1148e...

@cjgillot cjgillot 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 May 29, 2021
@bors
Copy link
Collaborator

bors commented May 29, 2021

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

@rust-timer
Copy link
Collaborator

Queued 2556e75c882abef9a681bb59e4dd51067fa1148e with parent ff5522f, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (2556e75c882abef9a681bb59e4dd51067fa1148e): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 30, 2021
@cjgillot
Copy link
Contributor Author

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented May 30, 2021

📌 Commit f3ed997 has been approved by Mark-Simulacrum

@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 May 30, 2021
@bors
Copy link
Collaborator

bors commented May 30, 2021

⌛ Testing commit f3ed997 with merge f60a670...

@bors
Copy link
Collaborator

bors commented May 30, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing f60a670 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2021
@bors bors merged commit f60a670 into rust-lang:master May 30, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 30, 2021
@bors bors mentioned this pull request May 30, 2021
Merged
@cjgillot cjgillot deleted the query-simp branch May 30, 2021 13:02
@crlf0710 crlf0710 mentioned this pull request Jun 5, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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.
Projects
None yet
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.
8 participants
@cjgillot @rust-highfive @rust-timer @bors @jackh726 @Mark-Simulacrum @Aaron1011 @rustbot