Add --breakdown flag and fix SDE

Author: kaleidawave

benchmarking-tool/main.rs

@@ -31,6 +31,7 @@ fn main() {
                     input.format,
                     input.sort,
                     input.limit,
+                    input.breakdown,
                 ),
                 _ => todo!(),
             }
@@ -56,6 +57,7 @@ fn main() {
                     input.format,
                     input.sort,
                     input.limit,
+                    input.breakdown,
                 ),
                 _ => todo!(),
             }
@@ -96,6 +98,8 @@ pub struct BenchmarkInput {
     pub keep: Option<String>,
     /// skip Rust internals
     pub skip_internals: bool,
+    /// include all inst
+    pub breakdown: bool,
 }
 
 impl BenchmarkInput {
@@ -112,6 +116,7 @@ impl BenchmarkInput {
             // ...
             keep: None,
             skip_internals: true,
+            breakdown: false,
         };
 
         let mut left_over: Option<String> = None;
@@ -159,6 +164,9 @@ impl BenchmarkInput {
                 "--all" => {
                     this.skip_internals = false;
                 }
+                "--breakdown" => {
+                    this.breakdown = true;
+                }
                 "--arg" => {
                     let next = args.next().unwrap();
                     let (name, values) = next.split_once('=').unwrap();
@@ -187,6 +195,7 @@ pub fn print_results(
     output_format: OutputFormat,
     sorting: Option<utilities::Sorting>,
     limit: usize,
+    breakdown: bool,
 ) {
     use std::borrow::Cow;
     use utilities::count_with_seperator;
@@ -268,11 +277,13 @@ pub fn print_results(
                     " total:  {count}",
                     count = count_with_seperator(row.total as usize)
                 );
-                for (name, count) in &row.entries {
-                    print!(
-                        " {name}:  {count}",
-                        count = count_with_seperator(*count as usize)
-                    );
+                if breakdown {
+                    for (name, count) in &row.entries {
+                        print!(
+                            " {name}:  {count}",
+                            count = count_with_seperator(*count as usize)
+                        );
+                    }
                 }
                 println!();
             }
@@ -283,11 +294,18 @@ pub fn print_results(
                 if buf.len() > 1 {
                     buf.push(',');
                 }
-                buf.push_str(&json_builder_macro::json! {
-                    symbol_name: row.symbol_name.as_str(),
-                    total: row.total,
-                    kinds: row.entries
-                });
+                if breakdown {
+                    buf.push_str(&json_builder_macro::json! {
+                        symbol_name: row.symbol_name.as_str(),
+                        total: row.total,
+                        kinds: row.entries
+                    });
+                } else {
+                    buf.push_str(&json_builder_macro::json! {
+                        symbol_name: row.symbol_name.as_str(),
+                        total: row.total
+                    });
+                }
             }
             buf.push(']');
             println!("{buf}");

benchmarking-tool/tools/mod.rs

@@ -4,5 +4,5 @@ pub mod wall_clock;
 #[cfg(target_family = "unix")]
 pub mod perf_events;
 
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64", debug_assertions))]
 pub mod sde;

benchmarking-tool/tools/sde.rs

@@ -7,7 +7,7 @@ pub fn run_sde(
     request: crate::CommandRequest,
     options: crate::ToolOptions,
 ) -> Result<crate::ToolOutput, ()> {
-    let file_path: &str = options.as_deref().unwrap_or(TEMP_FILE);
+    let file_path: &str = options.keep.as_deref().unwrap_or(TEMP_FILE);
 
     // TODO hmm
     let blocks = 50;
@@ -39,8 +39,8 @@ pub fn run_sde(
 
     let symbols: Vec<_> = rows
         .into_iter()
-        .map(|(name, item)| crate::Entry {
-            name,
+        .map(|(symbol_name, item)| crate::Entry {
+            symbol_name,
             total: item.total,
             entries: vec![
                 ("mem_read".to_owned(), item.mem_read),
@@ -52,9 +52,9 @@ pub fn run_sde(
         })
         .collect();
 
-    let total: usize = rows.iter().fold(0, |acc, row| acc + row.total as usize);
+    let total = symbols.iter().fold(0, |acc, row| acc + row.total);
 
-    if input.keep.is_none() {
+    if options.keep.is_none() {
         std::fs::remove_file(file_path).unwrap();
     }