Update benchmark to measure e cores

1 files changed, 11 insertions, 11 deletions

diff --git a/src/benchmark.rs b/src/benchmark.rs
index f9651b7..77202a8 100644
--- a/src/benchmark.rs
+++ b/src/benchmark.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use csv::Writer;
 use libbpf_rs::OpenObject;
 use perf_event::{
-    events::{Cache, CacheOp, CacheResult, Event, Hardware, Software, WhichCache},
+    events::{Event, Hardware, Software},
     Builder, Counter, Group,
 };
 use rand::seq::IteratorRandom;
@@ -81,7 +81,6 @@ impl Measurement {
 
         // Read performance counters
         let counts = group.read()?;
-        // dbg!(&counts);
 
         let counters: HashMap<_, _> = counters.iter().map(|(a, b)| (a.clone(), b)).collect();
 
@@ -91,6 +90,7 @@ impl Measurement {
                 measurement.counter_values.push(None);
                 continue;
             };
+
             measurement
                 .counter_values
                 .push(counts.get(counter).cloned());
@@ -297,16 +297,16 @@ fn run_measurement_loop(log_path: String, mode: Mode, cpu_to_monitor: i32) -> Re
         };
 
         // Select random subset of counters
-        // let selected_events = available_events.iter().choose_multiple(
-        //     &mut rng,
-        //     if mode == Mode::PCores {
-        //         MAX_COUNTERS_AT_ONCE_P_CORE
-        //     } else {
-        //         MAX_COUNTERS_AT_ONCE_E_CORE
-        //     },
-        // );
+        let selected_events = available_events.iter().choose_multiple(
+            &mut rng,
+            if mode == Mode::PCores {
+                MAX_COUNTERS_AT_ONCE_P_CORE
+            } else {
+                MAX_COUNTERS_AT_ONCE_E_CORE
+            },
+        );
 
-        let selected_events = available_events[0..MAX_COUNTERS_AT_ONCE_E_CORE].iter();
+        //let selected_events = available_events[0..MAX_COUNTERS_AT_ONCE_E_CORE].iter();
 
         // println!("Selected {} events for monitoring", selected_events.len());