a7817dd52c
This commit alters the `query` function in the dep graph module to preallocate memory using `with_capacity` instead of relying on automatic growth. Discovered in #44576 it was found that for the syntex_syntax clean incremental benchmark the peak memory usage was found when the dep graph was being saved, particularly the `DepGraphQuery` data structure itself. PRs like #44142 which add more queries end up just making this much larger! I didn't see an immediately obvious way to reduce the size of the `DepGraphQuery` object, but it turns out that `with_capacity` helps quite a bit! Locally 831 MB was used [before] this commit, and 770 MB is in use at the peak of the compiler [after] this commit. That's a nice 7.5% improvement! This won't quite make up for the losses in #44142 but I figured it's a good start. [before]: https://gist.github.com/alexcrichton/2d2b9c7a65503761925c5a0bcfeb0d1e [before]: https://gist.github.com/alexcrichton/6da51f2a6184bfb81694cc44f06deb5b
94 lines
3 KiB
Rust
94 lines
3 KiB
Rust
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
use rustc_data_structures::fx::FxHashMap;
|
|
use rustc_data_structures::graph::{Direction, INCOMING, Graph, NodeIndex, OUTGOING};
|
|
|
|
use super::DepNode;
|
|
|
|
pub struct DepGraphQuery {
|
|
pub graph: Graph<DepNode, ()>,
|
|
pub indices: FxHashMap<DepNode, NodeIndex>,
|
|
}
|
|
|
|
impl DepGraphQuery {
|
|
pub fn new(nodes: &[DepNode],
|
|
edges: &[(DepNode, DepNode)])
|
|
-> DepGraphQuery {
|
|
let mut graph = Graph::with_capacity(nodes.len(), edges.len());
|
|
let mut indices = FxHashMap();
|
|
for node in nodes {
|
|
indices.insert(node.clone(), graph.add_node(node.clone()));
|
|
}
|
|
|
|
for &(ref source, ref target) in edges {
|
|
let source = indices[source];
|
|
let target = indices[target];
|
|
graph.add_edge(source, target, ());
|
|
}
|
|
|
|
DepGraphQuery {
|
|
graph,
|
|
indices,
|
|
}
|
|
}
|
|
|
|
pub fn contains_node(&self, node: &DepNode) -> bool {
|
|
self.indices.contains_key(&node)
|
|
}
|
|
|
|
pub fn nodes(&self) -> Vec<&DepNode> {
|
|
self.graph.all_nodes()
|
|
.iter()
|
|
.map(|n| &n.data)
|
|
.collect()
|
|
}
|
|
|
|
pub fn edges(&self) -> Vec<(&DepNode,&DepNode)> {
|
|
self.graph.all_edges()
|
|
.iter()
|
|
.map(|edge| (edge.source(), edge.target()))
|
|
.map(|(s, t)| (self.graph.node_data(s),
|
|
self.graph.node_data(t)))
|
|
.collect()
|
|
}
|
|
|
|
fn reachable_nodes(&self, node: &DepNode, direction: Direction) -> Vec<&DepNode> {
|
|
if let Some(&index) = self.indices.get(node) {
|
|
self.graph.depth_traverse(index, direction)
|
|
.map(|s| self.graph.node_data(s))
|
|
.collect()
|
|
} else {
|
|
vec![]
|
|
}
|
|
}
|
|
|
|
/// All nodes reachable from `node`. In other words, things that
|
|
/// will have to be recomputed if `node` changes.
|
|
pub fn transitive_successors(&self, node: &DepNode) -> Vec<&DepNode> {
|
|
self.reachable_nodes(node, OUTGOING)
|
|
}
|
|
|
|
/// All nodes that can reach `node`.
|
|
pub fn transitive_predecessors(&self, node: &DepNode) -> Vec<&DepNode> {
|
|
self.reachable_nodes(node, INCOMING)
|
|
}
|
|
|
|
/// Just the outgoing edges from `node`.
|
|
pub fn immediate_successors(&self, node: &DepNode) -> Vec<&DepNode> {
|
|
if let Some(&index) = self.indices.get(&node) {
|
|
self.graph.successor_nodes(index)
|
|
.map(|s| self.graph.node_data(s))
|
|
.collect()
|
|
} else {
|
|
vec![]
|
|
}
|
|
}
|
|
}
|