Skip to content

Switch benchmarks to criterion for more accurate profiling #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mthh merged 1 commit into from
Jun 13, 2024
Merged

Switch benchmarks to criterion for more accurate profiling #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ slab = "0.4"

[dev-dependencies]
serde_json = "^1.0"
criterion = { version = "0.5", features = ["html_reports"] }

[features]
geojson = ["dep:geojson", "dep:serde_json"]
Expand All @@ -34,3 +35,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[[example]]
name = "ex"
required-features = ["geojson"]

[[bench]]
name = "bench"
harness = false
137 changes: 82 additions & 55 deletions benches/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#![feature(test)]
extern crate contour;
extern crate test;

use contour::contour_rings;
use contour::ContourBuilder;
use test::{black_box, Bencher};
use contour::{contour_rings, ContourBuilder};
use criterion::{black_box, criterion_group, criterion_main, Criterion};

#[rustfmt::skip]
static VALUES: [f64; 110] = [
Expand Down Expand Up @@ -42,46 +39,65 @@ static VALUES2: [f64; 238] = [
0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
];

#[bench]
fn bench_build_contours_multiple_thresholds(b: &mut Bencher) {
let c = ContourBuilder::new(14, 17, true);
b.iter(|| black_box(c.contours(&VALUES2, &[0.5, 1.5, 2.5])));
criterion_group!(
benches,
bench_build_contours_multiple_thresholds,
bench_build_contours_multiple_thresholds_and_x_y_steps_and_origins,
bench_build_geojson_contour,
bench_build_geojson_contour_no_smoothing,
bench_build_isoring,
bench_build_isoring_values2,
bench_contourbuilder_isobands_volcano_without_xy_step_xy_origin,
bench_contourbuilder_isobands_pot_pop_fr_without_xy_step_xy_origin
);
criterion_main!(benches);

fn bench_build_contours_multiple_thresholds(c: &mut Criterion) {
let cb = ContourBuilder::new(14, 17, true);
c.bench_function("build_contours_multiple_thresholds", |b| {
b.iter(|| black_box(cb.contours(&VALUES2, &[0.5, 1.5, 2.5])))
});
}

#[bench]
fn bench_build_contours_multiple_thresholds_and_x_y_steps_and_origins(b: &mut Bencher) {
let c = ContourBuilder::new(14, 17, true)
fn bench_build_contours_multiple_thresholds_and_x_y_steps_and_origins(c: &mut Criterion) {
let cb = ContourBuilder::new(14, 17, true)
.x_step(0.5)
.y_step(0.5)
.x_origin(0.25)
.y_origin(0.25);
b.iter(|| black_box(c.contours(&VALUES2, &[0.5, 1.5, 2.5])));
c.bench_function(
"build_contours_multiple_thresholds_and_x_y_steps_and_origins",
|b| b.iter(|| black_box(cb.contours(&VALUES2, &[0.5, 1.5, 2.5]))),
);
}

#[bench]
fn bench_build_geojson_contour(b: &mut Bencher) {
let c = ContourBuilder::new(10, 11, true);
b.iter(|| black_box(c.contours(&VALUES, &[0.5])));
fn bench_build_geojson_contour(c: &mut Criterion) {
let cb = ContourBuilder::new(10, 11, true);
c.bench_function("build_geojson_contour", |b| {
b.iter(|| black_box(cb.contours(&VALUES, &[0.5])))
});
}

#[bench]
fn bench_build_geojson_contour_no_smoothing(b: &mut Bencher) {
let c = ContourBuilder::new(10, 11, false);
b.iter(|| black_box(c.contours(&VALUES, &[0.5])));
fn bench_build_geojson_contour_no_smoothing(c: &mut Criterion) {
let cb = ContourBuilder::new(10, 11, false);
c.bench_function("build_geojson_contour_no_smoothing", |b| {
b.iter(|| black_box(cb.contours(&VALUES, &[0.5])))
});
}

#[bench]
fn bench_build_isoring(b: &mut Bencher) {
b.iter(|| black_box(contour_rings(&VALUES, 0.5, 10, 11)));
fn bench_build_isoring(c: &mut Criterion) {
c.bench_function("build_isoring", |b| {
b.iter(|| black_box(contour_rings(&VALUES, 0.5, 10, 11)))
});
}

#[bench]
fn bench_build_isoring_values2(b: &mut Bencher) {
b.iter(|| black_box(contour_rings(&VALUES2, 1.5, 14, 17)));
fn bench_build_isoring_values2(c: &mut Criterion) {
c.bench_function("build_isoring_values2", |b| {
b.iter(|| black_box(contour_rings(&VALUES2, 1.5, 14, 17)))
});
}

#[bench]
fn bench_contourbuilder_isobands_volcano_without_xy_step_xy_origin(b: &mut Bencher) {
fn bench_contourbuilder_isobands_volcano_without_xy_step_xy_origin(c: &mut Criterion) {
let data_str = include_str!("../tests/fixtures/volcano.json");
let raw_data: serde_json::Value = serde_json::from_str(data_str).unwrap();
let matrix: Vec<f64> = raw_data["data"]
Expand All @@ -93,23 +109,28 @@ fn bench_contourbuilder_isobands_volcano_without_xy_step_xy_origin(b: &mut Bench
let h = raw_data["height"].as_u64().unwrap() as usize;
let w = raw_data["width"].as_u64().unwrap() as usize;

b.iter(|| {
black_box(
ContourBuilder::new(w, h, true)
.isobands(
&matrix,
&[
90., 95., 100., 105., 110., 115., 120., 125., 130., 135., 140., 145., 150.,
155., 160., 165., 170., 175., 180., 185., 190., 195., 200.,
],
c.bench_function(
"contourbuilder_isobands_volcano_without_xy_step_xy_origin",
|b| {
b.iter(|| {
black_box(
ContourBuilder::new(w, h, true)
.isobands(
&matrix,
&[
90., 95., 100., 105., 110., 115., 120., 125., 130., 135., 140.,
145., 150., 155., 160., 165., 170., 175., 180., 185., 190., 195.,
200.,
],
)
.unwrap(),
)
.unwrap(),
)
});
})
},
);
}

#[bench]
fn bench_contourbuilder_isobands_pot_pop_fr_without_xy_step_xy_origin(b: &mut Bencher) {
fn bench_contourbuilder_isobands_pot_pop_fr_without_xy_step_xy_origin(c: &mut Criterion) {
let data_str = include_str!("../tests/fixtures/pot_pop_fr.json");
let raw_data: serde_json::Value = serde_json::from_str(data_str).unwrap();
let matrix: Vec<f64> = raw_data["data"]
Expand All @@ -121,17 +142,23 @@ fn bench_contourbuilder_isobands_pot_pop_fr_without_xy_step_xy_origin(b: &mut Be
let h = raw_data["height"].as_u64().unwrap() as usize;
let w = raw_data["width"].as_u64().unwrap() as usize;

b.iter(|| {
black_box(
ContourBuilder::new(w, h, true)
.isobands(
&matrix,
&[
0.001, 105483.25, 527416.25, 1054832.5, 2109665., 3164497.5, 4219330.,
5274162.5, 6328995., 7383827.5, 8438660., 9704459., 10548326.,
],
c.bench_function(
"contourbuilder_isobands_pot_pop_fr_without_xy_step_xy_origin",
|b| {
b.iter(|| {
black_box(
ContourBuilder::new(w, h, true)
.isobands(
&matrix,
&[
0.001, 105483.25, 527416.25, 1054832.5, 2109665., 3164497.5,
4219330., 5274162.5, 6328995., 7383827.5, 8438660., 9704459.,
10548326.,
],
)
.unwrap(),
)
.unwrap(),
)
});
})
},
);
}