Skip to content

[incremental] Collect stats about duplicated edge reads from queries #46068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/librustc/dep_graph/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,12 @@ impl DepGraph {
self.data.as_ref().and_then(|t| t.dep_node_debug.borrow().get(&dep_node).cloned())
}

pub fn edge_deduplication_data(&self) -> (u64, u64) {
let current_dep_graph = self.data.as_ref().unwrap().current.borrow();

(current_dep_graph.total_read_count, current_dep_graph.total_duplicate_read_count)
}

pub fn serialize(&self) -> SerializedDepGraph {
let fingerprints = self.fingerprints.borrow();
let current_dep_graph = self.data.as_ref().unwrap().current.borrow();
Expand Down Expand Up @@ -737,6 +743,9 @@ pub(super) struct CurrentDepGraph {
// each anon node. The session-key is just a random number generated when
// the DepGraph is created.
anon_id_seed: Fingerprint,

total_read_count: u64,
total_duplicate_read_count: u64,
}

impl CurrentDepGraph {
Expand Down Expand Up @@ -770,6 +779,8 @@ impl CurrentDepGraph {
anon_id_seed: stable_hasher.finish(),
task_stack: Vec::new(),
forbidden_edge,
total_read_count: 0,
total_duplicate_read_count: 0,
}
}

Expand Down Expand Up @@ -900,6 +911,7 @@ impl CurrentDepGraph {
ref mut read_set,
node: ref target,
}) => {
self.total_read_count += 1;
if read_set.insert(source) {
reads.push(source);

Expand All @@ -913,6 +925,8 @@ impl CurrentDepGraph {
}
}
}
} else {
self.total_duplicate_read_count += 1;
}
}
Some(&mut OpenTask::Anon {
Expand Down
4 changes: 4 additions & 0 deletions src/librustc_incremental/persist/save.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ fn encode_dep_graph(tcx: TyCtxt,

let total_node_count = serialized_graph.nodes.len();
let total_edge_count = serialized_graph.edge_list_data.len();
let (total_edge_reads, total_duplicate_edge_reads) =
tcx.dep_graph.edge_deduplication_data();

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

Expand Down Expand Up @@ -226,6 +228,8 @@ fn encode_dep_graph(tcx: TyCtxt,
println!("[incremental]");
println!("[incremental] Total Node Count: {}", total_node_count);
println!("[incremental] Total Edge Count: {}", total_edge_count);
println!("[incremental] Total Edge Reads: {}", total_edge_reads);
println!("[incremental] Total Duplicate Edge Reads: {}", total_duplicate_edge_reads);
println!("[incremental]");
println!("[incremental] {:<36}| {:<17}| {:<12}| {:<17}|",
"Node Kind",
Expand Down