From 9f56bdf5b9ba2e22e77c6adaaeb8302398732df3 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter@wuille.net>
Date: Sun, 17 Oct 2021 14:02:10 -0400
Subject: [PATCH] Merge bench_schnorrsig into bench

---
 .gitignore                                      |  1 -
 ci/cirrus.sh                                    |  4 ----
 src/bench.c                                     |  9 +++++++++
 src/modules/schnorrsig/Makefile.am.include      |  6 +-----
 .../schnorrsig/bench_impl.h}                    | 17 ++++++-----------
 5 files changed, 16 insertions(+), 21 deletions(-)
 rename src/{bench_schnorrsig.c => modules/schnorrsig/bench_impl.h} (92%)

diff --git a/.gitignore b/.gitignore
index 599a2ef59f4bb..f3ed1c488f1cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 bench
 bench_ecmult
-bench_schnorrsig
 bench_internal
 tests
 exhaustive_tests
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
index 86d2f06b139bc..39ec2adbee07b 100755
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -51,10 +51,6 @@ then
         $EXEC ./bench_internal
         $EXEC ./bench
     } >> bench.log 2>&1
-    if [ "$SCHNORRSIG" = "yes" ]
-    then
-        $EXEC ./bench_schnorrsig >> bench.log 2>&1
-    fi
 fi
 if [ "$CTIMETEST" = "yes" ]
 then
diff --git a/src/bench.c b/src/bench.c
index 6b457b88f4e07..f46d5d60fcb79 100644
--- a/src/bench.c
+++ b/src/bench.c
@@ -84,6 +84,10 @@ static void bench_sign_run(void* arg, int iters) {
 # include "modules/recovery/bench_impl.h"
 #endif
 
+#ifdef ENABLE_MODULE_SCHNORRSIG
+# include "modules/schnorrsig/bench_impl.h"
+#endif
+
 int main(void) {
     int i;
     secp256k1_pubkey pubkey;
@@ -130,5 +134,10 @@ int main(void) {
     run_recovery_bench(iters);
 #endif
 
+#ifdef ENABLE_MODULE_SCHNORRSIG
+    /* Schnorr signature benchmarks */
+    run_schnorrsig_bench(iters);
+#endif
+
     return 0;
 }
diff --git a/src/modules/schnorrsig/Makefile.am.include b/src/modules/schnorrsig/Makefile.am.include
index 568bcc35232d5..654fa2e5ae5a4 100644
--- a/src/modules/schnorrsig/Makefile.am.include
+++ b/src/modules/schnorrsig/Makefile.am.include
@@ -2,8 +2,4 @@ include_HEADERS += include/secp256k1_schnorrsig.h
 noinst_HEADERS += src/modules/schnorrsig/main_impl.h
 noinst_HEADERS += src/modules/schnorrsig/tests_impl.h
 noinst_HEADERS += src/modules/schnorrsig/tests_exhaustive_impl.h
-if USE_BENCHMARK
-noinst_PROGRAMS += bench_schnorrsig
-bench_schnorrsig_SOURCES = src/bench_schnorrsig.c
-bench_schnorrsig_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
-endif
+noinst_HEADERS += src/modules/schnorrsig/bench_impl.h
diff --git a/src/bench_schnorrsig.c b/src/modules/schnorrsig/bench_impl.h
similarity index 92%
rename from src/bench_schnorrsig.c
rename to src/modules/schnorrsig/bench_impl.h
index e30735d8b9ee2..2f2c8db073a56 100644
--- a/src/bench_schnorrsig.c
+++ b/src/modules/schnorrsig/bench_impl.h
@@ -4,14 +4,10 @@
  * file COPYING or https://www.opensource.org/licenses/mit-license.php.*
  ***********************************************************************/
 
-#include <string.h>
-#include <stdlib.h>
+#ifndef SECP256K1_MODULE_SCHNORRSIG_BENCH_H
+#define SECP256K1_MODULE_SCHNORRSIG_BENCH_H
 
-
-#include "../include/secp256k1.h"
-#include "../include/secp256k1_schnorrsig.h"
-#include "util.h"
-#include "bench.h"
+#include "../../../include/secp256k1_schnorrsig.h"
 
 #define MSGLEN 32
 
@@ -49,10 +45,9 @@ void bench_schnorrsig_verify(void* arg, int iters) {
     }
 }
 
-int main(void) {
+void run_schnorrsig_bench(int iters) {
     int i;
     bench_schnorrsig_data data;
-    int iters = get_iters(10000);
 
     data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN);
     data.keypairs = (const secp256k1_keypair **)malloc(iters * sizeof(secp256k1_keypair *));
@@ -86,7 +81,6 @@ int main(void) {
         CHECK(secp256k1_xonly_pubkey_serialize(data.ctx, pk_char, &pk) == 1);
     }
 
-    print_output_table_header_row();
     run_benchmark("schnorrsig_sign", bench_schnorrsig_sign, NULL, NULL, (void *) &data, 10, iters);
     run_benchmark("schnorrsig_verify", bench_schnorrsig_verify, NULL, NULL, (void *) &data, 10, iters);
 
@@ -102,5 +96,6 @@ int main(void) {
     free(data.sigs);
 
     secp256k1_context_destroy(data.ctx);
-    return 0;
 }
+
+#endif