Move the benchmarks to Criterion

Cargo.toml

@@ -32,7 +32,7 @@ pkg-config = "0.3.12"
 bindgen = { version = "0.37", optional = true }
 
 [dev-dependencies]
-bencher = "0.1.5"
+criterion = "0.2"
 
 [[bin]]
 name = "rav1e"

benches/bench.rs

@@ -8,13 +8,13 @@
 // PATENTS file, you can obtain it at www.aomedia.org/license/patent.
 
 #[macro_use]
-extern crate bencher;
+extern crate criterion;
 extern crate rand;
 extern crate rav1e;
 
 mod predict;
 
-use bencher::*;
+use criterion::*;
 use rav1e::*;
 use rav1e::context::*;
 use rav1e::ec;
@@ -24,31 +24,13 @@ use rav1e::predict::*;
 #[cfg(feature = "comparative_bench")]
 mod comparative;
 
-struct WriteB {
-  tx_size: TxSize,
-  qi: usize
-}
-
-impl TDynBenchFn for WriteB {
-  fn run(&self, b: &mut Bencher) {
-    write_b_bench(b, self.tx_size, self.qi);
-  }
-}
-
-pub fn write_b() -> Vec<TestDescAndFn> {
-  use std::borrow::Cow;
-  let mut benches = ::std::vec::Vec::new();
+fn write_b(c: &mut Criterion) {
   for &tx_size in &[TxSize::TX_4X4, TxSize::TX_8X8] {
     for &qi in &[20, 55] {
-      let w = WriteB { tx_size, qi };
       let n = format!("write_b_bench({:?}, {})", tx_size, qi);
-      benches.push(TestDescAndFn {
-        desc: TestDesc { name: Cow::from(n), ignore: false },
-        testfn: TestFn::DynBenchFn(Box::new(w))
-      });
+      c.bench_function(&n, move |b| write_b_bench(b, tx_size, qi));
     }
   }
-  benches
 }
 
 fn write_b_bench(b: &mut Bencher, tx_size: TxSize, qindex: usize) {
@@ -108,20 +90,15 @@ fn write_b_bench(b: &mut Bencher, tx_size: TxSize, qindex: usize) {
   });
 }
 
-benchmark_group!(
+criterion_group!(
   intra_prediction,
-  predict::intra_dc_4x4,
-  predict::intra_h_4x4,
-  predict::intra_v_4x4,
-  predict::intra_paeth_4x4,
-  predict::intra_smooth_4x4,
-  predict::intra_smooth_h_4x4,
-  predict::intra_smooth_v_4x4,
-  predict::intra_cfl_4x4
+  predict::pred_bench,
 );
 
+criterion_group!(write_block, write_b);
+
 #[cfg(feature = "comparative_bench")]
-benchmark_main!(comparative::intra_prediction);
+criterion_main!(comparative::intra_prediction);
 
 #[cfg(not(feature = "comparative_bench"))]
-benchmark_main!(write_b, intra_prediction);
+criterion_main!(write_block, intra_prediction);

benches/comparative/mod.rs

@@ -1,32 +1,19 @@
-// Copyright (c) 2017-2018, The rav1e contributors. All rights reserved
-//
-// This source code is subject to the terms of the BSD 2 Clause License and
-// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
-// was not distributed with this source code in the LICENSE file, you can
-// obtain it at www.aomedia.org/license/software. If the Alliance for Open
-// Media Patent License 1.0 was not distributed with this source code in the
-// PATENTS file, you can obtain it at www.aomedia.org/license/patent.
-
-extern crate libc;
-
-mod predict;
-
-benchmark_group!(
-  intra_prediction,
-  predict::intra_dc_4x4_native,
-  predict::intra_dc_4x4_aom,
-  predict::intra_h_4x4_native,
-  predict::intra_h_4x4_aom,
-  predict::intra_v_4x4_native,
-  predict::intra_v_4x4_aom,
-  predict::intra_paeth_4x4_native,
-  predict::intra_paeth_4x4_aom,
-  predict::intra_smooth_4x4_native,
-  predict::intra_smooth_4x4_aom,
-  predict::intra_smooth_h_4x4_native,
-  predict::intra_smooth_h_4x4_aom,
-  predict::intra_smooth_v_4x4_native,
-  predict::intra_smooth_v_4x4_aom,
-  predict::intra_cfl_4x4_native,
-  predict::intra_cfl_4x4_aom
-);
+// Copyright (c) 2017-2018, The rav1e contributors. All rights reserved
+//
+// This source code is subject to the terms of the BSD 2 Clause License and
+// the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+// was not distributed with this source code in the LICENSE file, you can
+// obtain it at www.aomedia.org/license/software. If the Alliance for Open
+// Media Patent License 1.0 was not distributed with this source code in the
+// PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+
+extern crate libc;
+
+mod predict;
+
+use criterion::Criterion;
+
+criterion_group!(
+  intra_prediction,
+  predict::intra_bench,
+);