Skip to content

Commit 122dbae

Browse files
committed
autotools: Remove "auto" value of --with-ecmult-window option
"auto" implies that a value is being chosen based on build system introspection or host system capabilities. However, for the `--with-ecmult-window` option, the value "auto" is hardcoded, which might lead to confusion. This change replaces "auto" with a more appropriate default value.
1 parent 06bff6d commit 122dbae

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
MAKEFLAGS: -j4
1111
BUILD: check
1212
### secp256k1 config
13-
ECMULTWINDOW: auto
13+
ECMULTWINDOW: 15
1414
ECMULTGENKB: auto
1515
ASM: no
1616
WIDEMUL: auto

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
MAKEFLAGS: '-j4'
2222
BUILD: 'check'
2323
### secp256k1 config
24-
ECMULTWINDOW: 'auto'
24+
ECMULTWINDOW: 15
2525
ECMULTGENKB: 'auto'
2626
ASM: 'no'
2727
WIDEMUL: 'auto'

configure.ac

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,15 @@ AC_ARG_WITH([test-override-wide-multiply], [] ,[set_widemul=$withval], [set_wide
203203
AC_ARG_WITH([asm], [AS_HELP_STRING([--with-asm=x86_64|arm32|no|auto],
204204
[assembly to use (experimental: arm32) [default=auto]])],[req_asm=$withval], [req_asm=auto])
205205

206-
AC_ARG_WITH([ecmult-window], [AS_HELP_STRING([--with-ecmult-window=SIZE|auto],
206+
AC_ARG_WITH([ecmult-window], [AS_HELP_STRING([--with-ecmult-window=SIZE],
207207
[window size for ecmult precomputation for verification, specified as integer in range [2..24].]
208208
[Larger values result in possibly better performance at the cost of an exponentially larger precomputed table.]
209209
[The table will store 2^(SIZE-1) * 64 bytes of data but can be larger in memory due to platform-specific padding and alignment.]
210210
[A window size larger than 15 will require you delete the prebuilt precomputed_ecmult.c file so that it can be rebuilt.]
211211
[For very large window sizes, use "make -j 1" to reduce memory use during compilation.]
212-
["auto" is a reasonable setting for desktop machines (currently 15). [default=auto]]
212+
[The default value is a reasonable setting for desktop machines (currently 15). [default=15]]
213213
)],
214-
[req_ecmult_window=$withval], [req_ecmult_window=auto])
214+
[set_ecmult_window=$withval], [set_ecmult_window=15])
215215

216216
AC_ARG_WITH([ecmult-gen-kb], [AS_HELP_STRING([--with-ecmult-gen-kb=2|22|86|auto],
217217
[The size of the precomputed table for signing in multiples of 1024 bytes (on typical platforms).]
@@ -335,14 +335,7 @@ auto)
335335
;;
336336
esac
337337

338-
# Set ecmult window size
339-
if test x"$req_ecmult_window" = x"auto"; then
340-
set_ecmult_window=15
341-
else
342-
set_ecmult_window=$req_ecmult_window
343-
fi
344-
345-
error_window_size=['window size for ecmult precomputation not an integer in range [2..24] or "auto"']
338+
error_window_size=['window size for ecmult precomputation not an integer in range [2..24]']
346339
case $set_ecmult_window in
347340
''|*[[!0-9]]*)
348341
# no valid integer

0 commit comments

Comments
 (0)