Merge pull request #1706

7403e56f performance_tests: report small time per call in microseconds (moneromooo-monero)
cadada2d performance_tests: add tests for sc_reduce32 and cn_fast_hash (moneromooo-monero)
962c72b6 performance_tests: initialize logging at startup (moneromooo-monero)

1 files changed, 9 insertions, 1 deletions

diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index d08698433..cc9fe86ef 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -43,12 +43,17 @@
 #include "generate_key_image_helper.h"
 #include "generate_keypair.h"
 #include "is_out_to_acc.h"
+#include "sc_reduce32.h"
+#include "cn_fast_hash.h"
 
 int main(int argc, char** argv)
 {
   set_process_affinity(1);
   set_thread_high_priority();
 
+  mlog_configure(mlog_get_default_log_path("performance_tests.log"), true);
+  mlog_set_log_level(0);
+
   performance_timer timer;
   timer.start();
 
@@ -102,8 +107,11 @@ int main(int argc, char** argv)
   TEST_PERFORMANCE0(test_derive_secret_key);
   TEST_PERFORMANCE0(test_ge_frombytes_vartime);
   TEST_PERFORMANCE0(test_generate_keypair);
+  TEST_PERFORMANCE0(test_sc_reduce32);
 
   TEST_PERFORMANCE0(test_cn_slow_hash);
+  TEST_PERFORMANCE1(test_cn_fast_hash, 32);
+  TEST_PERFORMANCE1(test_cn_fast_hash, 16384);
 
   std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;