Use criterion-linux-perf to perform benchmark measuring instructions

Author: marmeladema

bench/Cargo.toml

@@ -6,6 +6,7 @@ publish = false
 
 [dependencies]
 criterion = "0.3"
+criterion-linux-perf = "0.1.0"
 memmem = "0.1"
 sliceslice = { path = ".." }
 sse4-strstr = { path = "sse4-strstr", optional = true }

bench/benches/i386.rs

@@ -1,11 +1,16 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{
+    black_box, criterion_group, criterion_main,
+    measurement::{Measurement, WallTime},
+    Criterion,
+};
+use criterion_linux_perf::{PerfMeasurement, PerfMode};
 use memmem::{Searcher, TwoWaySearcher};
 use std::{
     fs::File,
     io::{BufRead, BufReader},
 };
 
-fn search_short_haystack(c: &mut Criterion) {
+fn search_short_haystack<M: Measurement>(c: &mut Criterion<M>) {
     let mut needles = BufReader::new(File::open("../data/words.txt").unwrap())
         .lines()
         .map(Result::unwrap)
@@ -88,7 +93,7 @@ fn search_short_haystack(c: &mut Criterion) {
     group.finish();
 }
 
-fn search_long_haystack(c: &mut Criterion) {
+fn search_long_haystack<M: Measurement>(c: &mut Criterion<M>) {
     let haystack = include_str!("../../data/haystack");
 
     let needles = BufReader::new(File::open("../data/words.txt").unwrap())
@@ -161,5 +166,15 @@ fn search_long_haystack(c: &mut Criterion) {
     group.finish();
 }
 
-criterion_group!(benches, search_short_haystack, search_long_haystack);
-criterion_main!(benches);
+criterion_group!(
+    name = i386_wall_time;
+    config = Criterion::default().with_measurement(WallTime);
+    targets = search_short_haystack, search_long_haystack
+);
+criterion_group!(
+    name = i386_perf_instructions;
+    config = Criterion::default().with_measurement(PerfMeasurement::new(PerfMode::Instructions));
+    targets = search_short_haystack, search_long_haystack
+);
+
+criterion_main!(i386_wall_time, i386_perf_instructions);

bench/benches/random.rs

@@ -1,7 +1,12 @@
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{
+    black_box, criterion_group, criterion_main,
+    measurement::{Measurement, WallTime},
+    BenchmarkId, Criterion,
+};
+use criterion_linux_perf::{PerfMeasurement, PerfMode};
 use memmem::{Searcher, TwoWaySearcher};
 
-fn search(c: &mut Criterion) {
+fn search<M: Measurement>(c: &mut Criterion<M>) {
     let haystack = include_str!("../../data/haystack");
     let needle = include_str!("../../data/needle");
 
@@ -75,5 +80,15 @@ fn search(c: &mut Criterion) {
     }
 }
 
-criterion_group!(benches, search);
-criterion_main!(benches);
+criterion_group!(
+    name = random_wall_time;
+    config = Criterion::default().with_measurement(WallTime);
+    targets = search
+);
+criterion_group!(
+    name = random_perf_instructions;
+    config = Criterion::default().with_measurement(PerfMeasurement::new(PerfMode::Instructions));
+    targets = search
+);
+
+criterion_main!(random_wall_time, random_perf_instructions);