sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

benchmarks: report iterations per second instead of the inverse

Browse source
This commit is contained in:
Mickey Rose 2016-02-27 22:23:28 +01:00
parent 3fdc799e84
commit 02286bb7d1
1 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
benchmark/bench_framework.hpp
View file

@ -10,6 +10,7 @@
// stl // stl
#include <chrono> #include <chrono>
#include <cmath> // log10
#include <cstdio> // snprintf #include <cstdio> // snprintf
#include <iostream> #include <iostream>
#include <set> #include <set>
@ -19,6 +20,12 @@
namespace benchmark { namespace benchmark {
template <typename T>
using milliseconds = std::chrono::duration<T, std::milli>;
template <typename T>
using seconds = std::chrono::duration<T>;
class test_case class test_case
{ {
protected: protected:
@ -134,6 +141,29 @@ inline int handle_args(int argc, char** argv, mapnik::parameters & params)
} \ } \
} \ } \
struct big_number_fmt
{
int w;
double v;
const char* u;
big_number_fmt(int width, double value, int base = 1000)
: w(width), v(value), u("")
{
static const char* suffixes = "\0\0k\0M\0G\0T\0P\0E\0Z\0Y\0\0";
u = suffixes;
while (v > 1 && std::log10(v) >= width && u[2])
{
v /= base;
u += 2;
}
// adjust width for proper alignment without suffix
w += (u == suffixes);
}
};
template <typename T> template <typename T>
int run(T const& test_runner, std::string const& name) int run(T const& test_runner, std::string const& name)
{ {
@ -156,7 +186,8 @@ int run(T const& test_runner, std::string const& name)
auto opt_min_duration = test_runner.params().template get<double>("min-duration", 0.0); auto opt_min_duration = test_runner.params().template get<double>("min-duration", 0.0);
std::chrono::duration<double> min_seconds(*opt_min_duration); std::chrono::duration<double> min_seconds(*opt_min_duration);
auto min_duration = std::chrono::duration_cast<decltype(elapsed)>(min_seconds); auto min_duration = std::chrono::duration_cast<decltype(elapsed)>(min_seconds);
std::size_t loops = 0; auto num_iters = test_runner.iterations();
auto total_iters = 0;
if (test_runner.threads() > 0) if (test_runner.threads() > 0)
{ {
@ -170,7 +201,7 @@ int run(T const& test_runner, std::string const& name)
start = std::chrono::high_resolution_clock::now(); start = std::chrono::high_resolution_clock::now();
std::for_each(tg.begin(), tg.end(), [](value_type & t) {if (t->joinable()) t->join();}); std::for_each(tg.begin(), tg.end(), [](value_type & t) {if (t->joinable()) t->join();});
elapsed = std::chrono::high_resolution_clock::now() - start; elapsed = std::chrono::high_resolution_clock::now() - start;
loops = 1; total_iters += num_iters;
} }
else else
{ {
@ -178,35 +209,29 @@ int run(T const& test_runner, std::string const& name)
do { do {
test_runner(); test_runner();
elapsed = std::chrono::high_resolution_clock::now() - start; elapsed = std::chrono::high_resolution_clock::now() - start;
++loops; total_iters += num_iters;
} while (elapsed < min_duration); } while (elapsed < min_duration);
} }
double iters = loops * test_runner.iterations();
double dur_total = std::chrono::duration<double, std::milli>(elapsed).count();
double dur_avg = dur_total / iters;
char iters_unit = ' ';
char msg[200]; char msg[200];
double dur_total = milliseconds<double>(elapsed).count();
if (iters >= 1e7) iters *= 1e-6, iters_unit = 'M'; big_number_fmt itersf(4, total_iters);
else if (iters >= 1e4) iters *= 1e-3, iters_unit = 'k';
std::snprintf(msg, sizeof(msg), std::snprintf(msg, sizeof(msg),
"%-43s %3zu threads %4.0f%c iters %6.0f milliseconds", "%-43s %3zu threads %*.0f%s iters %6.0f milliseconds",
name.c_str(), name.c_str(),
test_runner.threads(), test_runner.threads(),
iters, iters_unit, itersf.w, itersf.v, itersf.u,
dur_total); dur_total);
std::clog << msg; std::clog << msg;
// log average time per iteration, currently only for non-threaded runs // log average # of iterations per second, currently only for
// non-threaded runs
if (test_runner.threads() == 0) if (test_runner.threads() == 0)
{ {
char unit = 'm'; auto elapsed_nonzero = std::max(elapsed, decltype(elapsed){1});
if (dur_avg < 1e-5) dur_avg *= 1e+9, unit = 'p'; big_number_fmt ips(5, total_iters / seconds<double>(elapsed_nonzero).count());
else if (dur_avg < 1e-2) dur_avg *= 1e+6, unit = 'n'; std::snprintf(msg, sizeof(msg), " %*.0f%s i/s", ips.w, ips.v, ips.u);
else if (dur_avg < 1e+1) dur_avg *= 1e+3, unit = 'u';
std::snprintf(msg, sizeof(msg), " %4.0f%cs/iter", dur_avg, unit);
std::clog << msg; std::clog << msg;
} }