mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store a index per dep node kind

Browse Source
This commit is contained in:
John Kåre Alsaker 2023-09-10 13:56:23 +02:00
parent 366dab13f7
commit 8c5bc990cc
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/rustc_query_system/src/dep_graph/serialized.rs
View File

@ -46,6 +46,7 @@
use rustc_index::{Idx, IndexVec}; use rustc_index::{Idx, IndexVec};
use rustc_serialize::opaque::{FileEncodeResult, FileEncoder, IntEncodedWithFixedSize, MemDecoder}; use rustc_serialize::opaque::{FileEncodeResult, FileEncoder, IntEncodedWithFixedSize, MemDecoder};
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder}; use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
use std::iter;
use std::marker::PhantomData; use std::marker::PhantomData;
// The maximum value of `SerializedDepNodeIndex` leaves the upper two bits // The maximum value of `SerializedDepNodeIndex` leaves the upper two bits
@ -81,8 +82,9 @@ pub struct SerializedDepGraph<K: DepKind> {
/// A flattened list of all edge targets in the graph, stored in the same /// A flattened list of all edge targets in the graph, stored in the same
/// varint encoding that we use on disk. Edge sources are implicit in edge_list_indices. /// varint encoding that we use on disk. Edge sources are implicit in edge_list_indices.
edge_list_data: Vec<u8>, edge_list_data: Vec<u8>,
/// Reciprocal map to `nodes`. /// Stores a map from fingerprints to nodes per dep node kind.
index: FxHashMap<DepNode<K>, SerializedDepNodeIndex>, /// This is the reciprocal of `nodes`.
index: Vec<FxHashMap<PackedFingerprint, SerializedDepNodeIndex>>,
} }
impl<K: DepKind> Default for SerializedDepGraph<K> { impl<K: DepKind> Default for SerializedDepGraph<K> {
@ -137,7 +139,7 @@ pub fn index_to_node(&self, dep_node_index: SerializedDepNodeIndex) -> DepNode<K
#[inline] #[inline]
pub fn node_to_index_opt(&self, dep_node: &DepNode<K>) -> Option<SerializedDepNodeIndex> { pub fn node_to_index_opt(&self, dep_node: &DepNode<K>) -> Option<SerializedDepNodeIndex> {
self.index.get(dep_node).cloned() self.index.get(dep_node.kind.to_u16() as usize)?.get(&dep_node.hash).cloned()
} }
#[inline] #[inline]
@ -147,7 +149,7 @@ pub fn fingerprint_by_index(&self, dep_node_index: SerializedDepNodeIndex) -> Fi
#[inline] #[inline]
pub fn node_count(&self) -> usize { pub fn node_count(&self) -> usize {
self.index.len() self.nodes.len()
} }
} }
@ -220,7 +222,8 @@ fn decode(d: &mut MemDecoder<'a>) -> SerializedDepGraph<K> {
for _index in 0..node_count { for _index in 0..node_count {
// Decode the header for this edge; the header packs together as many of the fixed-size // Decode the header for this edge; the header packs together as many of the fixed-size
// fields as possible to limit the number of times we update decoder state. // fields as possible to limit the number of times we update decoder state.
let node_header = SerializedNodeHeader { bytes: d.read_array(), _marker: PhantomData }; let node_header =
SerializedNodeHeader::<K> { bytes: d.read_array(), _marker: PhantomData };
let _i: SerializedDepNodeIndex = nodes.push(node_header.node()); let _i: SerializedDepNodeIndex = nodes.push(node_header.node());
debug_assert_eq!(_i.index(), _index); debug_assert_eq!(_i.index(), _index);
@ -251,8 +254,12 @@ fn decode(d: &mut MemDecoder<'a>) -> SerializedDepGraph<K> {
// end of the array. This padding ensure it doesn't. // end of the array. This padding ensure it doesn't.
edge_list_data.extend(&[0u8; DEP_NODE_PAD]); edge_list_data.extend(&[0u8; DEP_NODE_PAD]);
let index: FxHashMap<_, _> = let mut index: Vec<_> =
nodes.iter_enumerated().map(|(idx, &dep_node)| (dep_node, idx)).collect(); iter::repeat(FxHashMap::default()).take(K::MAX as usize + 1).collect();
for (idx, node) in nodes.iter_enumerated() {
index[node.kind.to_u16() as usize].insert(node.hash, idx);
}
SerializedDepGraph { nodes, fingerprints, edge_list_indices, edge_list_data, index } SerializedDepGraph { nodes, fingerprints, edge_list_indices, edge_list_data, index }
} }