Update criterion and switch to criterion-perf-events

Author: marmeladema

bench/Cargo.toml

@@ -5,15 +5,16 @@ edition = "2018"
 publish = false
 
 [dependencies]
-criterion = "0.3"
+criterion = "0.5"
 memchr = "2.4"
 memmem = "0.1"
 sliceslice = { path = ".." }
 sse4-strstr = { path = "sse4-strstr", optional = true }
 twoway = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-criterion-linux-perf = "0.1"
+criterion-perf-events = "0.4.0"
+perfcnt = "0.8"
 
 [[bench]]
 name = "i386"

bench/benches/i386.rs

@@ -4,8 +4,10 @@ use criterion::{
     Criterion,
 };
 #[cfg(target_os = "linux")]
-use criterion_linux_perf::{PerfMeasurement, PerfMode};
+use criterion_perf_events::Perf;
 use memmem::{Searcher, TwoWaySearcher};
+#[cfg(target_os = "linux")]
+use perfcnt::linux::{HardwareEventType, PerfCounterBuilderLinux};
 use std::{
     fs::File,
     io::{BufRead, BufReader},
@@ -295,7 +297,7 @@ criterion_group!(
 #[cfg(target_os = "linux")]
 criterion_group!(
     name = i386_perf_instructions;
-    config = Criterion::default().with_measurement(PerfMeasurement::new(PerfMode::Instructions));
+    config = Criterion::default().with_measurement(Perf::new(PerfCounterBuilderLinux::from_hardware_event(HardwareEventType::Instructions)));
     targets = search_short_haystack, search_long_haystack, search_random_haystack
 );
 

bench/benches/random.rs

@@ -4,8 +4,10 @@ use criterion::{
     BenchmarkId, Criterion,
 };
 #[cfg(target_os = "linux")]
-use criterion_linux_perf::{PerfMeasurement, PerfMode};
+use criterion_perf_events::Perf;
 use memmem::{Searcher, TwoWaySearcher};
+#[cfg(target_os = "linux")]
+use perfcnt::linux::{HardwareEventType, PerfCounterBuilderLinux};
 
 fn search<M: Measurement>(c: &mut Criterion<M>) {
     let haystack = include_str!("../../data/haystack");
@@ -105,7 +107,7 @@ criterion_group!(
 #[cfg(target_os = "linux")]
 criterion_group!(
     name = random_perf_instructions;
-    config = Criterion::default().with_measurement(PerfMeasurement::new(PerfMode::Instructions));
+    config = Criterion::default().with_measurement(Perf::new(PerfCounterBuilderLinux::from_hardware_event(HardwareEventType::Instructions)));
     targets = search
 );