From 396aeb83c0bbb495e4cf1feb3a6dead8e9ce6972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Mon, 10 Feb 2020 17:00:49 +0100 Subject: [PATCH] Optimize the HIR map --- src/librustc/hir/map/collector.rs | 70 ++++++++++++++++--------------- src/librustc/hir/map/mod.rs | 18 ++++---- src/librustc/hir/mod.rs | 7 ++-- 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs index 58f755693f7a..da2a8c05af5e 100644 --- a/src/librustc/hir/map/collector.rs +++ b/src/librustc/hir/map/collector.rs @@ -1,6 +1,6 @@ use crate::arena::Arena; use crate::hir::map::definitions::{self, DefPathHash}; -use crate::hir::map::{Entry, Map}; +use crate::hir::map::{Entry, HirOwnerData, Map}; use crate::hir::{HirItem, HirOwner, HirOwnerItems}; use crate::ich::StableHashingContext; use crate::middle::cstore::CrateStore; @@ -14,7 +14,7 @@ use rustc_hir::def_id::CRATE_DEF_INDEX; use rustc_hir::def_id::{CrateNum, DefIndex, LOCAL_CRATE}; use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc_hir::*; -use rustc_index::vec::IndexVec; +use rustc_index::vec::{Idx, IndexVec}; use rustc_session::{CrateDisambiguator, Session}; use rustc_span::source_map::SourceMap; use rustc_span::{Span, Symbol, DUMMY_SP}; @@ -31,8 +31,7 @@ pub(super) struct NodeCollector<'a, 'hir> { /// Source map source_map: &'a SourceMap, - owner_map: FxHashMap>, - owner_items_map: FxHashMap>, + map: IndexVec>, /// The parent of this node parent_node: hir::HirId, @@ -49,6 +48,15 @@ pub(super) struct NodeCollector<'a, 'hir> { hir_body_nodes: Vec<(DefPathHash, Fingerprint)>, } +fn insert_vec_map(map: &mut IndexVec>, k: K, v: V) { + let i = k.index(); + let len = map.len(); + if i >= len { + map.extend(repeat(None).take(i - len + 1)); + } + map[k] = Some(v); +} + fn hash( hcx: &mut StableHashingContext<'_>, input: impl for<'a> HashStable>, @@ -126,14 +134,9 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> { hir_to_node_id, hcx, hir_body_nodes, - owner_map: FxHashMap::with_capacity_and_hasher( - definitions.def_index_count(), - Default::default(), - ), - owner_items_map: FxHashMap::with_capacity_and_hasher( - definitions.def_index_count(), - Default::default(), - ), + map: (0..definitions.def_index_count()) + .map(|_| HirOwnerData { signature: None, with_bodies: None }) + .collect(), }; collector.insert_entry( hir::CRATE_HIR_ID, @@ -149,14 +152,10 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> { crate_disambiguator: CrateDisambiguator, cstore: &dyn CrateStore, commandline_args_hash: u64, - ) -> ( - FxHashMap>, - FxHashMap>, - Svh, - ) { + ) -> (IndexVec>, Svh) { // Insert bodies into the map for (id, body) in self.krate.bodies.iter() { - let bodies = &mut self.owner_items_map.get_mut(&id.hir_id.owner).unwrap().bodies; + let bodies = &mut self.map[id.hir_id.owner].with_bodies.as_mut().unwrap().bodies; assert!(bodies.insert(id.hir_id.local_id, body).is_none()); } @@ -196,39 +195,42 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> { let crate_hash: Fingerprint = stable_hasher.finish(); let svh = Svh::new(crate_hash.to_smaller_hash()); - (self.owner_map, self.owner_items_map, svh) + (self.map, svh) } fn insert_entry(&mut self, id: HirId, entry: Entry<'hir>, hash: Fingerprint) { let i = id.local_id.as_u32() as usize; - let owner = HirOwner { parent: entry.parent, node: entry.node }; - let arena = self.arena; - let items = self.owner_items_map.entry(id.owner).or_insert_with(|| { - arena.alloc(HirOwnerItems { + let data = &mut self.map[id.owner]; + + if data.with_bodies.is_none() { + data.with_bodies = Some(arena.alloc(HirOwnerItems { hash, items: IndexVec::new(), bodies: FxHashMap::default(), - }) - }); + })); + } + + let items = data.with_bodies.as_mut().unwrap(); if i == 0 { // Overwrite the dummy hash with the real HIR owner hash. items.hash = hash; - self.owner_map.insert(id.owner, self.arena.alloc(owner)); - // FIXME: feature(impl_trait_in_bindings) broken and trigger this assert - //assert!(self.owner_map.insert(id.owner, self.arena.alloc(owner)).is_none()); + // FIXME: feature(impl_trait_in_bindings) broken and trigger this assert + //assert!(data.signature.is_none()); + + data.signature = + Some(self.arena.alloc(HirOwner { parent: entry.parent, node: entry.node })); } else { - let len = items.items.len(); - if i >= len { - items.items.extend(repeat(None).take(i - len + 1)); - } assert_eq!(entry.parent.owner, id.owner); - items.items[id.local_id] = - Some(HirItem { parent: entry.parent.local_id, node: entry.node }); + insert_vec_map( + &mut items.items, + id.local_id, + HirItem { parent: entry.parent.local_id, node: entry.node }, + ); } } diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs index 8b13f008a89d..3bdd2b1ac3ca 100644 --- a/src/librustc/hir/map/mod.rs +++ b/src/librustc/hir/map/mod.rs @@ -15,6 +15,7 @@ use rustc_hir::intravisit; use rustc_hir::itemlikevisit::ItemLikeVisitor; use rustc_hir::print::Nested; use rustc_hir::*; +use rustc_index::vec::IndexVec; use rustc_span::hygiene::MacroKind; use rustc_span::source_map::Spanned; use rustc_span::symbol::kw; @@ -128,12 +129,16 @@ fn is_body_owner<'hir>(node: Node<'hir>, hir_id: HirId) -> bool { } } +pub(super) struct HirOwnerData<'hir> { + pub(super) signature: Option<&'hir HirOwner<'hir>>, + pub(super) with_bodies: Option<&'hir mut HirOwnerItems<'hir>>, +} + pub struct IndexedHir<'hir> { /// The SVH of the local crate. pub crate_hash: Svh, - pub(super) owner_map: FxHashMap>, - pub(super) owner_items_map: FxHashMap>, + pub(super) map: IndexVec>, /// The reverse mapping of `node_to_hir_id`. pub(super) hir_to_node_id: FxHashMap, @@ -1036,7 +1041,7 @@ pub(super) fn index_hir<'tcx>(tcx: TyCtxt<'tcx>, cnum: CrateNum) -> &'tcx Indexe .map(|(node_id, &hir_id)| (hir_id, node_id)) .collect(); - let (owner_map, owner_items_map, crate_hash) = { + let (map, crate_hash) = { let hcx = tcx.create_stable_hashing_context(); let mut collector = NodeCollector::root( @@ -1054,12 +1059,7 @@ pub(super) fn index_hir<'tcx>(tcx: TyCtxt<'tcx>, cnum: CrateNum) -> &'tcx Indexe collector.finalize_and_compute_crate_hash(crate_disambiguator, &*tcx.cstore, cmdline_args) }; - let map = tcx.arena.alloc(IndexedHir { - crate_hash, - owner_map, - owner_items_map: owner_items_map.into_iter().map(|(k, v)| (k, &*v)).collect(), - hir_to_node_id, - }); + let map = tcx.arena.alloc(IndexedHir { crate_hash, map, hir_to_node_id }); map } diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index c5e2c847b0dd..3b69fc8d8f2a 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -78,8 +78,9 @@ pub fn provide(providers: &mut Providers<'_>) { let module = hir.as_local_hir_id(id).unwrap(); &tcx.untracked_crate.modules[&module] }; - providers.hir_owner = |tcx, id| *tcx.index_hir(id.krate).owner_map.get(&id.index).unwrap(); - providers.hir_owner_items = - |tcx, id| *tcx.index_hir(id.krate).owner_items_map.get(&id.index).unwrap(); + providers.hir_owner = |tcx, id| tcx.index_hir(id.krate).map[id.index].signature.unwrap(); + providers.hir_owner_items = |tcx, id| { + tcx.index_hir(id.krate).map[id.index].with_bodies.as_ref().map(|items| &**items).unwrap() + }; map::provide(providers); }