nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

performance_tests: add a --filter option to select what to run

Browse Source 
Removes a good bit of annoyance running those
This commit is contained in:
moneromooo-monero 2018-01-04 14:44:38 +00:00
parent a529f0a6c9
commit 62c45c0df1
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 97 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
tests/performance_tests/main.cpp
View File

@ -28,7 +28,10 @@
// //
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include <boost/regex.hpp>
#include "common/util.h" #include "common/util.h"
#include "common/command_line.h"
#include "performance_tests.h" #include "performance_tests.h"
#include "performance_utils.h" #include "performance_utils.h"
@ -48,6 +51,27 @@
#include "sc_reduce32.h" #include "sc_reduce32.h"
#include "cn_fast_hash.h" #include "cn_fast_hash.h"
namespace po = boost::program_options;
std::string glob_to_regex(const std::string &val)
{
std::string newval;
bool escape = false;
for (char c: val)
{
if (c == '*')
newval += escape ? "*" : ".*";
else if (c == '?')
newval += escape ? "?" : ".";
else if (c == '\\')
newval += '\\', escape = !escape;
else
newval += c;
}
return newval;
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
tools::on_startup(); tools::on_startup();
@ -57,67 +81,83 @@ int main(int argc, char** argv)
mlog_configure(mlog_get_default_log_path("performance_tests.log"), true); mlog_configure(mlog_get_default_log_path("performance_tests.log"), true);
mlog_set_log_level(0); mlog_set_log_level(0);
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" };
command_line::add_arg(desc_options, arg_filter, "");
po::variables_map vm;
bool r = command_line::handle_error_helper(desc_options, [&]()
{
po::store(po::parse_command_line(argc, argv, desc_options), vm);
po::notify(vm);
return true;
});
if (!r)
return 1;
const std::string filter = glob_to_regex(command_line::get_arg(vm, arg_filter));
performance_timer timer; performance_timer timer;
timer.start(); timer.start();
TEST_PERFORMANCE3(test_construct_tx, 1, 1, false); TEST_PERFORMANCE3(filter, test_construct_tx, 1, 1, false);
TEST_PERFORMANCE3(test_construct_tx, 1, 2, false); TEST_PERFORMANCE3(filter, test_construct_tx, 1, 2, false);
TEST_PERFORMANCE3(test_construct_tx, 1, 10, false); TEST_PERFORMANCE3(filter, test_construct_tx, 1, 10, false);
TEST_PERFORMANCE3(test_construct_tx, 1, 100, false); TEST_PERFORMANCE3(filter, test_construct_tx, 1, 100, false);
TEST_PERFORMANCE3(test_construct_tx, 1, 1000, false); TEST_PERFORMANCE3(filter, test_construct_tx, 1, 1000, false);
TEST_PERFORMANCE3(test_construct_tx, 2, 1, false); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 1, false);
TEST_PERFORMANCE3(test_construct_tx, 2, 2, false); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 2, false);
TEST_PERFORMANCE3(test_construct_tx, 2, 10, false); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 10, false);
TEST_PERFORMANCE3(test_construct_tx, 2, 100, false); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 100, false);
TEST_PERFORMANCE3(test_construct_tx, 10, 1, false); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 1, false);
TEST_PERFORMANCE3(test_construct_tx, 10, 2, false); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 2, false);
TEST_PERFORMANCE3(test_construct_tx, 10, 10, false); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 10, false);
TEST_PERFORMANCE3(test_construct_tx, 10, 100, false); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 100, false);
TEST_PERFORMANCE3(test_construct_tx, 100, 1, false); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 1, false);
TEST_PERFORMANCE3(test_construct_tx, 100, 2, false); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 2, false);
TEST_PERFORMANCE3(test_construct_tx, 100, 10, false); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 10, false);
TEST_PERFORMANCE3(test_construct_tx, 100, 100, false); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 100, false);
TEST_PERFORMANCE3(test_construct_tx, 2, 1, true); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 1, true);
TEST_PERFORMANCE3(test_construct_tx, 2, 2, true); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 2, true);
TEST_PERFORMANCE3(test_construct_tx, 2, 10, true); TEST_PERFORMANCE3(filter, test_construct_tx, 2, 10, true);
TEST_PERFORMANCE3(test_construct_tx, 10, 1, true); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 1, true);
TEST_PERFORMANCE3(test_construct_tx, 10, 2, true); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 2, true);
TEST_PERFORMANCE3(test_construct_tx, 10, 10, true); TEST_PERFORMANCE3(filter, test_construct_tx, 10, 10, true);
TEST_PERFORMANCE3(test_construct_tx, 100, 1, true); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 1, true);
TEST_PERFORMANCE3(test_construct_tx, 100, 2, true); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 2, true);
TEST_PERFORMANCE3(test_construct_tx, 100, 10, true); TEST_PERFORMANCE3(filter, test_construct_tx, 100, 10, true);
TEST_PERFORMANCE2(test_check_tx_signature, 1, false); TEST_PERFORMANCE2(filter, test_check_tx_signature, 1, false);
TEST_PERFORMANCE2(test_check_tx_signature, 2, false); TEST_PERFORMANCE2(filter, test_check_tx_signature, 2, false);
TEST_PERFORMANCE2(test_check_tx_signature, 10, false); TEST_PERFORMANCE2(filter, test_check_tx_signature, 10, false);
TEST_PERFORMANCE2(test_check_tx_signature, 100, false); TEST_PERFORMANCE2(filter, test_check_tx_signature, 100, false);
TEST_PERFORMANCE2(test_check_tx_signature, 2, true); TEST_PERFORMANCE2(filter, test_check_tx_signature, 2, true);
TEST_PERFORMANCE2(test_check_tx_signature, 10, true); TEST_PERFORMANCE2(filter, test_check_tx_signature, 10, true);
TEST_PERFORMANCE2(test_check_tx_signature, 100, true); TEST_PERFORMANCE2(filter, test_check_tx_signature, 100, true);
TEST_PERFORMANCE0(test_is_out_to_acc); TEST_PERFORMANCE0(filter, test_is_out_to_acc);
TEST_PERFORMANCE0(test_is_out_to_acc_precomp); TEST_PERFORMANCE0(filter, test_is_out_to_acc_precomp);
TEST_PERFORMANCE0(test_generate_key_image_helper); TEST_PERFORMANCE0(filter, test_generate_key_image_helper);
TEST_PERFORMANCE0(test_generate_key_derivation); TEST_PERFORMANCE0(filter, test_generate_key_derivation);
TEST_PERFORMANCE0(test_generate_key_image); TEST_PERFORMANCE0(filter, test_generate_key_image);
TEST_PERFORMANCE0(test_derive_public_key); TEST_PERFORMANCE0(filter, test_derive_public_key);
TEST_PERFORMANCE0(test_derive_secret_key); TEST_PERFORMANCE0(filter, test_derive_secret_key);
TEST_PERFORMANCE0(test_ge_frombytes_vartime); TEST_PERFORMANCE0(filter, test_ge_frombytes_vartime);
TEST_PERFORMANCE0(test_generate_keypair); TEST_PERFORMANCE0(filter, test_generate_keypair);
TEST_PERFORMANCE0(test_sc_reduce32); TEST_PERFORMANCE0(filter, test_sc_reduce32);
TEST_PERFORMANCE2(test_wallet2_expand_subaddresses, 50, 200); TEST_PERFORMANCE2(filter, test_wallet2_expand_subaddresses, 50, 200);
TEST_PERFORMANCE0(test_cn_slow_hash); TEST_PERFORMANCE0(filter, test_cn_slow_hash);
TEST_PERFORMANCE1(test_cn_fast_hash, 32); TEST_PERFORMANCE1(filter, test_cn_fast_hash, 32);
TEST_PERFORMANCE1(test_cn_fast_hash, 16384); TEST_PERFORMANCE1(filter, test_cn_fast_hash, 16384);
std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl; std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;

15
tests/performance_tests/performance_tests.h
View File

@ -34,6 +34,7 @@
#include <stdint.h> #include <stdint.h>
#include <boost/chrono.hpp> #include <boost/chrono.hpp>
#include <boost/regex.hpp>
class performance_timer class performance_timer
{ {
@ -122,8 +123,12 @@ private:
}; };
template <typename T> template <typename T>
void run_test(const char* test_name) void run_test(const std::string &filter, 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; test_runner<T> runner;
if (runner.run()) if (runner.run())
{ {
@ -149,7 +154,7 @@ void run_test(const char* test_name)
} }
#define QUOTEME(x) #x #define QUOTEME(x) #x
#define TEST_PERFORMANCE0(test_class) run_test< test_class >(QUOTEME(test_class)) #define TEST_PERFORMANCE0(filter, test_class) run_test< test_class >(filter, QUOTEME(test_class))
#define TEST_PERFORMANCE1(test_class, a0) run_test< test_class<a0> >(QUOTEME(test_class<a0>)) #define TEST_PERFORMANCE1(filter, test_class, a0) run_test< test_class<a0> >(filter, QUOTEME(test_class<a0>))
#define TEST_PERFORMANCE2(test_class, a0, a1) run_test< test_class<a0, a1> >(QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ">") #define TEST_PERFORMANCE2(filter, test_class, a0, a1) run_test< test_class<a0, a1> >(filter, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ">")
#define TEST_PERFORMANCE3(test_class, a0, a1, a2) run_test< test_class<a0, a1, a2> >(QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ">") #define TEST_PERFORMANCE3(filter, test_class, a0, a1, a2) run_test< test_class<a0, a1, a2> >(filter, QUOTEME(test_class) "<" QUOTEME(a0) ", " QUOTEME(a1) ", " QUOTEME(a2) ">")