Merge bench_recover into bench
This commit is contained in:
parent
855e18d8a8
commit
3208557ae1
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,7 +1,6 @@
|
|||||||
bench
|
bench
|
||||||
bench_ecmult
|
bench_ecmult
|
||||||
bench_schnorrsig
|
bench_schnorrsig
|
||||||
bench_recover
|
|
||||||
bench_internal
|
bench_internal
|
||||||
tests
|
tests
|
||||||
exhaustive_tests
|
exhaustive_tests
|
||||||
|
@ -51,10 +51,6 @@ then
|
|||||||
$EXEC ./bench_internal
|
$EXEC ./bench_internal
|
||||||
$EXEC ./bench
|
$EXEC ./bench
|
||||||
} >> bench.log 2>&1
|
} >> bench.log 2>&1
|
||||||
if [ "$RECOVERY" = "yes" ]
|
|
||||||
then
|
|
||||||
$EXEC ./bench_recover >> bench.log 2>&1
|
|
||||||
fi
|
|
||||||
if [ "$SCHNORRSIG" = "yes" ]
|
if [ "$SCHNORRSIG" = "yes" ]
|
||||||
then
|
then
|
||||||
$EXEC ./bench_schnorrsig >> bench.log 2>&1
|
$EXEC ./bench_schnorrsig >> bench.log 2>&1
|
||||||
|
@ -80,6 +80,10 @@ static void bench_sign_run(void* arg, int iters) {
|
|||||||
# include "modules/ecdh/bench_impl.h"
|
# include "modules/ecdh/bench_impl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ENABLE_MODULE_RECOVERY
|
||||||
|
# include "modules/recovery/bench_impl.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
int i;
|
int i;
|
||||||
secp256k1_pubkey pubkey;
|
secp256k1_pubkey pubkey;
|
||||||
@ -121,5 +125,10 @@ int main(void) {
|
|||||||
run_ecdh_bench(iters);
|
run_ecdh_bench(iters);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ENABLE_MODULE_RECOVERY
|
||||||
|
/* ECDSA recovery benchmarks */
|
||||||
|
run_recovery_bench(iters);
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -2,8 +2,4 @@ include_HEADERS += include/secp256k1_recovery.h
|
|||||||
noinst_HEADERS += src/modules/recovery/main_impl.h
|
noinst_HEADERS += src/modules/recovery/main_impl.h
|
||||||
noinst_HEADERS += src/modules/recovery/tests_impl.h
|
noinst_HEADERS += src/modules/recovery/tests_impl.h
|
||||||
noinst_HEADERS += src/modules/recovery/tests_exhaustive_impl.h
|
noinst_HEADERS += src/modules/recovery/tests_exhaustive_impl.h
|
||||||
if USE_BENCHMARK
|
noinst_HEADERS += src/modules/recovery/bench_impl.h
|
||||||
noinst_PROGRAMS += bench_recover
|
|
||||||
bench_recover_SOURCES = src/bench_recover.c
|
|
||||||
bench_recover_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
|
|
||||||
endif
|
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
* file COPYING or https://www.opensource.org/licenses/mit-license.php.*
|
* file COPYING or https://www.opensource.org/licenses/mit-license.php.*
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
|
|
||||||
#include "../include/secp256k1.h"
|
#ifndef SECP256K1_MODULE_RECOVERY_BENCH_H
|
||||||
|
#define SECP256K1_MODULE_RECOVERY_BENCH_H
|
||||||
|
|
||||||
#include "../include/secp256k1_recovery.h"
|
#include "../include/secp256k1_recovery.h"
|
||||||
#include "util.h"
|
|
||||||
#include "bench.h"
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
secp256k1_context *ctx;
|
secp256k1_context *ctx;
|
||||||
@ -48,17 +48,14 @@ void bench_recover_setup(void* arg) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(void) {
|
void run_recovery_bench(int iters) {
|
||||||
bench_recover_data data;
|
bench_recover_data data;
|
||||||
|
|
||||||
int iters = get_iters(20000);
|
|
||||||
|
|
||||||
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY);
|
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY);
|
||||||
|
|
||||||
print_output_table_header_row();
|
|
||||||
|
|
||||||
run_benchmark("ecdsa_recover", bench_recover, bench_recover_setup, NULL, &data, 10, iters);
|
run_benchmark("ecdsa_recover", bench_recover, bench_recover_setup, NULL, &data, 10, iters);
|
||||||
|
|
||||||
secp256k1_context_destroy(data.ctx);
|
secp256k1_context_destroy(data.ctx);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* SECP256K1_MODULE_RECOVERY_BENCH_H */
|
Loading…
x
Reference in New Issue
Block a user