Skip to content

Commit

Permalink
Rollup merge of rust-lang#49069 - wesleywiser:incr_soa, r=michaelwoer…
Browse files Browse the repository at this point in the history
…ister

Convert SerializedDepGraph to be a struct-of-arrays

Fixes rust-lang#47326

I did not try the "`mem::swap()` to avoid copying the arrays" idea because that would leave the DepGraph in an incorrect state and that doesn't seem like a good idea for me.

r? @michaelwoerister
  • Loading branch information
kennytm committed Mar 22, 2018
2 parents ca54ff2 + c43b1a0 commit 50850c6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 10 deletions.
7 changes: 3 additions & 4 deletions src/librustc/dep_graph/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,8 @@ impl DepGraph {
fingerprints.resize(current_dep_graph.nodes.len(), Fingerprint::ZERO);
}

let nodes: IndexVec<_, (DepNode, Fingerprint)> =
current_dep_graph.nodes.iter_enumerated().map(|(idx, &dep_node)| {
(dep_node, fingerprints[idx])
}).collect();
let fingerprints = fingerprints.clone().convert_index_type();
let nodes = current_dep_graph.nodes.clone().convert_index_type();

let total_edge_count: usize = current_dep_graph.edges.iter()
.map(|v| v.len())
Expand All @@ -503,6 +501,7 @@ impl DepGraph {

SerializedDepGraph {
nodes,
fingerprints,
edge_list_indices,
edge_list_data,
}
Expand Down
8 changes: 4 additions & 4 deletions src/librustc/dep_graph/prev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl PreviousDepGraph {
pub fn new(data: SerializedDepGraph) -> PreviousDepGraph {
let index: FxHashMap<_, _> = data.nodes
.iter_enumerated()
.map(|(idx, &(dep_node, _))| (dep_node, idx))
.map(|(idx, &dep_node)| (dep_node, idx))
.collect();
PreviousDepGraph { data, index }
}
Expand All @@ -41,7 +41,7 @@ impl PreviousDepGraph {

#[inline]
pub fn index_to_node(&self, dep_node_index: SerializedDepNodeIndex) -> DepNode {
self.data.nodes[dep_node_index].0
self.data.nodes[dep_node_index]
}

#[inline]
Expand All @@ -58,14 +58,14 @@ impl PreviousDepGraph {
pub fn fingerprint_of(&self, dep_node: &DepNode) -> Option<Fingerprint> {
self.index
.get(dep_node)
.map(|&node_index| self.data.nodes[node_index].1)
.map(|&node_index| self.data.fingerprints[node_index])
}

#[inline]
pub fn fingerprint_by_index(&self,
dep_node_index: SerializedDepNodeIndex)
-> Fingerprint {
self.data.nodes[dep_node_index].1
self.data.fingerprints[dep_node_index]
}

pub fn node_count(&self) -> usize {
Expand Down
6 changes: 5 additions & 1 deletion src/librustc/dep_graph/serialized.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ newtype_index!(SerializedDepNodeIndex);
#[derive(Debug, RustcEncodable, RustcDecodable)]
pub struct SerializedDepGraph {
/// The set of all DepNodes in the graph
pub nodes: IndexVec<SerializedDepNodeIndex, (DepNode, Fingerprint)>,
pub nodes: IndexVec<SerializedDepNodeIndex, DepNode>,
/// The set of all Fingerprints in the graph. Each Fingerprint corresponds to
/// the DepNode at the same index in the nodes vector.
pub fingerprints: IndexVec<SerializedDepNodeIndex, Fingerprint>,
/// For each DepNode, stores the list of edges originating from that
/// DepNode. Encoded as a [start, end) pair indexing into edge_list_data,
/// which holds the actual DepNodeIndices of the target nodes.
Expand All @@ -35,6 +38,7 @@ impl SerializedDepGraph {
pub fn new() -> SerializedDepGraph {
SerializedDepGraph {
nodes: IndexVec::new(),
fingerprints: IndexVec::new(),
edge_list_indices: IndexVec::new(),
edge_list_data: Vec::new(),
}
Expand Down
7 changes: 7 additions & 0 deletions src/librustc_data_structures/indexed_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,13 @@ impl<I: Idx, T> IndexVec<I, T> {
(c1, c2)
}
}

pub fn convert_index_type<Ix: Idx>(self) -> IndexVec<Ix, T> {
IndexVec {
raw: self.raw,
_marker: PhantomData,
}
}
}

impl<I: Idx, T: Clone> IndexVec<I, T> {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/persist/save.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ fn encode_dep_graph(tcx: TyCtxt,

let mut counts: FxHashMap<_, Stat> = FxHashMap();

for (i, &(node, _)) in serialized_graph.nodes.iter_enumerated() {
for (i, &node) in serialized_graph.nodes.iter_enumerated() {
let stat = counts.entry(node.kind).or_insert(Stat {
kind: node.kind,
node_counter: 0,
Expand Down

0 comments on commit 50850c6

Please sign in to comment.