performance_tests: add stats and loop count multiplier options

Stats are: min, median, standard deviation

2 files changed, 409 insertions, 317 deletions

diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index abcc2a3d0..de9f0e647 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -73,8 +73,12 @@ int main(int argc, char** argv)
   po::options_description desc_options("Command line options");
   const command_line::arg_descriptor<std::string> arg_filter = { "filter", "Regular expression filter for which tests to run" };
   const command_line::arg_descriptor<bool> arg_verbose = { "verbose", "Verbose output", false };
+  const command_line::arg_descriptor<bool> arg_stats = { "stats", "Including statistics (min/median)", false };
+  const command_line::arg_descriptor<unsigned> arg_loop_multiplier = { "loop-multiplier", "Run for that many times more loops", 1 };
   command_line::add_arg(desc_options, arg_filter, "");
   command_line::add_arg(desc_options, arg_verbose, "");
+  command_line::add_arg(desc_options, arg_stats, "");
+  command_line::add_arg(desc_options, arg_loop_multiplier, "");
 
   po::variables_map vm;
   bool r = command_line::handle_error_helper(desc_options, [&]()
@@ -87,311 +91,314 @@ int main(int argc, char** argv)
     return 1;
 
   const std::string filter = tools::glob_to_regex(command_line::get_arg(vm, arg_filter));
-  bool verbose = command_line::get_arg(vm, arg_verbose);
+  Params p;
+  p.verbose = command_line::get_arg(vm, arg_verbose);
+  p.stats = command_line::get_arg(vm, arg_stats);
+  p.loop_multiplier = command_line::get_arg(vm, arg_loop_multiplier);
 
   performance_timer timer;
   timer.start();
 
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 1, 1, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 1, 2, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 1, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 1, 100, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 1, 1000, false);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 1, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 2, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 100, false);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 1, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 2, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 100, false);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 1, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 2, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 100, false);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 1, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 2, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 2, 10, true);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 1, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 2, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 10, 10, true);
-
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 1, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 2, true);
-  TEST_PERFORMANCE3(filter, verbose, test_construct_tx, 100, 10, true);
-
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 1, 2, false, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 2, false, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 10, 2, false, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 100, 2, false, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 10, false, false);
-
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 2, true, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 10, 2, true, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 100, 2, true, false);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 10, true, false);
-
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 2, true, true);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 10, 2, true, true);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 100, 2, true, true);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature, 2, 10, true, true);
-
-  TEST_PERFORMANCE3(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 64);
-  TEST_PERFORMANCE3(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 64);
-  TEST_PERFORMANCE3(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 100, 2, 64);
-  TEST_PERFORMANCE3(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 2, 10, 64);
-
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 62, 4);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 62, 4);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 56, 16);
-  TEST_PERFORMANCE4(filter, verbose, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 56, 16);
-
-  TEST_PERFORMANCE0(filter, verbose, test_is_out_to_acc);
-  TEST_PERFORMANCE0(filter, verbose, test_is_out_to_acc_precomp);
-  TEST_PERFORMANCE0(filter, verbose, test_generate_key_image_helper);
-  TEST_PERFORMANCE0(filter, verbose, test_generate_key_derivation);
-  TEST_PERFORMANCE0(filter, verbose, test_generate_key_image);
-  TEST_PERFORMANCE0(filter, verbose, test_derive_public_key);
-  TEST_PERFORMANCE0(filter, verbose, test_derive_secret_key);
-  TEST_PERFORMANCE0(filter, verbose, test_ge_frombytes_vartime);
-  TEST_PERFORMANCE0(filter, verbose, test_generate_keypair);
-  TEST_PERFORMANCE0(filter, verbose, test_sc_reduce32);
-  TEST_PERFORMANCE1(filter, verbose, test_signature, false);
-  TEST_PERFORMANCE1(filter, verbose, test_signature, true);
-
-  TEST_PERFORMANCE2(filter, verbose, test_wallet2_expand_subaddresses, 50, 200);
-
-  TEST_PERFORMANCE0(filter, verbose, test_cn_slow_hash);
-  TEST_PERFORMANCE1(filter, verbose, test_cn_fast_hash, 32);
-  TEST_PERFORMANCE1(filter, verbose, test_cn_fast_hash, 16384);
-
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 3, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 5, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 100, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 3, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 5, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 10, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 100, true);
-
-  TEST_PERFORMANCE2(filter, verbose, test_equality, memcmp32, true);
-  TEST_PERFORMANCE2(filter, verbose, test_equality, memcmp32, false);
-  TEST_PERFORMANCE2(filter, verbose, test_equality, verify32, false);
-  TEST_PERFORMANCE2(filter, verbose, test_equality, verify32, false);
-
-  TEST_PERFORMANCE1(filter, verbose, test_range_proof, true);
-  TEST_PERFORMANCE1(filter, verbose, test_range_proof, false);
-
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, true, 1); // 1 bulletproof with 1 amount
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, false, 1);
-
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, true, 2); // 1 bulletproof with 2 amounts
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, false, 2);
-
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, true, 15); // 1 bulletproof with 15 amounts
-  TEST_PERFORMANCE2(filter, verbose, test_bulletproof, false, 15);
-
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, false, 2, 1, 1, 0, 4);
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, true, 2, 1, 1, 0, 4); // 4 proofs, each with 2 amounts
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, false, 8, 1, 1, 0, 4);
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, true, 8, 1, 1, 0, 4); // 4 proofs, each with 8 amounts
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, false, 1, 1, 2, 0, 4);
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, true, 1, 1, 2, 0, 4); // 4 proofs with 1, 2, 4, 8 amounts
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, false, 1, 8, 1, 1, 4);
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, true, 1, 8, 1, 1, 4); // 32 proofs, with 1, 2, 3, 4 amounts, 8 of each
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, false, 2, 1, 1, 0, 64);
-  TEST_PERFORMANCE6(filter, verbose, test_aggregated_bulletproof, true, 2, 1, 1, 0, 64); // 64 proof, each with 2 amounts
-
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 3, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 5, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 10, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 100, false);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 3, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 5, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 10, true);
-  TEST_PERFORMANCE3(filter, verbose, test_ringct_mlsag, 1, 100, true);
-
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_sc_add);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_sc_sub);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_sc_mul);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_ge_add_raw);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_ge_add_p3_p3);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_addKeys);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_scalarmultBase);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_scalarmultKey);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_ge_double_scalarmult_base_vartime);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_ge_double_scalarmult_precomp_vartime);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_ge_double_scalarmult_precomp_vartime2);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_addKeys2);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_addKeys3);
-  TEST_PERFORMANCE1(filter, verbose, test_crypto_ops, op_addKeys3_2);
-
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 2);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 4);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 8);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 16);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 32);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 64);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 128);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 256);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 512);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 1024);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 2048);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_bos_coster, 4096);
-
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 2);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 4);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 8);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 16);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 32);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 64);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 128);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 256);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 512);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 1024);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 2048);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus, 4096);
-
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 2);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 4);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 8);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 16);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 32);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 64);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 128);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 256);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 512);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 1024);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 2048);
-  TEST_PERFORMANCE2(filter, verbose, test_multiexp, multiexp_straus_cached, 4096);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 1, 1, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 1, 2, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 1, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 1, 100, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 1, 1000, false);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 1, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 2, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 100, false);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 1, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 2, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 100, false);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 1, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 2, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 100, false);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 1, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 2, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 2, 10, true);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 1, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 2, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 10, 10, true);
+
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 1, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 2, true);
+  TEST_PERFORMANCE3(filter, p, test_construct_tx, 100, 10, true);
+
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 1, 2, false, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 2, false, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 10, 2, false, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 100, 2, false, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 10, false, false);
+
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 2, true, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 10, 2, true, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 100, 2, true, false);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 10, true, false);
+
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 2, true, true);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 10, 2, true, true);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 100, 2, true, true);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature, 2, 10, true, true);
+
+  TEST_PERFORMANCE3(filter, p, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 64);
+  TEST_PERFORMANCE3(filter, p, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 64);
+  TEST_PERFORMANCE3(filter, p, test_check_tx_signature_aggregated_bulletproofs, 100, 2, 64);
+  TEST_PERFORMANCE3(filter, p, test_check_tx_signature_aggregated_bulletproofs, 2, 10, 64);
+
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 62, 4);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 62, 4);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature_aggregated_bulletproofs, 2, 2, 56, 16);
+  TEST_PERFORMANCE4(filter, p, test_check_tx_signature_aggregated_bulletproofs, 10, 2, 56, 16);
+
+  TEST_PERFORMANCE0(filter, p, test_is_out_to_acc);
+  TEST_PERFORMANCE0(filter, p, test_is_out_to_acc_precomp);
+  TEST_PERFORMANCE0(filter, p, test_generate_key_image_helper);
+  TEST_PERFORMANCE0(filter, p, test_generate_key_derivation);
+  TEST_PERFORMANCE0(filter, p, test_generate_key_image);
+  TEST_PERFORMANCE0(filter, p, test_derive_public_key);
+  TEST_PERFORMANCE0(filter, p, test_derive_secret_key);
+  TEST_PERFORMANCE0(filter, p, test_ge_frombytes_vartime);
+  TEST_PERFORMANCE0(filter, p, test_generate_keypair);
+  TEST_PERFORMANCE0(filter, p, test_sc_reduce32);
+  TEST_PERFORMANCE1(filter, p, test_signature, false);
+  TEST_PERFORMANCE1(filter, p, test_signature, true);
+
+  TEST_PERFORMANCE2(filter, p, test_wallet2_expand_subaddresses, 50, 200);
+
+  TEST_PERFORMANCE0(filter, p, test_cn_slow_hash);
+  TEST_PERFORMANCE1(filter, p, test_cn_fast_hash, 32);
+  TEST_PERFORMANCE1(filter, p, test_cn_fast_hash, 16384);
+
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 3, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 5, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 100, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 3, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 5, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 10, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 100, true);
+
+  TEST_PERFORMANCE2(filter, p, test_equality, memcmp32, true);
+  TEST_PERFORMANCE2(filter, p, test_equality, memcmp32, false);
+  TEST_PERFORMANCE2(filter, p, test_equality, verify32, false);
+  TEST_PERFORMANCE2(filter, p, test_equality, verify32, false);
+
+  TEST_PERFORMANCE1(filter, p, test_range_proof, true);
+  TEST_PERFORMANCE1(filter, p, test_range_proof, false);
+
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, true, 1); // 1 bulletproof with 1 amount
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, false, 1);
+
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, true, 2); // 1 bulletproof with 2 amounts
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, false, 2);
+
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, true, 15); // 1 bulletproof with 15 amounts
+  TEST_PERFORMANCE2(filter, p, test_bulletproof, false, 15);
+
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, false, 2, 1, 1, 0, 4);
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, true, 2, 1, 1, 0, 4); // 4 proofs, each with 2 amounts
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, false, 8, 1, 1, 0, 4);
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, true, 8, 1, 1, 0, 4); // 4 proofs, each with 8 amounts
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, false, 1, 1, 2, 0, 4);
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, true, 1, 1, 2, 0, 4); // 4 proofs with 1, 2, 4, 8 amounts
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, false, 1, 8, 1, 1, 4);
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, true, 1, 8, 1, 1, 4); // 32 proofs, with 1, 2, 3, 4 amounts, 8 of each
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, false, 2, 1, 1, 0, 64);
+  TEST_PERFORMANCE6(filter, p, test_aggregated_bulletproof, true, 2, 1, 1, 0, 64); // 64 proof, each with 2 amounts
+
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 3, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 5, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 10, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 100, false);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 3, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 5, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 10, true);
+  TEST_PERFORMANCE3(filter, p, test_ringct_mlsag, 1, 100, true);
+
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_sc_add);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_sc_sub);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_sc_mul);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_ge_add_raw);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_ge_add_p3_p3);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_addKeys);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_scalarmultBase);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_scalarmultKey);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_ge_double_scalarmult_base_vartime);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_ge_double_scalarmult_precomp_vartime);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_ge_double_scalarmult_precomp_vartime2);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_addKeys2);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_addKeys3);
+  TEST_PERFORMANCE1(filter, p, test_crypto_ops, op_addKeys3_2);
+
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 2);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 4);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 8);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 16);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 32);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 64);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 128);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 256);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 512);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 1024);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 2048);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_bos_coster, 4096);
+
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 2);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 4);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 8);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 16);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 32);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 64);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 128);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 256);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 512);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 1024);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 2048);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus, 4096);
+
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 2);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 4);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 8);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 16);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 32);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 64);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 128);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 256);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 512);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 1024);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 2048);
+  TEST_PERFORMANCE2(filter, p, test_multiexp, multiexp_straus_cached, 4096);
 
 #if 1
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 9);
 #else
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 8, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 16, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 32, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 64, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 128, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 256, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 512, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 1024, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 2048, 9);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 1);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 2);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 3);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 4);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 5);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 6);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 7);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 8);
-  TEST_PERFORMANCE3(filter, verbose, test_multiexp, multiexp_pippenger, 4096, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 8, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 16, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 32, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 64, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 128, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 256, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 512, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 1024, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 2048, 9);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 1);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 2);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 3);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 4);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 5);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 6);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 7);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 8);
+  TEST_PERFORMANCE3(filter, p, test_multiexp, multiexp_pippenger, 4096, 9);
 #endif
 
   std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;
diff --git a/tests/performance_tests/performance_tests.h b/tests/performance_tests/performance_tests.h
index ce9baf61f..d37dda729 100644
--- a/tests/performance_tests/performance_tests.h
+++ b/tests/performance_tests/performance_tests.h
@@ -36,6 +36,9 @@
 #include <boost/chrono.hpp>
 #include <boost/regex.hpp>
 
+#include "misc_language.h"
+#include "common/perf_timer.h"
+
 class performance_timer
 {
 public:
@@ -62,14 +65,21 @@ private:
   clock::time_point m_start;
 };
 
+struct Params
+{
+  bool verbose;
+  bool stats;
+  unsigned loop_multiplier;
+};
 
 template <typename T>
 class test_runner
 {
 public:
-  test_runner(bool verbose = true)
+  test_runner(const Params &params)
     : m_elapsed(0)
-    , m_verbose(verbose)
+    , m_params(params)
+    , m_per_call_timers(T::loop_count * params.loop_multiplier, {true})
   {
   }
 
@@ -82,14 +92,18 @@ public:
     performance_timer timer;
     timer.start();
     warm_up();
-    if (m_verbose)
+    if (m_params.verbose)
       std::cout << "Warm up: " << timer.elapsed_ms() << " ms" << std::endl;
 
     timer.start();
-    for (size_t i = 0; i < T::loop_count; ++i)
+    for (size_t i = 0; i < T::loop_count * m_params.loop_multiplier; ++i)
     {
+      if (m_params.stats)
+        m_per_call_timers[i].resume();
       if (!test.test())
         return false;
+      if (m_params.stats)
+        m_per_call_timers[i].pause();
     }
     m_elapsed = timer.elapsed_ms();
 
@@ -101,9 +115,62 @@ public:
   int time_per_call(int scale = 1) const
   {
     static_assert(0 < T::loop_count, "T::loop_count must be greater than 0");
-    return m_elapsed * scale / T::loop_count;
+    return m_elapsed * scale / (T::loop_count * m_params.loop_multiplier);
+  }
+
+  uint64_t per_call_min() const
+  {
+    uint64_t v = std::numeric_limits<uint64_t>::max();
+    for (const auto &pt: m_per_call_timers)
+      v = std::min(v, pt.value());
+    return v;
+  }
+
+  uint64_t per_call_max() const
+  {
+    uint64_t v = std::numeric_limits<uint64_t>::min();
+    for (const auto &pt: m_per_call_timers)
+      v = std::max(v, pt.value());
+    return v;
+  }
+
+  uint64_t per_call_mean() const
+  {
+    uint64_t v = 0;
+    for (const auto &pt: m_per_call_timers)
+      v += pt.value();
+    return v / m_per_call_timers.size();
   }
 
+  uint64_t per_call_median() const
+  {
+    std::vector<uint64_t> values;
+    values.reserve(m_per_call_timers.size());
+    for (const auto &pt: m_per_call_timers)
+      values.push_back(pt.value());
+    return epee::misc_utils::median(values);
+  }
+
+  uint64_t per_call_stddev() const
+  {
+    if (m_per_call_timers.size() <= 1)
+      return 0;
+    const uint64_t mean = per_call_mean();
+    uint64_t acc = 0;
+    for (const auto &pt: m_per_call_timers)
+    {
+      int64_t dv = pt.value() - mean;
+      acc += dv * dv;
+    }
+    acc /= m_per_call_timers.size () - 1;
+    return sqrt(acc);
+  }
+
+  uint64_t min_time_ns() const { return tools::ticks_to_ns(per_call_min()); }
+  uint64_t max_time_ns() const { return tools::ticks_to_ns(per_call_max()); }
+  uint64_t median_time_ns() const { return tools::ticks_to_ns(per_call_median()); }
+  uint64_t standard_deviation_time_ns() const { return tools::ticks_to_ns(per_call_stddev()); }
+
 private:
   /**
    * Warm up processor core, enabling turbo boost, etc.
@@ -122,30 +189,39 @@ private:
 private:
   volatile uint64_t m_warm_up;  ///<! This field is intended for preclude compiler optimizations
   int m_elapsed;
-  bool m_verbose;
+  Params m_params;
+  std::vector<tools::PerformanceTimer> m_per_call_timers;
 };
 
 template <typename T>
-void run_test(const std::string &filter, bool verbose, const char* test_name)
+void run_test(const std::string &filter, const Params &params, const char* test_name)
 {
   boost::smatch match;
   if (!filter.empty() && !boost::regex_match(std::string(test_name), match, boost::regex(filter)))
     return;
 
-  test_runner<T> runner(verbose);
+  test_runner<T> runner(params);
   if (runner.run())
   {
-    if (verbose)
+    if (params.verbose)
     {
       std::cout << test_name << " - OK:\n";
-      std::cout << "  loop count:    " << T::loop_count << '\n';
+      std::cout << "  loop count:    " << T::loop_count * params.loop_multiplier << '\n';
       std::cout << "  elapsed:       " << runner.elapsed_time() << " ms\n";
+      if (params.stats)
+      {
+        std::cout << "  min:       " << runner.min_time_ns() << " ns\n";
+        std::cout << "  max:       " << runner.max_time_ns() << " ns\n";
+        std::cout << "  median:    " << runner.median_time_ns() << " ns\n";
+        std::cout << "  std dev:   " << runner.standard_deviation_time_ns() << " ns\n";
+      }
     }
     else
     {
-      std::cout << test_name << " (" << T::loop_count << " calls) - OK:";
+      std::cout << test_name << " (" << T::loop_count * params.loop_multiplier << " calls) - OK:";
     }
     const char *unit = "ms";
+    uint64_t scale = 1000000;
     int time_per_call = runner.time_per_call();
     if (time_per_call < 30000) {
      time_per_call = runner.time_per_call(1000);
@@ -154,8 +230,17 @@ void run_test(const std::string &filter, bool verbose, const char* test_name)
 #else
      unit = "µs";
 #endif
+     scale = 1000;
+    }
+    std::cout << (params.verbose ? "  time per call: " : " ") << time_per_call << " " << unit << "/call" << (params.verbose ? "\n" : "");
+    if (params.stats)
+    {
+      uint64_t min_ns = runner.min_time_ns() / scale;
+      uint64_t med_ns = runner.median_time_ns() / scale;
+      uint64_t stddev_ns = runner.standard_deviation_time_ns() / scale;
+      std::cout << " (min " << min_ns << " " << unit << ", median " << med_ns << " " << unit << ", std dev " << stddev_ns << " " << unit << ")";
     }
-    std::cout << (verbose ? "  time per call: " : " ") << time_per_call << " " << unit << "/call" << (verbose ? "\n" : "") << std::endl;
+    std::cout << std::endl;
   }
   else
   {
@@ -164,10 +249,10 @@ void run_test(const std::string &filter, bool verbose, const char* test_name)
 }
 
 #define QUOTEME(x) #x
-#define TEST_PERFORMANCE0(filter, verbose, test_class)         run_test< test_class >(filter, verbose, QUOTEME(test_class))
-#define TEST_PERFORMANCE1(filter, verbose, test_class, a0)     run_test< test_class<a0> >(filter, verbose, QUOTEME(test_class<a0>))
-#define TEST_PERFORMANCE2(filter, verbose, test_class, a0, a1) run_test< test_class<a0, a1> >(filter, verbose, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ">")
-#define TEST_PERFORMANCE3(filter, verbose, test_class, a0, a1, a2) run_test< test_class<a0, a1, a2> >(filter, verbose, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ">")
-#define TEST_PERFORMANCE4(filter, verbose, test_class, a0, a1, a2, a3) run_test< test_class<a0, a1, a2, a3> >(filter, verbose, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ">")
-#define TEST_PERFORMANCE5(filter, verbose, test_class, a0, a1, a2, a3, a4) run_test< test_class<a0, a1, a2, a3, a4> >(filter, verbose, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ", " QUOTEME(a4) ">")
-#define TEST_PERFORMANCE6(filter, verbose, test_class, a0, a1, a2, a3, a4, a5) run_test< test_class<a0, a1, a2, a3, a4, a5> >(filter, verbose, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ", " QUOTEME(a4) ", " QUOTEME(a5) ">")
+#define TEST_PERFORMANCE0(filter, params, test_class)         run_test< test_class >(filter, params, QUOTEME(test_class))
+#define TEST_PERFORMANCE1(filter, params, test_class, a0)     run_test< test_class<a0> >(filter, params, QUOTEME(test_class<a0>))
+#define TEST_PERFORMANCE2(filter, params, test_class, a0, a1) run_test< test_class<a0, a1> >(filter, params, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ">")
+#define TEST_PERFORMANCE3(filter, params, test_class, a0, a1, a2) run_test< test_class<a0, a1, a2> >(filter, params, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ">")
+#define TEST_PERFORMANCE4(filter, params, test_class, a0, a1, a2, a3) run_test< test_class<a0, a1, a2, a3> >(filter, params, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ">")
+#define TEST_PERFORMANCE5(filter, params, test_class, a0, a1, a2, a3, a4) run_test< test_class<a0, a1, a2, a3, a4> >(filter, params, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ", " QUOTEME(a4) ">")
+#define TEST_PERFORMANCE6(filter, params, test_class, a0, a1, a2, a3, a4, a5) run_test< test_class<a0, a1, a2, a3, a4, a5> >(filter, params, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ", " QUOTEME(a3) ", " QUOTEME(a4) ", " QUOTEME(a5) ">")