replace criterion with iai

sbp/Cargo.toml

@@ -20,7 +20,7 @@ sparse = ["sprs"]
 serde1 = ["serde", "ndarray/serde"]
 
 [dev-dependencies]
-criterion = "0.3.2"
+iai = "0.1.1"
 
 [[bench]]
 name = "sbpoperators"

sbp/benches/sbpoperators.rs

@@ -1,118 +1,72 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use ndarray::Array2;
 use sbp::operators::{self, SbpOperator2d};
 use sbp::Float;
 
-fn performance_benchmark(c: &mut Criterion) {
+const W: usize = 64;
-    let mut group = c.benchmark_group("SBPoperators");
+const H: usize = 64;
-    group.sample_size(25);
 
-    let w = 64;
+fn baseline() {
-    let h = 64;
+    let _x = Array2::<Float>::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
-
+    let _res = Array2::<Float>::zeros((W, H));
-    let x = ndarray::Array2::from_shape_fn((w, h), |(j, i)| (j * h + i) as Float);
-
-    group.bench_function("upwind4 diffxi", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::Upwind4.diffxi(x.view(), res.view_mut()))
-    });
-    group.bench_function("upwind9 diffxi", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::Upwind9.diffxi(x.view(), res.view_mut()))
-    });
-    group.bench_function("trad4 diffxi", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::SBP4.diffxi(x.view(), res.view_mut()))
-    });
-    group.bench_function("trad8 diffxi", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::SBP8.diffxi(x.view(), res.view_mut()))
-    });
-
-    group.bench_function("upwind4 diffeta", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::Upwind4.diffeta(x.view(), res.view_mut()))
-    });
-    group.bench_function("upwind9 diffeta", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::Upwind9.diffeta(x.view(), res.view_mut()))
-    });
-    group.bench_function("trad4 diffeta", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::SBP4.diffeta(x.view(), res.view_mut()))
-    });
-    group.bench_function("trad8 diffeta", |b| {
-        let mut res = x.clone();
-        b.iter(|| operators::SBP8.diffeta(x.view(), res.view_mut()))
-    });
-
-    #[cfg(feature = "sparse")]
-    {
-        use sbp::utils::kronecker_product;
-
-        fn make_operators(
-            op: impl SbpOperator2d,
-            nx: usize,
-            ny: usize,
-        ) -> (sprs::CsMat<Float>, sprs::CsMat<Float>) {
-            let dx = op.op_xi().diff_matrix(nx);
-            let dx = kronecker_product(sprs::CsMat::eye(ny).view(), dx.view());
-
-            let dy = op.op_eta().diff_matrix(ny);
-            let dy = kronecker_product(dy.view(), sprs::CsMat::eye(nx).view());
-
-            (dy, dx)
 }
 
-        {
+fn upwind4_diffxi() {
-            let (dy, dx) = make_operators(operators::Upwind4, w, h);
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
-            group.bench_function("upwind4 diffxi matrix", |b| {
+    let mut res = Array2::zeros((W, H));
-                let mut res = ndarray::Array2::zeros(x.raw_dim());
+
-                b.iter(|| {
+    operators::Upwind4.diffxi(x.view(), res.view_mut());
-                    sprs::prod::mul_acc_mat_vec_csr(
-                        dx.view(),
-                        x.as_slice().unwrap(),
-                        res.as_slice_mut().unwrap(),
-                    )
-                })
-            });
-            group.bench_function("upwind4 diffeta matrix", |b| {
-                let mut res = ndarray::Array2::zeros(x.raw_dim());
-                b.iter(|| {
-                    sprs::prod::mul_acc_mat_vec_csr(
-                        dy.view(),
-                        x.as_slice().unwrap(),
-                        res.as_slice_mut().unwrap(),
-                    )
-                })
-            });
 }
-        {
+fn upwind9_diffxi() {
-            let (dy, dx) = make_operators(operators::Upwind9, w, h);
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
-            group.bench_function("upwind9 diffxi matrix", |b| {
+    let mut res = Array2::zeros((W, H));
-                let mut res = ndarray::Array2::zeros(x.raw_dim());
+
-                b.iter(|| {
+    operators::Upwind9.diffxi(x.view(), res.view_mut());
-                    sprs::prod::mul_acc_mat_vec_csr(
-                        dx.view(),
-                        x.as_slice().unwrap(),
-                        res.as_slice_mut().unwrap(),
-                    )
-                })
-            });
-            group.bench_function("upwind9 diffeta matrix", |b| {
-                let mut res = ndarray::Array2::zeros(x.raw_dim());
-                b.iter(|| {
-                    sprs::prod::mul_acc_mat_vec_csr(
-                        dy.view(),
-                        x.as_slice().unwrap(),
-                        res.as_slice_mut().unwrap(),
-                    )
-                })
-            });
 }
+fn trad4_diffxi() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::SBP4.diffxi(x.view(), res.view_mut());
+}
+fn trad8_diffxi() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::SBP8.diffxi(x.view(), res.view_mut());
+}
+fn upwind4_diffeta() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::Upwind4.diffeta(x.view(), res.view_mut());
+}
+fn upwind9_diffeta() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::Upwind9.diffeta(x.view(), res.view_mut());
+}
+fn trad4_diffeta() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::SBP4.diffeta(x.view(), res.view_mut());
+}
+fn trad8_diffeta() {
+    let x = Array2::from_shape_fn((W, H), |(j, i)| (j * W + i) as Float);
+    let mut res = Array2::zeros((W, H));
+
+    operators::SBP8.diffeta(x.view(), res.view_mut());
 }
 
-    group.finish();
+iai::main!(
-}
+    baseline,
-
+    upwind4_diffxi,
-criterion_group!(benches, performance_benchmark);
+    upwind9_diffxi,
-criterion_main!(benches);
+    trad4_diffxi,
+    trad8_diffxi,
+    upwind4_diffeta,
+    upwind9_diffeta,
+    trad4_diffeta,
+    trad8_diffeta
+);