Update sha per test matrix.

libbitcoin · Aug 28, 2022 · bd72bdf · bd72bdf
1 parent 8edd678
commit bd72bdf
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 43 deletions.
diff --git a/test/hash/performance/performance.cpp b/test/hash/performance/performance.cpp
@@ -66,65 +66,65 @@ struct v3
 };
 
 struct v4
+{
+    static constexpr size_t c = 32 * 1024 * 1024;
+    static constexpr size_t s = 32;
+};
+
+struct mr
 {
     static constexpr size_t c = 10 * 1024;
-    static constexpr size_t s = 4096;
+    static constexpr size_t s = 3;
 };
 
 BOOST_AUTO_TEST_CASE(performance__sha256a_none__merkle)
 {
     auto complete = true;
-    ////complete = test_merkle<sha256a_none, v0::c, v0::s>(std::cout);
-    ////complete = test_merkle<sha256a_none, v1::c, v1::s>(std::cout);
-    ////complete = test_merkle<sha256a_none, v2::c, v2::s>(std::cout);
-    ////complete = test_merkle<sha256a_none, v3::c, v3::s>(std::cout);
-    complete = test_merkle<sha256a_none, v4::c, v4::s>(std::cout);
+    complete = test_merkle<sha256a_none, mr::c, mr::s>(std::cout);
     BOOST_CHECK(complete);
 }
 
 BOOST_AUTO_TEST_CASE(performance__sha256a_vect__merkle)
 {
     auto complete = true;
-    ////complete = test_merkle<sha256a_vect, v0::c, v0::s>(std::cout);
-    ////complete = test_merkle<sha256a_vect, v1::c, v1::s>(std::cout);
-    ////complete = test_merkle<sha256a_vect, v2::c, v2::s>(std::cout);
-    ////complete = test_merkle<sha256a_vect, v3::c, v3::s>(std::cout);
-    complete = test_merkle<sha256a_vect, v4::c, v4::s>(std::cout);
+    complete = test_merkle<sha256a_vect, mr::c, mr::s>(std::cout);
     BOOST_CHECK(complete);
 }
 
-////BOOST_AUTO_TEST_CASE(performance__base_sha256a)
-////{
-////    auto complete = true;
-////    complete = base::test_hash<base_sha256a, v0::c, v0::s>(std::cout);
-////    complete = base::test_hash<base_sha256a, v1::c, v1::s>(std::cout);
-////    complete = base::test_hash<base_sha256a, v2::c, v2::s>(std::cout);
-////    complete = base::test_hash<base_sha256a, v3::c, v3::s>(std::cout);
-////    complete = base::test_hash<base_sha256a, v4::c, v4::s>(std::cout);
-////    BOOST_CHECK(complete);
-////}
-////
-////BOOST_AUTO_TEST_CASE(performance__sha256a_none)
-////{
-////    auto complete = true;
-////    complete = test_accumulator<sha256a_none, v0::c, v0::s>(std::cout);
-////    complete = test_accumulator<sha256a_none, v1::c, v1::s>(std::cout);
-////    complete = test_accumulator<sha256a_none, v2::c, v2::s>(std::cout);
-////    complete = test_accumulator<sha256a_none, v3::c, v3::s>(std::cout);
-////    complete = test_accumulator<sha256a_none, v4::c, v4::s>(std::cout);
-////    BOOST_CHECK(complete);
-////}
-////
-////BOOST_AUTO_TEST_CASE(performance__sha256a_vect)
-////{
-////    auto complete = true;
-////    complete = test_accumulator<sha256a_vect, v0::c, v0::s>(std::cout);
-////    complete = test_accumulator<sha256a_vect, v1::c, v1::s>(std::cout);
-////    complete = test_accumulator<sha256a_vect, v2::c, v2::s>(std::cout);
-////    complete = test_accumulator<sha256a_vect, v3::c, v3::s>(std::cout);
-////    complete = test_accumulator<sha256a_vect, v4::c, v4::s>(std::cout);
-////    BOOST_CHECK(complete);
-////}
+// !using shax (see performahce.hpp)
+
+BOOST_AUTO_TEST_CASE(performance__base_sha256a)
+{
+    auto complete = true;
+    complete = base::test_hash<base_sha256a, v0::c, v0::s>(std::cout);
+    complete = base::test_hash<base_sha256a, v1::c, v1::s>(std::cout);
+    complete = base::test_hash<base_sha256a, v2::c, v2::s>(std::cout);
+    complete = base::test_hash<base_sha256a, v3::c, v3::s>(std::cout);
+    complete = base::test_hash<base_sha256a, v4::c, v4::s>(std::cout);
+    BOOST_CHECK(complete);
+}
+
+BOOST_AUTO_TEST_CASE(performance__sha256a_none)
+{
+    auto complete = true;
+    complete = test_accumulator<sha256a_none, v0::c, v0::s>(std::cout);
+    complete = test_accumulator<sha256a_none, v1::c, v1::s>(std::cout);
+    complete = test_accumulator<sha256a_none, v2::c, v2::s>(std::cout);
+    complete = test_accumulator<sha256a_none, v3::c, v3::s>(std::cout);
+    complete = test_accumulator<sha256a_none, v4::c, v4::s>(std::cout);
+    BOOST_CHECK(complete);
+}
+
+BOOST_AUTO_TEST_CASE(performance__sha256a_vect)
+{
+    auto complete = true;
+    complete = test_accumulator<sha256a_vect, v0::c, v0::s>(std::cout);
+    complete = test_accumulator<sha256a_vect, v1::c, v1::s>(std::cout);
+    complete = test_accumulator<sha256a_vect, v2::c, v2::s>(std::cout);
+    complete = test_accumulator<sha256a_vect, v3::c, v3::s>(std::cout);
+    complete = test_accumulator<sha256a_vect, v4::c, v4::s>(std::cout);
+    BOOST_CHECK(complete);
+}
 
 ////BOOST_AUTO_TEST_CASE(performance__rmd160__baseline)
 ////{

diff --git a/test/hash/performance/performance.hpp b/test/hash/performance/performance.hpp
@@ -22,6 +22,7 @@
 #include "../../test.hpp"
 #include "baseline/rmd160.h"
 #include "baseline/sha256.h"
+#include "../sha/clone/algorithm.hpp"
 #include <chrono>
 
 namespace performance {