Add ycbcr benchmark

Author: vstroebel

criterion/Cargo.toml

@@ -28,3 +28,7 @@ harness = false
 [[bench]]
 name = "fdct"
 harness = false
+
+[[bench]]
+name = "ycbcr"
+harness = false

criterion/benches/ycbcr.rs

@@ -0,0 +1,104 @@
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
+use jpeg_encoder::{ImageBuffer, RgbImage};
+use std::time::Duration;
+
+fn create_bench_img() -> (Vec<u8>, u16, u16) {
+    let width = 1001;
+    let height = 500;
+
+    let mut data = Vec::with_capacity(width * height * 3);
+
+    for y in 0..height {
+        for x in 0..width {
+            if (x * y) % 13 == 0 {
+                data.push(0);
+                data.push(0);
+                data.push(0);
+            } else if (x * y) % 17 == 0 {
+                data.push(255);
+                data.push(255);
+                data.push(255);
+            } else if (x * y) % 19 == 0 {
+                data.push(255);
+                data.push(0);
+                data.push(0);
+            } else if (x * y) % 21 == 0 {
+                data.push(0);
+                data.push(0);
+                data.push(255);
+            } else if (x * y) % 23 == 0 {
+                data.push(0);
+                data.push(255);
+                data.push(0);
+            } else if (x * y) % 25 == 0 {
+                data.push(96);
+                data.push(255);
+                data.push(96);
+            } else if (x * y) % 27 == 0 {
+                data.push(255);
+                data.push(96);
+                data.push(96);
+            } else if (x * y) % 29 == 0 {
+                data.push(96);
+                data.push(96);
+                data.push(255);
+            } else {
+                data.push((x % 256) as u8);
+                data.push((x % 256) as u8);
+                data.push(((x * y) % 256) as u8);
+            }
+        }
+    }
+
+    (data, width as u16, height as u16)
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let (data, width, height) = create_bench_img();
+    let res1 = Vec::with_capacity(usize::from(width));
+    let res2 = Vec::with_capacity(usize::from(width));
+    let res3 = Vec::with_capacity(usize::from(width));
+    let res4 = Vec::with_capacity(usize::from(width));
+
+    let mut res = [res1, res2, res3, res4];
+
+    let mut group = c.benchmark_group("ycbcr");
+    group.measurement_time(Duration::from_secs(45));
+    group.warm_up_time(Duration::from_secs(10));
+
+    group.bench_function("default ycbcr", |b| {
+        let image_buffer = RgbImage(&data, width, height);
+
+        b.iter(|| {
+            for y in 0..height {
+                res[0].clear();
+                res[1].clear();
+                res[2].clear();
+                image_buffer.fill_buffers(y, black_box(&mut res));
+            }
+            black_box(&res);
+        });
+    });
+
+    #[cfg(all(feature = "simd", any(target_arch = "x86", target_arch = "x86_64")))]
+    group.bench_function("ycbcr avx2", |b| {
+        use jpeg_encoder::RgbImageAVX2;
+        let image_buffer = RgbImageAVX2(&data, width, height);
+
+        b.iter(|| {
+            for y in 0..height {
+                res[0].clear();
+                res[1].clear();
+                res[2].clear();
+                image_buffer.fill_buffers(y, black_box(&mut res));
+            }
+            black_box(&res);
+        })
+    });
+
+    group.finish();
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

src/avx2.rs

@@ -3,7 +3,7 @@ mod ycbcr;
 
 use crate::encoder::Operations;
 pub use fdct::fdct_avx2;
-pub(crate) use ycbcr::*;
+pub use ycbcr::*;
 
 pub(crate) struct AVX2Operations;
 

src/avx2/ycbcr.rs

@@ -16,7 +16,7 @@ use crate::{rgb_to_ycbcr, ImageBuffer, JpegColorType};
 
 macro_rules! ycbcr_image_avx2 {
     ($name:ident, $num_colors:expr, $o1:expr, $o2:expr, $o3:expr) => {
-        pub(crate) struct $name<'a>(pub &'a [u8], pub u16, pub u16);
+        pub struct $name<'a>(pub &'a [u8], pub u16, pub u16);
 
         impl<'a> $name<'a> {
             #[target_feature(enable = "avx2")]

src/image_buffer.rs

@@ -134,7 +134,7 @@ fn get_line(data: &[u8], y: u16, width:u16, num_colors: usize) -> &[u8] {
 
 macro_rules! ycbcr_image {
     ($name:ident, $num_colors:expr, $o1:expr, $o2:expr, $o3:expr) => {
-        pub(crate) struct $name<'a>(pub &'a [u8], pub u16, pub u16);
+        pub struct $name<'a>(pub &'a [u8], pub u16, pub u16);
 
         impl<'a> ImageBuffer for $name<'a> {
             fn get_jpeg_color_type(&self) -> JpegColorType {

src/lib.rs

@@ -50,9 +50,16 @@ pub use writer::{PixelDensity, PixelDensityUnit, JfifWrite};
 
 #[cfg(feature = "benchmark")]
 pub use fdct::fdct;
+
+#[cfg(feature = "benchmark")]
+pub use image_buffer::RgbImage;
+
 #[cfg(all(feature = "benchmark", feature = "simd", any(target_arch = "x86", target_arch = "x86_64")))]
 pub use avx2::fdct_avx2;
 
+#[cfg(all(feature = "benchmark", feature = "simd", any(target_arch = "x86", target_arch = "x86_64")))]
+pub use avx2::RgbImageAVX2;
+
 #[cfg(test)]
 mod tests {
     use crate::image_buffer::rgb_to_ycbcr;