diff --git a/src/secp256k1/src/bench_multiset.c b/src/secp256k1/src/bench_multiset.c --- a/src/secp256k1/src/bench_multiset.c +++ b/src/secp256k1/src/bench_multiset.c @@ -13,22 +13,22 @@ #define UNUSED(x) (void)(x) -void bench_multiset(void* arg) { - int it=0; - unsigned n,m; +#define BUFSIZE (3 * 32) + +void bench_multiset(void* arg, int iters) { + int it = 0; + int n, m; unsigned char result[32]; secp256k1_multiset multiset; UNUSED(arg); secp256k1_multiset_init(ctx, &multiset); - for (m=0; m < 300000; m++) - { - unsigned char buf[32*3]; + for (m = 0; m < iters; m++) { + unsigned char buf[BUFSIZE]; secp256k1_multiset x; - for(n = 0; n < sizeof(buf); n++) - { + for (n = 0; n < BUFSIZE; n++) { buf[n] = it++; } @@ -43,11 +43,11 @@ } int main(void) { + int iters = get_iters(300000); ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY); - - run_benchmark("multiset", bench_multiset, bench_multiset_setup, NULL, NULL, 5, 1); - + run_benchmark("multiset", bench_multiset, bench_multiset_setup, NULL, NULL, 5, iters); secp256k1_context_destroy(ctx); + return 0; } diff --git a/src/secp256k1/travis/build_autotools.sh b/src/secp256k1/travis/build_autotools.sh --- a/src/secp256k1/travis/build_autotools.sh +++ b/src/secp256k1/travis/build_autotools.sh @@ -61,6 +61,9 @@ if [ "$ECDH" == "yes" ]; then $EXEC ./bench_ecdh &>> bench.log fi + if [ "$MULTISET" == "yes" ]; then + $EXEC ./bench_multiset &>> bench.log + fi if [ -n "$CTIMETEST" ]; then libtool --mode=execute valgrind ./valgrind_ctime_test &> valgrind_ctime_test.log fi