Perform HIR indexing per-owner #82681

cjgillot · 2021-03-01T22:19:42Z

The aim is to have HIR indexing more fine-grained, and to perform it for each HIR owner independently.

The subtle part is to find an owner's parent HirId.
The first few commits make it so that an owner's parent's owner is given by def_key.parent.
Then, we just need to record the nested owners inside index_hir to find the right local id.

rust-highfive · 2021-03-01T22:19:45Z

r? @lcnr

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

cjgillot · 2021-03-03T22:36:50Z

@bors try @rust-timer queue

rust-timer · 2021-03-03T22:36:51Z

Awaiting bors try build completion.

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

bors · 2021-03-03T22:37:02Z

⌛ Trying commit fa3d6e006d3018be896bd1d3079831716535894c with merge f1126bb79abbc4fd7bd3c930d171bf9f0404a2ee...

bors · 2021-03-03T23:37:33Z

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

rust-timer · 2021-03-03T23:37:35Z

Queued f1126bb79abbc4fd7bd3c930d171bf9f0404a2ee with parent 476acbf, future comparison URL.

rust-timer · 2021-03-04T03:56:16Z

Finished benchmarking try commit (f1126bb79abbc4fd7bd3c930d171bf9f0404a2ee): 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-04T18:03:03Z

@bors try @rust-timer queue

rust-timer · 2021-03-04T18:03:04Z

Awaiting bors try build completion.

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

bors · 2021-03-04T18:03:12Z

⌛ Trying commit 85adc7842d1ec908a02627cb1648aede38aa1bd6 with merge 97823b8d6cd471a09fad9755d8f9ed30cd1f51f4...

bors · 2021-03-04T19:03:42Z

☀️ Try build successful - checks-actions
Build commit: 97823b8d6cd471a09fad9755d8f9ed30cd1f51f4 (97823b8d6cd471a09fad9755d8f9ed30cd1f51f4)

rust-timer · 2021-03-04T19:03:44Z

Queued 97823b8d6cd471a09fad9755d8f9ed30cd1f51f4 with parent ec7f258, future comparison URL.

rust-timer · 2021-03-04T21:14:19Z

Finished benchmarking try commit (97823b8d6cd471a09fad9755d8f9ed30cd1f51f4): 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-05T22:38:22Z

@bors try @rust-timer queue

rust-timer · 2021-03-05T22:38:23Z

Awaiting bors try build completion.

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

klensy · 2021-08-21T12:11:34Z

compiler/rustc_middle/src/hir/map/collector.rs

+) -> Option<IndexedHir<'hir>> {
+    let item = *krate.owners.get(owner)?.as_ref()?;
+    let hash = hash_body(&mut hcx, item);
+    let mut nodes = IndexVec::new();


Suggested change

let mut nodes = IndexVec::new();

let mut nodes = IndexVec::with_capacity(1);

Similar thing here

rust/compiler/rustc_middle/src/hir/map/collector.rs

Lines 108 to 109 in e7f7fe4

let mut nodes = IndexVec::new();

nodes.push(Some(ParentedNode { parent: ItemLocalId::new(0), node: node.into() }));

But i don't think this will give observable results, really.

Dylan-DPC-zz · 2021-08-27T13:49:22Z

this is no longer blocked, as the PR is merged

bors · 2021-08-28T13:42:27Z

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

cjgillot · 2021-08-28T15:19:54Z

@bors try @rust-timer queue

rust-timer · 2021-08-28T15:19:55Z

Awaiting bors try build completion.

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

bors · 2021-08-28T15:20:01Z

⌛ Trying commit 7e7e7366c524aca8fd4a4a2d9455de438fc42338 with merge 5e429138294dd111c5314026c1f7def4a17b02e4...

bors · 2021-08-28T16:50:22Z

☀️ Try build successful - checks-actions
Build commit: 5e429138294dd111c5314026c1f7def4a17b02e4 (5e429138294dd111c5314026c1f7def4a17b02e4)

rust-timer · 2021-08-28T16:50:24Z

Queued 5e429138294dd111c5314026c1f7def4a17b02e4 with parent 05cccdc, future comparison URL.

rust-timer · 2021-08-28T19:55:00Z

Finished benchmarking try commit (5e429138294dd111c5314026c1f7def4a17b02e4): comparison url.

Summary: ERROR categorizing benchmark run!

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up.

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

bors · 2021-09-06T00:33:32Z

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

They depend on `hir_crate` and `index_hir`.

bors · 2021-09-19T19:18:38Z

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

cjgillot · 2021-09-20T19:08:17Z

Closing in favour of #89124

rust-highfive assigned lcnr Mar 1, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2021

This comment has been minimized.

Sign in to view

petrochenkov self-assigned this Mar 1, 2021

cjgillot force-pushed the incr-index branch from 5f3ab3e to 4879fe4 Compare March 1, 2021 22:52

This comment has been minimized.

Sign in to view

cjgillot force-pushed the incr-index branch from 4879fe4 to 87def82 Compare March 3, 2021 20:28

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

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

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

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

cjgillot force-pushed the incr-index branch from 85adc78 to dd06726 Compare March 5, 2021 22:28

cjgillot mentioned this pull request Aug 20, 2021

Make AST->HIR lowering incremental #88186

Closed

11 tasks

klensy reviewed Aug 21, 2021

View reviewed changes

inquisitivecrystal added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 24, 2021

cjgillot changed the title ~~[WIP] Perform HIR indexing per-owner~~ Perform HIR indexing per-owner Aug 25, 2021

Dylan-DPC-zz removed the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Aug 27, 2021

Dylan-DPC-zz 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 Aug 27, 2021

cjgillot force-pushed the incr-index branch from 6e44b88 to 7e7e736 Compare August 28, 2021 14:57

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed perf-regression Performance regression. labels Aug 28, 2021

cjgillot force-pushed the incr-index branch from 7e7e736 to ea056fe Compare August 29, 2021 20:26

Aaron1011 removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2021

cjgillot added 2 commits September 12, 2021 14:13

Make index_hir incremental.

88b1d8a

Remove eval_always for HIR queries.

b5e35c8

They depend on `hir_crate` and `index_hir`.

cjgillot force-pushed the incr-index branch from ea056fe to b5e35c8 Compare September 12, 2021 22:09

cjgillot closed this Sep 20, 2021

cjgillot deleted the incr-index branch September 20, 2021 19:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Perform HIR indexing per-owner #82681

Perform HIR indexing per-owner #82681

cjgillot commented Mar 1, 2021

rust-highfive commented Mar 1, 2021

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

cjgillot commented Mar 3, 2021

rust-timer commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

rust-timer commented Mar 3, 2021

rust-timer commented Mar 4, 2021

cjgillot commented Mar 4, 2021

rust-timer commented Mar 4, 2021

bors commented Mar 4, 2021

bors commented Mar 4, 2021

rust-timer commented Mar 4, 2021

rust-timer commented Mar 4, 2021

cjgillot commented Mar 5, 2021

rust-timer commented Mar 5, 2021

klensy Aug 21, 2021

Dylan-DPC-zz commented Aug 27, 2021

bors commented Aug 28, 2021

cjgillot commented Aug 28, 2021

rust-timer commented Aug 28, 2021

bors commented Aug 28, 2021

bors commented Aug 28, 2021

rust-timer commented Aug 28, 2021

rust-timer commented Aug 28, 2021

bors commented Sep 6, 2021

bors commented Sep 19, 2021

cjgillot commented Sep 20, 2021

	let mut nodes = IndexVec::new();
	let mut nodes = IndexVec::with_capacity(1);

	let mut nodes = IndexVec::new();
	nodes.push(Some(ParentedNode { parent: ItemLocalId::new(0), node: node.into() }));

Perform HIR indexing per-owner #82681

Perform HIR indexing per-owner #82681

Conversation

cjgillot commented Mar 1, 2021

rust-highfive commented Mar 1, 2021

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

cjgillot commented Mar 3, 2021

rust-timer commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

rust-timer commented Mar 3, 2021

rust-timer commented Mar 4, 2021

cjgillot commented Mar 4, 2021

rust-timer commented Mar 4, 2021

bors commented Mar 4, 2021

bors commented Mar 4, 2021

rust-timer commented Mar 4, 2021

rust-timer commented Mar 4, 2021

cjgillot commented Mar 5, 2021

rust-timer commented Mar 5, 2021

klensy Aug 21, 2021

Choose a reason for hiding this comment

Dylan-DPC-zz commented Aug 27, 2021

bors commented Aug 28, 2021

cjgillot commented Aug 28, 2021

rust-timer commented Aug 28, 2021

bors commented Aug 28, 2021

bors commented Aug 28, 2021

rust-timer commented Aug 28, 2021

rust-timer commented Aug 28, 2021

bors commented Sep 6, 2021

bors commented Sep 19, 2021

cjgillot commented Sep 20, 2021