Skip to content

Commit 8d7a9a8

Browse files
committed
benchmarks: Switch to NONE contexts
1 parent e3f8477 commit 8d7a9a8

File tree

5 files changed

+11
-25
lines changed

5 files changed

+11
-25
lines changed

src/bench.c

+5-10
Original file line numberDiff line numberDiff line change
@@ -164,31 +164,31 @@ int main(int argc, char** argv) {
164164

165165
/* Check if the user tries to benchmark optional module without building it */
166166
#ifndef ENABLE_MODULE_ECDH
167-
if (have_flag(argc, argv, "ecdh")) {
167+
if (have_flag(argc, argv, "ecdh")) {
168168
fprintf(stderr, "./bench: ECDH module not enabled.\n");
169169
fprintf(stderr, "Use ./configure --enable-module-ecdh.\n\n");
170170
return 1;
171171
}
172172
#endif
173173

174174
#ifndef ENABLE_MODULE_RECOVERY
175-
if (have_flag(argc, argv, "recover") || have_flag(argc, argv, "ecdsa_recover")) {
175+
if (have_flag(argc, argv, "recover") || have_flag(argc, argv, "ecdsa_recover")) {
176176
fprintf(stderr, "./bench: Public key recovery module not enabled.\n");
177177
fprintf(stderr, "Use ./configure --enable-module-recovery.\n\n");
178178
return 1;
179179
}
180180
#endif
181181

182182
#ifndef ENABLE_MODULE_SCHNORRSIG
183-
if (have_flag(argc, argv, "schnorrsig") || have_flag(argc, argv, "schnorrsig_sign") || have_flag(argc, argv, "schnorrsig_verify")) {
183+
if (have_flag(argc, argv, "schnorrsig") || have_flag(argc, argv, "schnorrsig_sign") || have_flag(argc, argv, "schnorrsig_verify")) {
184184
fprintf(stderr, "./bench: Schnorr signatures module not enabled.\n");
185185
fprintf(stderr, "Use ./configure --enable-module-schnorrsig.\n\n");
186186
return 1;
187187
}
188188
#endif
189189

190-
/* ECDSA verification benchmark */
191-
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
190+
/* ECDSA benchmark */
191+
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
192192

193193
for (i = 0; i < 32; i++) {
194194
data.msg[i] = 1 + i;
@@ -206,11 +206,6 @@ int main(int argc, char** argv) {
206206
print_output_table_header_row();
207207
if (d || have_flag(argc, argv, "ecdsa") || have_flag(argc, argv, "verify") || have_flag(argc, argv, "ecdsa_verify")) run_benchmark("ecdsa_verify", bench_verify, NULL, NULL, &data, 10, iters);
208208

209-
secp256k1_context_destroy(data.ctx);
210-
211-
/* ECDSA signing benchmark */
212-
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN);
213-
214209
if (d || have_flag(argc, argv, "ecdsa") || have_flag(argc, argv, "sign") || have_flag(argc, argv, "ecdsa_sign")) run_benchmark("ecdsa_sign", bench_sign_run, bench_sign_setup, NULL, &data, 10, iters);
215210

216211
secp256k1_context_destroy(data.ctx);

src/bench_ecmult.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ int main(int argc, char **argv) {
308308
}
309309
}
310310

311-
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
311+
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
312312
scratch_size = secp256k1_strauss_scratch_size(POINTS) + STRAUSS_SCRATCH_OBJECTS*16;
313313
if (!have_flag(argc, argv, "simple")) {
314314
data.scratch = secp256k1_scratch_space_create(data.ctx, scratch_size);

src/bench_internal.c

+3-12
Original file line numberDiff line numberDiff line change
@@ -343,19 +343,11 @@ void bench_rfc6979_hmac_sha256(void* arg, int iters) {
343343
}
344344
}
345345

346-
void bench_context_verify(void* arg, int iters) {
346+
void bench_context(void* arg, int iters) {
347347
int i;
348348
(void)arg;
349349
for (i = 0; i < iters; i++) {
350-
secp256k1_context_destroy(secp256k1_context_create(SECP256K1_CONTEXT_VERIFY));
351-
}
352-
}
353-
354-
void bench_context_sign(void* arg, int iters) {
355-
int i;
356-
(void)arg;
357-
for (i = 0; i < iters; i++) {
358-
secp256k1_context_destroy(secp256k1_context_create(SECP256K1_CONTEXT_SIGN));
350+
secp256k1_context_destroy(secp256k1_context_create(SECP256K1_CONTEXT_NONE));
359351
}
360352
}
361353

@@ -395,8 +387,7 @@ int main(int argc, char **argv) {
395387
if (d || have_flag(argc, argv, "hash") || have_flag(argc, argv, "hmac")) run_benchmark("hash_hmac_sha256", bench_hmac_sha256, bench_setup, NULL, &data, 10, iters);
396388
if (d || have_flag(argc, argv, "hash") || have_flag(argc, argv, "rng6979")) run_benchmark("hash_rfc6979_hmac_sha256", bench_rfc6979_hmac_sha256, bench_setup, NULL, &data, 10, iters);
397389

398-
if (d || have_flag(argc, argv, "context") || have_flag(argc, argv, "verify")) run_benchmark("context_verify", bench_context_verify, bench_setup, NULL, &data, 10, 1 + iters/1000);
399-
if (d || have_flag(argc, argv, "context") || have_flag(argc, argv, "sign")) run_benchmark("context_sign", bench_context_sign, bench_setup, NULL, &data, 10, 1 + iters/100);
390+
if (d || have_flag(argc, argv, "context")) run_benchmark("context_create", bench_context, bench_setup, NULL, &data, 10, iters);
400391

401392
return 0;
402393
}

src/modules/recovery/bench_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void run_recovery_bench(int iters, int argc, char** argv) {
5252
bench_recover_data data;
5353
int d = argc == 1;
5454

55-
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY);
55+
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
5656

5757
if (d || have_flag(argc, argv, "ecdsa") || have_flag(argc, argv, "recover") || have_flag(argc, argv, "ecdsa_recover")) run_benchmark("ecdsa_recover", bench_recover, bench_recover_setup, NULL, &data, 10, iters);
5858

src/modules/schnorrsig/bench_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void run_schnorrsig_bench(int iters, int argc, char** argv) {
5050
bench_schnorrsig_data data;
5151
int d = argc == 1;
5252

53-
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN);
53+
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
5454
data.keypairs = (const secp256k1_keypair **)malloc(iters * sizeof(secp256k1_keypair *));
5555
data.pk = (const unsigned char **)malloc(iters * sizeof(unsigned char *));
5656
data.msgs = (const unsigned char **)malloc(iters * sizeof(unsigned char *));

0 commit comments

Comments
 (0)