Merge pull request #22 from tomhamiltonlambda/main

Refactor the calculation

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "md5"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 license = "Apache-2.0/MIT"
 authors = [
@@ -10,6 +10,7 @@ authors = [
     "Lukas Kalbertodt <lukas.kalbertodt@gmail.com>",
     "Nathan Musoke <nathan.musoke@gmail.com>",
     "Scott Mabin <scott@mabez.dev>",
+    "Thomas Hamilton <thomas@lambdadtd.com>",
     "Tony Arcieri <bascule@gmail.com>",
     "Wim de With <register@dewith.io>",
     "Yosef Dinerstein <yosefdi@gmail.com>",

benches/lib.rs

@@ -1,31 +1,42 @@
 #![feature(test)]
 
-extern crate md5;
 extern crate test;
 
-#[bench]
-fn compute_0001000(bencher: &mut test::Bencher) {
-    compute(1000, bencher);
-}
+use md5::Context;
 
-#[bench]
-fn compute_0010000(bencher: &mut test::Bencher) {
-    compute(10000, bencher);
-}
+macro_rules! implement(
+    ($($size:literal => ($compute:ident, $context:ident),)*) => ($(
+        #[bench]
+        fn $compute(bencher: &mut test::Bencher) {
+            compute($size, bencher);
+        }
 
-#[bench]
-fn compute_0100000(bencher: &mut test::Bencher) {
-    compute(100000, bencher);
-}
+        #[bench]
+        fn $context(bencher: &mut test::Bencher) {
+            context($size, bencher);
+        }
+    )*);
+);
 
-#[bench]
-fn compute_1000000(bencher: &mut test::Bencher) {
-    compute(1000000, bencher);
+implement! {
+    1000    => (compute_0001000, context_0001000),
+    10000   => (compute_0010000, context_0010000),
+    100000  => (compute_0100000, context_0100000),
+    1000000 => (compute_1000000, context_1000000),
 }
 
 fn compute(size: usize, bencher: &mut test::Bencher) {
-    let data = &vec![0xffu8; size][..];
+    let data = vec![0xffu8; size];
+    bencher.iter(|| {
+        test::black_box(md5::compute(&data));
+    });
+}
+
+fn context(size: usize, bencher: &mut test::Bencher) {
+    let data = vec![0xffu8; size];
     bencher.iter(|| {
-        test::black_box(md5::compute(data));
+        let mut context = Context::new();
+        context.consume(&data);
+        test::black_box(context.compute());
     });
 }