diff --git a/src/bench_ecmult.c b/src/bench_ecmult.c index 37e8a5d510fda..335d910423120 100644 --- a/src/bench_ecmult.c +++ b/src/bench_ecmult.c @@ -124,7 +124,7 @@ static void bench_ecmult_const_teardown(void* arg, int iters) { bench_ecmult_teardown_helper(data, &data->offset1, &data->offset2, NULL, iters); } -static void bench_ecmult_1(void* arg, int iters) { +static void bench_ecmult_1p(void* arg, int iters) { bench_data* data = (bench_data*)arg; int i; @@ -133,12 +133,12 @@ static void bench_ecmult_1(void* arg, int iters) { } } -static void bench_ecmult_1_teardown(void* arg, int iters) { +static void bench_ecmult_1p_teardown(void* arg, int iters) { bench_data* data = (bench_data*)arg; bench_ecmult_teardown_helper(data, &data->offset1, &data->offset2, NULL, iters); } -static void bench_ecmult_1g(void* arg, int iters) { +static void bench_ecmult_0p_g(void* arg, int iters) { bench_data* data = (bench_data*)arg; secp256k1_scalar zero; int i; @@ -149,12 +149,12 @@ static void bench_ecmult_1g(void* arg, int iters) { } } -static void bench_ecmult_1g_teardown(void* arg, int iters) { +static void bench_ecmult_0p_g_teardown(void* arg, int iters) { bench_data* data = (bench_data*)arg; bench_ecmult_teardown_helper(data, NULL, NULL, &data->offset1, iters); } -static void bench_ecmult_2g(void* arg, int iters) { +static void bench_ecmult_1p_g(void* arg, int iters) { bench_data* data = (bench_data*)arg; int i; @@ -163,7 +163,7 @@ static void bench_ecmult_2g(void* arg, int iters) { } } -static void bench_ecmult_2g_teardown(void* arg, int iters) { +static void bench_ecmult_1p_g_teardown(void* arg, int iters) { bench_data* data = (bench_data*)arg; bench_ecmult_teardown_helper(data, &data->offset1, &data->offset2, &data->offset1, iters/2); } @@ -175,14 +175,14 @@ static void run_ecmult_bench(bench_data* data, int iters) { sprintf(str, "ecmult_const"); run_benchmark(str, bench_ecmult_const, bench_ecmult_setup, bench_ecmult_const_teardown, data, 10, iters); /* ecmult with non generator point */ - sprintf(str, "ecmult 1"); - run_benchmark(str, bench_ecmult_1, bench_ecmult_setup, bench_ecmult_1_teardown, data, 10, iters); + sprintf(str, "ecmult_1p"); + run_benchmark(str, bench_ecmult_1p, bench_ecmult_setup, bench_ecmult_1p_teardown, data, 10, iters); /* ecmult with generator point */ - sprintf(str, "ecmult 1g"); - run_benchmark(str, bench_ecmult_1g, bench_ecmult_setup, bench_ecmult_1g_teardown, data, 10, iters); + sprintf(str, "ecmult_0p_g"); + run_benchmark(str, bench_ecmult_0p_g, bench_ecmult_setup, bench_ecmult_0p_g_teardown, data, 10, iters); /* ecmult with generator and non-generator point. The reported time is per point. */ - sprintf(str, "ecmult 2g"); - run_benchmark(str, bench_ecmult_2g, bench_ecmult_setup, bench_ecmult_2g_teardown, data, 10, 2*iters); + sprintf(str, "ecmult_1p_g"); + run_benchmark(str, bench_ecmult_1p_g, bench_ecmult_setup, bench_ecmult_1p_g_teardown, data, 10, 2*iters); } static int bench_ecmult_multi_callback(secp256k1_scalar* sc, secp256k1_ge* ge, size_t idx, void* arg) { @@ -270,7 +270,11 @@ static void run_ecmult_multi_bench(bench_data* data, size_t count, int includes_ } /* Run the benchmark. */ - sprintf(str, includes_g ? "ecmult_multi %ig" : "ecmult_multi %i", (int)count); + if (includes_g) { + sprintf(str, "ecmult_multi_%ip_g", (int)count - 1); + } else { + sprintf(str, "ecmult_multi_%ip", (int)count); + } run_benchmark(str, bench_ecmult_multi, bench_ecmult_multi_setup, bench_ecmult_multi_teardown, data, 10, count * iters); }