matthew
/
vanrijn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to Criterion for benchmarks

This commit is contained in:
Matthew Gordon 2020-03-19 22:36:46 -04:00
parent 4042b266ae
commit 3afbc600e6
3 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.toml
View File

@ -4,9 +4,6 @@ version = "0.1.0"
authors = ["Matthew Gordon <matthew.scott.gordon@gmail.com>"]
edition = "2018"
[features]
slow_tests = []
[dependencies]
alga = "0.9"
itertools = "0.8"
@ -20,6 +17,12 @@ sdl2 = "0.32"
version = "0.19"
features = ["arbitrary"]
[dev-dependencies]
criterion = "0.3"
[[bench]]
name = "simple_scene"
harness = false
[profile.dev]
opt-level = 3

89
benches/simple_scene.rs Normal file
View File

@ -0,0 +1,89 @@
use criterion::{criterion_group, criterion_main, Criterion};
use vanrijn::camera::partial_render_scene;
use vanrijn::colour::{ColourRgbF, NamedColour};
use vanrijn::materials::{LambertianMaterial, PhongMaterial, ReflectiveMaterial};
use vanrijn::mesh::load_obj;
use vanrijn::raycasting::{BoundingVolumeHierarchy, Plane, Primitive, Sphere};
use vanrijn::scene::Scene;
use vanrijn::util::Tile;
use nalgebra::{Point3, Vector3};
use std::path::Path;
use std::sync::Arc;
fn simple_scene(bencher: &mut Criterion) {
let image_width = 6;
let image_height = 6;
let scene = Arc::new(Scene {
camera_location: Point3::new(-2.0, 1.0, -5.0),
objects: vec![
Arc::new(Plane::new(
Vector3::new(0.0, 1.0, 0.0),
-2.0,
Arc::new(LambertianMaterial {
colour: ColourRgbF::new(0.55, 0.27, 0.04),
diffuse_strength: 0.1,
}),
)) as Arc<dyn Primitive<f64>>,
Arc::new(Sphere::new(
Point3::new(-6.25, -0.5, 1.0),
1.0,
Arc::new(LambertianMaterial {
colour: ColourRgbF::from_named(NamedColour::Green),
diffuse_strength: 0.1,
}),
)),
Arc::new(Sphere::new(
Point3::new(-4.25, -0.5, 2.0),
1.0,
Arc::new(ReflectiveMaterial {
colour: ColourRgbF::from_named(NamedColour::Blue),
diffuse_strength: 0.01,
reflection_strength: 0.99,
}),
)),
Arc::new(Sphere::new(
Point3::new(-5.0, 1.5, 1.0),
1.0,
Arc::new(PhongMaterial {
colour: ColourRgbF::from_named(NamedColour::Red),
diffuse_strength: 0.05,
smoothness: 100.0,
specular_strength: 1.0,
}),
)),
Arc::new(BoundingVolumeHierarchy::build(
&load_obj(
Path::new("/home/matthew/Downloads/bunny.obj"),
Arc::new(PhongMaterial {
colour: ColourRgbF::from_named(NamedColour::Yellow),
diffuse_strength: 0.05,
smoothness: 100.0,
specular_strength: 1.0,
}),
)
.unwrap(),
)),
],
});
bencher.bench_function("simple_scene", move |b| {
let scene = Arc::clone(&scene);
b.iter(move || {
let scene = Arc::clone(&scene);
let tile = Tile {
start_column: 0,
end_column: image_width,
start_row: 0,
end_row: image_height,
};
partial_render_scene(scene, tile, image_height, image_width);
})
});
}
criterion_group!(benches, simple_scene);
criterion_main!(benches);

91
src/lib.rs
View File

@ -1,5 +1,3 @@
#![feature(test)]
pub mod camera;
pub mod colour;
pub mod image;
@ -14,92 +12,3 @@ pub mod util;
use realtype::Real;
#[cfg(test)]
mod tests {
extern crate test;
use test::Bencher;
use crate::camera::partial_render_scene;
use crate::colour::{ColourRgbF, NamedColour};
use crate::materials::{LambertianMaterial, PhongMaterial, ReflectiveMaterial};
use crate::mesh::load_obj;
use crate::raycasting::{BoundingVolumeHierarchy, Plane, Primitive, Sphere};
use crate::scene::Scene;
use crate::util::Tile;
use nalgebra::{Point3, Vector3};
use std::path::Path;
use std::sync::Arc;
#[cfg(feature = "slow_tests")]
#[bench]
fn simple_scene(b: &mut Bencher) {
let image_width = 4;
let image_height = 4;
let scene = Arc::new(Scene {
camera_location: Point3::new(-2.0, 1.0, -5.0),
objects: vec![
Arc::new(Plane::new(
Vector3::new(0.0, 1.0, 0.0),
-2.0,
Arc::new(LambertianMaterial {
colour: ColourRgbF::new(0.55, 0.27, 0.04),
diffuse_strength: 0.1,
}),
)) as Arc<dyn Primitive<f64>>,
Arc::new(Sphere::new(
Point3::new(-6.25, -0.5, 1.0),
1.0,
Arc::new(LambertianMaterial {
colour: ColourRgbF::from_named(NamedColour::Green),
diffuse_strength: 0.1,
}),
)),
Arc::new(Sphere::new(
Point3::new(-4.25, -0.5, 2.0),
1.0,
Arc::new(ReflectiveMaterial {
colour: ColourRgbF::from_named(NamedColour::Blue),
diffuse_strength: 0.01,
reflection_strength: 0.99,
}),
)),
Arc::new(Sphere::new(
Point3::new(-5.0, 1.5, 1.0),
1.0,
Arc::new(PhongMaterial {
colour: ColourRgbF::from_named(NamedColour::Red),
diffuse_strength: 0.05,
smoothness: 100.0,
specular_strength: 1.0,
}),
)),
Arc::new(BoundingVolumeHierarchy::build(
&load_obj(
Path::new("/home/matthew/Downloads/bunny.obj"),
Arc::new(PhongMaterial {
colour: ColourRgbF::from_named(NamedColour::Yellow),
diffuse_strength: 0.05,
smoothness: 100.0,
specular_strength: 1.0,
}),
)
.unwrap(),
)),
],
});
b.iter(move || {
let scene_ptr = Arc::clone(&scene);
let tile = Tile {
start_column: 0,
end_column: image_width,
start_row: 0,
end_row: image_height,
};
partial_render_scene(scene_ptr, tile, image_height, image_width);
});
}
}