Merge pull request #1194

3126ba7 ringct: use const refs as parameters where appropriate (moneromooo-monero)
d8eae67 tests: add performance test for ge_frombytes_vartime (moneromooo-monero)
3cb2436 core: remove some unused code (moneromooo-monero)
1eaa3e8 tests: add performance tests for rct signatures (moneromooo-monero)

1 files changed, 40 insertions, 22 deletions

diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index 84a51aa96..d09276230 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -33,10 +33,11 @@
 
 // tests
 #include "construct_tx.h"
-#include "check_ring_signature.h"
+#include "check_tx_signature.h"
 #include "cn_slow_hash.h"
 #include "derive_public_key.h"
 #include "derive_secret_key.h"
+#include "ge_frombytes_vartime.h"
 #include "generate_key_derivation.h"
 #include "generate_key_image.h"
 #include "generate_key_image_helper.h"
@@ -50,31 +51,47 @@ int main(int argc, char** argv)
   performance_timer timer;
   timer.start();
 
-  TEST_PERFORMANCE2(test_construct_tx, 1, 1);
-  TEST_PERFORMANCE2(test_construct_tx, 1, 2);
-  TEST_PERFORMANCE2(test_construct_tx, 1, 10);
-  TEST_PERFORMANCE2(test_construct_tx, 1, 100);
-  TEST_PERFORMANCE2(test_construct_tx, 1, 1000);
+  TEST_PERFORMANCE3(test_construct_tx, 1, 1, false);
+  TEST_PERFORMANCE3(test_construct_tx, 1, 2, false);
+  TEST_PERFORMANCE3(test_construct_tx, 1, 10, false);
+  TEST_PERFORMANCE3(test_construct_tx, 1, 100, false);
+  TEST_PERFORMANCE3(test_construct_tx, 1, 1000, false);
 
-  TEST_PERFORMANCE2(test_construct_tx, 2, 1);
-  TEST_PERFORMANCE2(test_construct_tx, 2, 2);
-  TEST_PERFORMANCE2(test_construct_tx, 2, 10);
-  TEST_PERFORMANCE2(test_construct_tx, 2, 100);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 1, false);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 2, false);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 10, false);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 100, false);
 
-  TEST_PERFORMANCE2(test_construct_tx, 10, 1);
-  TEST_PERFORMANCE2(test_construct_tx, 10, 2);
-  TEST_PERFORMANCE2(test_construct_tx, 10, 10);
-  TEST_PERFORMANCE2(test_construct_tx, 10, 100);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 1, false);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 2, false);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 10, false);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 100, false);
 
-  TEST_PERFORMANCE2(test_construct_tx, 100, 1);
-  TEST_PERFORMANCE2(test_construct_tx, 100, 2);
-  TEST_PERFORMANCE2(test_construct_tx, 100, 10);
-  TEST_PERFORMANCE2(test_construct_tx, 100, 100);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 1, false);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 2, false);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 10, false);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 100, false);
 
-  TEST_PERFORMANCE1(test_check_ring_signature, 1);
-  TEST_PERFORMANCE1(test_check_ring_signature, 2);
-  TEST_PERFORMANCE1(test_check_ring_signature, 10);
-  TEST_PERFORMANCE1(test_check_ring_signature, 100);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 1, true);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 2, true);
+  TEST_PERFORMANCE3(test_construct_tx, 2, 10, true);
+
+  TEST_PERFORMANCE3(test_construct_tx, 10, 1, true);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 2, true);
+  TEST_PERFORMANCE3(test_construct_tx, 10, 10, true);
+
+  TEST_PERFORMANCE3(test_construct_tx, 100, 1, true);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 2, true);
+  TEST_PERFORMANCE3(test_construct_tx, 100, 10, true);
+
+  TEST_PERFORMANCE2(test_check_tx_signature, 1, false);
+  TEST_PERFORMANCE2(test_check_tx_signature, 2, false);
+  TEST_PERFORMANCE2(test_check_tx_signature, 10, false);
+  TEST_PERFORMANCE2(test_check_tx_signature, 100, false);
+
+  TEST_PERFORMANCE2(test_check_tx_signature, 2, true);
+  TEST_PERFORMANCE2(test_check_tx_signature, 10, true);
+  TEST_PERFORMANCE2(test_check_tx_signature, 100, true);
 
   TEST_PERFORMANCE0(test_is_out_to_acc);
   TEST_PERFORMANCE0(test_generate_key_image_helper);
@@ -82,6 +99,7 @@ int main(int argc, char** argv)
   TEST_PERFORMANCE0(test_generate_key_image);
   TEST_PERFORMANCE0(test_derive_public_key);
   TEST_PERFORMANCE0(test_derive_secret_key);
+  TEST_PERFORMANCE0(test_ge_frombytes_vartime);
 
   TEST_PERFORMANCE0(test_cn_slow_hash);