bench: more final proof of work benchmark to pow_hash

Author: kwvg

src/bench/crypto_hash.cpp

@@ -295,15 +295,6 @@ static void DSHA256_1M(benchmark::Bench& bench)
     });
 }
 
-static void X11_1M(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(BUFFER_SIZE,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
 /* Hash different number of bytes via DSHA256 */
 static void DSHA256_0032b_single(benchmark::Bench& bench)
 {
@@ -359,74 +350,11 @@ static void DSHA256_2048b_single(benchmark::Bench& bench)
     });
 }
 
-/* Hash different number of bytes via X11 */
-static void X11_0032b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(32,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
-static void X11_0080b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(80,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
-static void X11_0128b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(128,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
-static void X11_0512b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(512,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
-static void X11_1024b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(1024,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
-static void X11_2048b_single(benchmark::Bench& bench)
-{
-    uint256 hash;
-    std::vector<uint8_t> in(2048,0);
-    bench.batch(in.size()).unit("byte").run([&] {
-        hash = HashX11(in.begin(), in.end());
-    });
-}
-
 BENCHMARK(DSHA256_1M);
-BENCHMARK(X11_1M);
 
 BENCHMARK(DSHA256_0032b_single);
 BENCHMARK(DSHA256_0080b_single);
 BENCHMARK(DSHA256_0128b_single);
 BENCHMARK(DSHA256_0512b_single);
 BENCHMARK(DSHA256_1024b_single);
 BENCHMARK(DSHA256_2048b_single);
-
-BENCHMARK(X11_0032b_single);
-BENCHMARK(X11_0080b_single);
-BENCHMARK(X11_0128b_single);
-BENCHMARK(X11_0512b_single);
-BENCHMARK(X11_1024b_single);
-BENCHMARK(X11_2048b_single);

src/bench/pow_hash.cpp

@@ -4,6 +4,8 @@
 
 #include <bench/bench.h>
 
+#include <hash_x11.h>
+
 #include <crypto/x11/sph_blake.h>
 #include <crypto/x11/sph_bmw.h>
 #include <crypto/x11/sph_cubehash.h>
@@ -22,6 +24,15 @@ static constexpr size_t BUFFER_SIZE{1000*1000};
 //! Bytes required to represent 512-bit unsigned integers (uint512)
 static constexpr size_t OUTPUT_SIZE{64};
 
+inline void Pow_X11(benchmark::Bench& bench, const size_t bytes)
+{
+    uint256 hash{};
+    std::vector<uint8_t> in(bytes, 0);
+    bench.batch(in.size()).unit("byte").run([&] {
+        hash = HashX11(in.begin(), in.end());
+    });
+}
+
 inline void Pow_Blake512(benchmark::Bench& bench, const size_t bytes)
 {
     sph_blake512_context ctx;
@@ -155,6 +166,14 @@ inline void Pow_Skein512(benchmark::Bench& bench, const size_t bytes)
 }
 } // anonymous namespace
 
+static void Pow_X11_0032b(benchmark::Bench& bench) { return Pow_X11(bench, 32); }
+static void Pow_X11_0080b(benchmark::Bench& bench) { return Pow_X11(bench, 80); }
+static void Pow_X11_0128b(benchmark::Bench& bench) { return Pow_X11(bench, 128); }
+static void Pow_X11_0512b(benchmark::Bench& bench) { return Pow_X11(bench, 512); }
+static void Pow_X11_1024b(benchmark::Bench& bench) { return Pow_X11(bench, 1024); }
+static void Pow_X11_2048b(benchmark::Bench& bench) { return Pow_X11(bench, 2048); }
+static void Pow_X11_1M(benchmark::Bench& bench) { return Pow_X11(bench, BUFFER_SIZE); }
+
 static void Pow_Blake512_0032b(benchmark::Bench& bench) { return Pow_Blake512(bench, 32); }
 static void Pow_Blake512_0080b(benchmark::Bench& bench) { return Pow_Blake512(bench, 80); }
 static void Pow_Blake512_0128b(benchmark::Bench& bench) { return Pow_Blake512(bench, 128); }
@@ -243,6 +262,14 @@ static void Pow_Skein512_1024b(benchmark::Bench& bench) { return Pow_Skein512(be
 static void Pow_Skein512_2048b(benchmark::Bench& bench) { return Pow_Skein512(bench, 2048); }
 static void Pow_Skein512_1M(benchmark::Bench& bench) { return Pow_Skein512(bench, BUFFER_SIZE); }
 
+BENCHMARK(Pow_X11_0032b);
+BENCHMARK(Pow_X11_0080b);
+BENCHMARK(Pow_X11_0128b);
+BENCHMARK(Pow_X11_0512b);
+BENCHMARK(Pow_X11_1024b);
+BENCHMARK(Pow_X11_2048b);
+BENCHMARK(Pow_X11_1M);
+
 BENCHMARK(Pow_Blake512_0032b);
 BENCHMARK(Pow_Blake512_0080b);
 BENCHMARK(Pow_Blake512_0128b);