From 963fe7dd45878b5f06d3523d543fbbbe85e0b2b2 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 2 Feb 2025 18:00:02 +1300 Subject: [PATCH] Remove defunct reduction benches, add new ones --- benches/reductions.rs | 128 +++++++++++++----------------------------- 1 file changed, 40 insertions(+), 88 deletions(-) diff --git a/benches/reductions.rs b/benches/reductions.rs index 251c165c..0b7cf33e 100644 --- a/benches/reductions.rs +++ b/benches/reductions.rs @@ -54,36 +54,6 @@ fn reductions_8_to_1_bits(b: &mut Bencher) { b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); } -#[bench] -fn reductions_4_to_2_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/palette_4_should_be_palette_2.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - -#[bench] -fn reductions_4_to_1_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/palette_4_should_be_palette_1.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - -#[bench] -fn reductions_2_to_1_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/palette_2_should_be_palette_1.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - #[bench] fn reductions_grayscale_8_to_4_bits(b: &mut Bencher) { let input = test::black_box(PathBuf::from( @@ -114,42 +84,12 @@ fn reductions_grayscale_8_to_1_bits(b: &mut Bencher) { b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); } -#[bench] -fn reductions_grayscale_4_to_2_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/grayscale_4_should_be_grayscale_2.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - -#[bench] -fn reductions_grayscale_4_to_1_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/grayscale_4_should_be_grayscale_1.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - -#[bench] -fn reductions_grayscale_2_to_1_bits(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/grayscale_2_should_be_grayscale_1.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| bit_depth::reduced_bit_depth_8_or_less(&png.raw)); -} - #[bench] fn reductions_rgba_to_rgb_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_rgb_16.png")); let png = PngData::new(&input, &Options::default()).unwrap(); - b.iter(|| alpha::reduced_alpha_channel(&png.raw, false)); + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); } #[bench] @@ -157,7 +97,15 @@ fn reductions_rgba_to_rgb_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_rgb_8.png")); let png = PngData::new(&input, &Options::default()).unwrap(); - b.iter(|| alpha::reduced_alpha_channel(&png.raw, false)); + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); +} + +#[bench] +fn reductions_rgba_to_rgb_trns_8(b: &mut Bencher) { + let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_rgb_trns_8.png")); + let png = PngData::new(&input, &Options::default()).unwrap(); + + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); } #[bench] @@ -180,32 +128,6 @@ fn reductions_rgba_to_grayscale_alpha_8(b: &mut Bencher) { b.iter(|| color::reduced_rgb_to_grayscale(&png.raw)); } -#[bench] -fn reductions_rgba_to_grayscale_16(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/rgba_16_should_be_grayscale_16.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| { - color::reduced_rgb_to_grayscale(&png.raw) - .and_then(|r| alpha::reduced_alpha_channel(&r, false)) - }); -} - -#[bench] -fn reductions_rgba_to_grayscale_8(b: &mut Bencher) { - let input = test::black_box(PathBuf::from( - "tests/files/rgba_8_should_be_grayscale_8.png", - )); - let png = PngData::new(&input, &Options::default()).unwrap(); - - b.iter(|| { - color::reduced_rgb_to_grayscale(&png.raw) - .and_then(|r| alpha::reduced_alpha_channel(&r, false)) - }); -} - #[bench] fn reductions_rgb_to_grayscale_16(b: &mut Bencher) { let input = test::black_box(PathBuf::from( @@ -240,6 +162,36 @@ fn reductions_rgb_to_palette_8(b: &mut Bencher) { b.iter(|| color::reduced_to_indexed(&png.raw, true)); } +#[bench] +fn reductions_grayscale_alpha_to_grayscale_16(b: &mut Bencher) { + let input = test::black_box(PathBuf::from( + "tests/files/grayscale_alpha_16_should_be_grayscale_16.png", + )); + let png = PngData::new(&input, &Options::default()).unwrap(); + + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); +} + +#[bench] +fn reductions_grayscale_alpha_to_grayscale_8(b: &mut Bencher) { + let input = test::black_box(PathBuf::from( + "tests/files/grayscale_alpha_8_should_be_grayscale_8.png", + )); + let png = PngData::new(&input, &Options::default()).unwrap(); + + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); +} + +#[bench] +fn reductions_grayscale_alpha_to_grayscale_trns_8(b: &mut Bencher) { + let input = test::black_box(PathBuf::from( + "tests/files/grayscale_alpha_8_should_be_grayscale_trns_8.png", + )); + let png = PngData::new(&input, &Options::default()).unwrap(); + + b.iter(|| alpha::reduced_alpha_channel(&png.raw, true)); +} + #[bench] fn reductions_grayscale_8_to_palette_8(b: &mut Bencher) { let input = test::black_box(PathBuf::from(