Skip to content
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.

Sign up for GitHub

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

fix: display order in AST stats #180

Merged
merged 1 commit into from
Jan 5, 2025
Merged

fix: display order in AST stats #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions crates/sema/src/stats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ impl NodeStats {
fn new() -> Self {
Self { count: 0, size: 0 }
}

fn accum_size(&self) -> usize {
self.count * self.size
}
}

struct Node {
Expand Down Expand Up @@ -80,9 +84,9 @@ impl StatCollector {

fn print(&self, title: &str, prefix: &str) {
let mut nodes: Vec<_> = self.nodes.iter().collect();
nodes.sort_by_key(|(_, node)| node.stats.count * node.stats.size);
nodes.sort_by_cached_key(|(label, node)| (node.stats.accum_size(), label.to_string()));

let total_size = nodes.iter().map(|(_, node)| node.stats.count * node.stats.size).sum();
let total_size = nodes.iter().map(|(_, node)| node.stats.accum_size()).sum();

eprintln!("{prefix} {title}");
eprintln!(
Expand All @@ -94,7 +98,7 @@ impl StatCollector {
let percent = |m, n| (m * 100) as f64 / n as f64;

for (label, node) in nodes {
let size = node.stats.count * node.stats.size;
let size = node.stats.accum_size();
eprintln!(
"{} {:<18}{:>10} ({:4.1}%){:>14}{:>14}",
prefix,
Expand All @@ -106,10 +110,12 @@ impl StatCollector {
);
if !node.subnodes.is_empty() {
let mut subnodes: Vec<_> = node.subnodes.iter().collect();
subnodes.sort_by_key(|(_, subnode)| subnode.count * subnode.size);
subnodes.sort_by_cached_key(|(label, subnode)| {
(subnode.accum_size(), label.to_string())
});

for (label, subnode) in subnodes {
let size = subnode.count * subnode.size;
let size = subnode.accum_size();
eprintln!(
"{} - {:<16}{:>10} ({:4.1}%){:>14}",
prefix,
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/stats/ast.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ ast-stats - Unary 48 ( 2.6%) 1
ast-stats - Ident 144 ( 7.9%) 3
ast-stats ItemFunction 240 (13.1%) 2 120
ast-stats Item 720 (39.4%) 5 144
ast-stats - Variable 144 ( 7.9%) 1
ast-stats - Contract 144 ( 7.9%) 1
ast-stats - Pragma 144 ( 7.9%) 1
ast-stats - Variable 144 ( 7.9%) 1
ast-stats - Function 288 (15.8%) 2
ast-stats ----------------------------------------------------------------
ast-stats Total 1_828
Expand Down
Loading