chore: fold without costs

Author: not-matthias

callgrind-utils/src/flamegraph.rs

@@ -13,6 +13,14 @@ const MIN_BUDGET: f64 = 1.0;
 const MIN_BUDGET_FRACTION: f64 = 0.0005;
 
 impl CallGraph {
+    pub fn to_folded_without_costs(&self) -> Vec<String> {
+        self.to_folded().iter().map(|line| {
+            let mut parts = line.split_whitespace();
+            let stack = parts.next().unwrap_or_default();
+            format!("{stack} <cost>")
+        }).collect()
+    }
+    
     pub fn to_folded(&self) -> Vec<String> {
         let graph = self.inner.graph.borrow();
         let indices: Vec<NodeIndex> = graph.node_indices().collect();
@@ -177,7 +185,7 @@ fn fold_dfs(
     stack.pop();
 }
 
-fn fold_line(stack: &[usize], names: &[&str], count: u64) -> String {
+fn fold_line(stack: &[usize], names: &[&str], _count: u64) -> String {
     let mut line = String::new();
     for (i, &idx) in stack.iter().enumerate() {
         if i > 0 {
@@ -186,6 +194,6 @@ fn fold_line(stack: &[usize], names: &[&str], count: u64) -> String {
         line.push_str(names[idx]);
     }
     line.push(' ');
-    line.push_str(&count.to_string());
+    line.push('1');
     line
 }

callgrind-utils/tests/snapshot.rs

@@ -121,7 +121,7 @@ fn fixture_canonical_json(#[case] stem: &str) {
     graph
         .to_flamegraph_file(format!("{stem}.partial.svg"))
         .unwrap();
-    insta::assert_snapshot!(format!("{stem}_folded"), graph.to_folded().join("\n"));
+    insta::assert_snapshot!(format!("{stem}_folded"), graph.to_folded_without_costs().join("\n"));
 
     let json = graph.to_json().expect("to_json");
 
@@ -152,7 +152,7 @@ fn fixture_full_trace(#[case] stem: &str) {
         .to_flamegraph_file(format!("{stem}.full.svg"))
         .unwrap();
 
-    insta::assert_snapshot!(format!("{stem}_full_folded"), graph.to_folded().join("\n"));
+    insta::assert_snapshot!(format!("{stem}_full_folded"), graph.to_folded_without_costs().join("\n"));
 
     let json = graph.redact().to_json().expect("to_json");
     insta::assert_snapshot!(format!("{stem}_full__json"), json);

callgrind-utils/tests/snapshots/snapshot__chain_folded.snap

@@ -1,8 +1,8 @@
 ---
 source: tests/snapshot.rs
-expression: "graph.to_folded().join(\"\\n\")"
+expression: "graph.to_folded_without_costs().join(\"\\n\")"
 ---
-main 18
-main;a 10
-main;a;b 10
-main;a;b;c 7
+main <cost>
+main;a <cost>
+main;a;b <cost>
+main;a;b;c <cost>

callgrind-utils/tests/snapshots/snapshot__chain_full_folded.snap

@@ -1,8 +1,8 @@
 ---
 source: tests/snapshot.rs
-expression: "graph.to_folded().join(\"\\n\")"
+expression: "graph.to_folded_without_costs().join(\"\\n\")"
 ---
-main 18
-main;a 10
-main;a;b 10
-main;a;b;c 7
+main <cost>
+main;a <cost>
+main;a;b <cost>
+main;a;b;c <cost>

callgrind-utils/tests/snapshots/snapshot__diamond_folded.snap

@@ -1,10 +1,10 @@
 ---
 source: tests/snapshot.rs
-expression: "graph.to_folded().join(\"\\n\")"
+expression: "graph.to_folded_without_costs().join(\"\\n\")"
 ---
-main 18
-main;top 16
-main;top;left 10
-main;top;left;bottom 7
-main;top;right 10
-main;top;right;bottom 7
+main <cost>
+main;top <cost>
+main;top;left <cost>
+main;top;left;bottom <cost>
+main;top;right <cost>
+main;top;right;bottom <cost>

callgrind-utils/tests/snapshots/snapshot__diamond_full_folded.snap

@@ -1,10 +1,10 @@
 ---
 source: tests/snapshot.rs
-expression: "graph.to_folded().join(\"\\n\")"
+expression: "graph.to_folded_without_costs().join(\"\\n\")"
 ---
-main 18
-main;top 16
-main;top;left 10
-main;top;left;bottom 7
-main;top;right 10
-main;top;right;bottom 7
+main <cost>
+main;top <cost>
+main;top;left <cost>
+main;top;left;bottom <cost>
+main;top;right <cost>
+main;top;right;bottom <cost>

callgrind-utils/tests/snapshots/snapshot__fractal_folded.snap

@@ -1,55 +1,55 @@
 ---
 source: tests/snapshot.rs
-expression: "graph.to_folded().join(\"\\n\")"
+expression: "graph.to_folded_without_costs().join(\"\\n\")"
 ---
-run_measured 17
-run_measured;complex_fractal_benchmark 217
-run_measured;complex_fractal_benchmark;build_fractal 92
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2 5317
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;pool_alloc 2670
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_child_value 4259
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;build_fractal'2 73824
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash 3694
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash;compute_tree_hash'2 6357
-run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 12406
-run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash 2811
-run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash;compute_tree_hash'2 4838
-run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 9440
-run_measured;complex_fractal_benchmark;analyze_fractal_tree 86
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum 56
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum;recursive_sum'2 2645
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum;recursive_sum'2;recursive_sum'2 8206
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes 53
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes;count_nodes'2 2407
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes;count_nodes'2;count_nodes'2 7355
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum 71
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum;max_path_sum'2 3014
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum;max_path_sum'2;max_path_sum'2 8851
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves 52
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves;collect_leaves'2 2559
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves;collect_leaves'2;collect_leaves'2 8055
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_variance 6349
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2 97
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum 75
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum;recursive_sum'2 3527
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum;recursive_sum'2;recursive_sum'2 10942
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes 71
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes;count_nodes'2 3210
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes;count_nodes'2;count_nodes'2 9807
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum 95
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum;max_path_sum'2 4019
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum;max_path_sum'2;max_path_sum'2 11802
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves 69
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves;collect_leaves'2 3412
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves;collect_leaves'2;collect_leaves'2 10741
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;compute_variance 8466
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;analyze_fractal_tree'2 33290
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_complexity_score 21
-run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_complexity_score;recursive_path_score 33
-run_measured;complex_fractal_benchmark;fibonacci_memo 42
-run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2 128
-run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2;fibonacci_memo'2 1376
-run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2;fibonacci_memo'2 46
-run_measured;complex_fractal_benchmark;compute_tree_hash 2811
-run_measured;complex_fractal_benchmark;compute_tree_hash;compute_tree_hash'2 4838
-run_measured;complex_fractal_benchmark;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 9440
+run_measured <cost>
+run_measured;complex_fractal_benchmark <cost>
+run_measured;complex_fractal_benchmark;build_fractal <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2 <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;pool_alloc <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_child_value <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;build_fractal'2 <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash;compute_tree_hash'2 <cost>
+run_measured;complex_fractal_benchmark;build_fractal;build_fractal'2;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 <cost>
+run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash <cost>
+run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash;compute_tree_hash'2 <cost>
+run_measured;complex_fractal_benchmark;build_fractal;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum;recursive_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;recursive_sum;recursive_sum'2;recursive_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes;count_nodes'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;count_nodes;count_nodes'2;count_nodes'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum;max_path_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;max_path_sum;max_path_sum'2;max_path_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves;collect_leaves'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;collect_leaves;collect_leaves'2;collect_leaves'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_variance <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum;recursive_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;recursive_sum;recursive_sum'2;recursive_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes;count_nodes'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;count_nodes;count_nodes'2;count_nodes'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum;max_path_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;max_path_sum;max_path_sum'2;max_path_sum'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves;collect_leaves'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;collect_leaves;collect_leaves'2;collect_leaves'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;compute_variance <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;analyze_fractal_tree'2;analyze_fractal_tree'2 <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_complexity_score <cost>
+run_measured;complex_fractal_benchmark;analyze_fractal_tree;compute_complexity_score;recursive_path_score <cost>
+run_measured;complex_fractal_benchmark;fibonacci_memo <cost>
+run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2 <cost>
+run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2;fibonacci_memo'2 <cost>
+run_measured;complex_fractal_benchmark;fibonacci_memo;fibonacci_memo'2;fibonacci_memo'2 <cost>
+run_measured;complex_fractal_benchmark;compute_tree_hash <cost>
+run_measured;complex_fractal_benchmark;compute_tree_hash;compute_tree_hash'2 <cost>
+run_measured;complex_fractal_benchmark;compute_tree_hash;compute_tree_hash'2;compute_tree_hash'2 <cost>