Move HIR parenting information out of hir_owner by cjgillot · Pull Request #83114 · rust-lang/rust

cjgillot · 2021-03-14T14:29:46Z

Split out of #82681.

The parent of a HIR node and its content are currently bundled together, but are rarely used together.
This PR separates both information in two distinct queries for HIR owners.
This reduces incremental invalidation for HIR items that appear within a function body when this body (and the local ids) changes.

cjgillot · 2021-03-14T14:34:11Z

@bors try @rust-timer queue

rust-timer · 2021-03-14T14:34:12Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2021-03-14T14:34:19Z

⌛ Trying commit c7c7d09b0353f3497678ac8ec32cad918b81f837 with merge 2f4b1b626e8b2095543ef80fa81b59c78514040c...

bors · 2021-03-14T15:22:57Z

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

rust-timer · 2021-03-14T15:22:58Z

Queued 2f4b1b626e8b2095543ef80fa81b59c78514040c with parent 84c08f8, future comparison URL.

rust-timer · 2021-03-14T20:36:22Z

Finished benchmarking try commit (2f4b1b626e8b2095543ef80fa81b59c78514040c): 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

cjgillot · 2021-03-16T17:11:34Z

rustbot did not assign anybody.
r? @petrochenkov

petrochenkov · 2021-03-16T20:49:39Z

I think it's better to r? @michaelwoerister on this.
Also cc @eddyb who had opinions on HIR parenting, IIRC.

bors · 2021-03-17T11:12:43Z

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

eddyb · 2021-03-18T20:28:58Z

This seems fine to me, I think, if it's not a significant performance loss.

bors · 2021-03-25T19:53:01Z

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

bors · 2021-03-29T22:44:15Z

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

bors · 2021-04-29T17:51:43Z

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

eddyb

r=me (not 100% on the incremental aspects, but it looks like the bulk of the changes account for the reshuffling of the data representation, and shouldn't change behavior outside of increasing incremental precision)

varkor · 2021-05-01T17:42:44Z

@bors r=eddyb

bors · 2021-05-01T17:42:45Z

📌 Commit d794cb0 has been approved by eddyb

Aaron1011 · 2021-05-01T17:56:40Z

It looks like this is a regression on several benchmarks - is there anything that can be done about that?

bors · 2021-05-01T18:03:29Z

⌛ Testing commit d794cb0 with merge 6e2a344...

bors · 2021-05-01T20:31:33Z

☀️ Test successful - checks-actions
Approved by: eddyb
Pushing 6e2a344 to master...

eddyb · 2021-05-03T12:16:11Z

It looks like this is a regression on several benchmarks - is there anything that can be done about that?

Oh sheesh, I completely missed that, sorry. Maybe nominate for discussion? I don't have a strong opinion, I just didn't see it.

Store all HIR owners in the same container This replaces the previous storage in a BTreeMap for each of Item/ImplItem/TraitItem/ForeignItem. This should allow for a more compact storage. Based on rust-lang#83114

Store all HIR owners in the same container This replaces the previous storage in a BTreeMap for each of Item/ImplItem/TraitItem/ForeignItem. This should allow for a more compact storage. Based on rust-lang/rust#83114

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 14, 2021

This comment has been minimized.
Sign in to view

rustbot added 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 Mar 14, 2021

cjgillot force-pushed the hop branch 2 times, most recently from ec39552 to aa95531Compare March 14, 2021 21:10

rust-highfive assigned petrochenkov Mar 16, 2021

rust-highfive assigned michaelwoerister and unassigned petrochenkov Mar 16, 2021

cjgillot force-pushed the hop branch from aa95531 to 5c6769cCompare March 17, 2021 16:39

eddyb reviewed Mar 18, 2021
View reviewed changes

cjgillot mentioned this pull request Mar 20, 2021
Perform HIR indexing per-owner #82681
Closed

cjgillot force-pushed the hop branch 2 times, most recently from 8b8f666 to 6ee60e6Compare March 28, 2021 17:14

cjgillot force-pushed the hop branch from 6ee60e6 to 078866fCompare March 30, 2021 16:21

cjgillot mentioned this pull request Mar 31, 2021
Store all HIR owners in the same container #83723
Merged

cjgillot force-pushed the hop branch 2 times, most recently from b56c313 to beea995Compare April 3, 2021 20:11

cjgillot added 6 commits April 29, 2021 21:26

Make current_hir_id_owner a simple tuple.
5530045

Split crate_hash from index_hir.
323f5b2

Remove parent_node.
2d341e1

Do not compute entry parent when not required.
99d3798

Move parenting info to index_hir.
18bffdb

Introduce a hir_owner_parent query.
d794cb0

eddyb approved these changes Apr 30, 2021
View reviewed changes

cjgillot force-pushed the hop branch from 6d56603 to d794cb0Compare April 30, 2021 17:24

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 1, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label May 1, 2021

bors merged commit 6e2a344 into rust-lang:masterMay 1, 2021

rustbot added this to the 1.54.0 milestone May 1, 2021

This was referenced May 1, 2021
Encode spans relative to the enclosing item #84373
Merged
Add hir::GenericArg::Infer #83484
Merged

cjgillot deleted the hop branch May 1, 2021 22:16

JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2021

Uh oh!

Uh oh!

Conversation

cjgillot commented Mar 14, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cjgillot commented Mar 14, 2021

Uh oh!

rust-timer commented Mar 14, 2021

Uh oh!

bors commented Mar 14, 2021

Uh oh!

This comment has been minimized.

bors commented Mar 14, 2021

Uh oh!

rust-timer commented Mar 14, 2021

Uh oh!

rust-timer commented Mar 14, 2021

Uh oh!

cjgillot commented Mar 16, 2021

Uh oh!

petrochenkov commented Mar 16, 2021

Uh oh!

bors commented Mar 17, 2021

Uh oh!

eddybMar 18, 2021

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 25, 2021

Uh oh!

bors commented Mar 29, 2021

Uh oh!

bors commented Apr 29, 2021

Uh oh!

eddyb left a comment

Choose a reason for hiding this comment

Uh oh!

varkor commented May 1, 2021

Uh oh!

bors commented May 1, 2021

Uh oh!

Aaron1011 commented May 1, 2021

Uh oh!

bors commented May 1, 2021

Uh oh!

bors commented May 1, 2021

Uh oh!

eddyb commented May 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

cjgillot commented Mar 14, 2021•
edited
Loading