Skip to content

Improve analysis stats legibility #7250

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 1 commit into from
Jan 11, 2021
Merged
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
37 changes: 17 additions & 20 deletions crates/rust-analyzer/src/cli/analysis_stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl AnalysisStatsCmd {
let mut db_load_sw = self.stop_watch();
let (host, vfs) = load_cargo(&self.path, self.load_output_dirs, self.with_proc_macro)?;
let db = host.raw_database();
eprintln!("Database loaded {}", db_load_sw.elapsed());
eprintln!("{:<20} {}", "Database loaded:", db_load_sw.elapsed());

let mut analysis_sw = self.stop_watch();
let mut num_crates = 0;
Expand All @@ -85,7 +85,7 @@ impl AnalysisStatsCmd {
shuffle(&mut rng, &mut visit_queue);
}

eprintln!("Crates in this dir: {}", num_crates);
eprint!(" crates: {}", num_crates);
let mut num_decls = 0;
let mut funcs = Vec::new();
while let Some(module) = visit_queue.pop() {
Expand All @@ -109,10 +109,8 @@ impl AnalysisStatsCmd {
}
}
}
eprintln!("Total modules found: {}", visited_modules.len());
eprintln!("Total declarations: {}", num_decls);
eprintln!("Total functions: {}", funcs.len());
eprintln!("Item Collection: {}", analysis_sw.elapsed());
eprintln!(", mods: {}, decls: {}, fns: {}", visited_modules.len(), num_decls, funcs.len());
eprintln!("{:<20} {}", "Item Collection:", analysis_sw.elapsed());

if self.randomize {
shuffle(&mut rng, &mut funcs);
Expand All @@ -135,7 +133,7 @@ impl AnalysisStatsCmd {
snap.0.infer(f_id.into());
})
.count();
eprintln!("Parallel Inference: {}", inference_sw.elapsed());
eprintln!("{:<20} {}", "Parallel Inference:", inference_sw.elapsed());
}

let mut inference_sw = self.stop_watch();
Expand Down Expand Up @@ -273,27 +271,22 @@ impl AnalysisStatsCmd {
bar.inc(1);
}
bar.finish_and_clear();
eprintln!("Total expressions: {}", num_exprs);
eprintln!(
"Expressions of unknown type: {} ({}%)",
" exprs: {}, ??ty: {} ({}%), ?ty: {} ({}%), !ty: {}",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not convinced that this is actually more legible 😄.

num_exprs,
num_exprs_unknown,
if num_exprs > 0 { num_exprs_unknown * 100 / num_exprs } else { 100 }
);
report_metric("unknown type", num_exprs_unknown, "#");

eprintln!(
"Expressions of partially unknown type: {} ({}%)",
percentage(num_exprs_unknown, num_exprs),
num_exprs_partially_unknown,
if num_exprs > 0 { num_exprs_partially_unknown * 100 / num_exprs } else { 100 }
percentage(num_exprs_partially_unknown, num_exprs),
num_type_mismatches
);

eprintln!("Type mismatches: {}", num_type_mismatches);
report_metric("unknown type", num_exprs_unknown, "#");
report_metric("type mismatches", num_type_mismatches, "#");

eprintln!("Inference: {}", inference_sw.elapsed());
eprintln!("{:<20} {}", "Inference:", inference_sw.elapsed());

let total_span = analysis_sw.elapsed();
eprintln!("Total: {}", total_span);
eprintln!("{:<20} {}", "Total:", total_span);
report_metric("total time", total_span.time.as_millis() as u64, "ms");
if let Some(instructions) = total_span.instructions {
report_metric("total instructions", instructions, "#instr");
Expand Down Expand Up @@ -325,3 +318,7 @@ fn shuffle<T>(rng: &mut Rand32, slice: &mut [T]) {
slice.swap(0, idx);
}
}

fn percentage(n: u64, total: u64) -> u64 {
(n * 100).checked_div(total).unwrap_or(100)
}