From 6f91b19be1b4dc77916d22e802da827f4e392551 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 21:57:41 -0500 Subject: [PATCH 1/6] Invert --with-secp256k1. --- builds/cmake/install-cmake.sh | 275 ++++------------- builds/cmake/install-presets.sh | 275 ++++------------- builds/gnu/install-gnu.sh | 287 ++++-------------- .../libbitcoin-node-test.props | 4 - .../libbitcoin-node-test.vcxproj | 2 - .../libbitcoin-node-test/packages.config | 1 - .../libbitcoin-node/libbitcoin-node.props | 4 - .../libbitcoin-node/libbitcoin-node.vcxproj | 2 - .../vs2026/libbitcoin-node/packages.config | 1 - .../vs2026/libbitcoin-system.import.props | 2 +- 10 files changed, 181 insertions(+), 672 deletions(-) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index caacfe9ec..d5beb95dc 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -8,7 +8,36 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: - +# -Denable-shani= Use Intel SHA Extensions. +# Default: OFF +# -Denable-sha512= Use Intel SHA512 Extensions (implies AVX2). +# Default: OFF +# -Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics. +# Default: OFF +# -Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# Default: OFF +# -Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# Default: OFF +# -Denable-avx512= Use Intel AVX512 intrinsics. +# Default: OFF +# -Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2). +# Default: OFF +# -Denable-avx2= Use Intel AVX2 intrinsics. +# Default: OFF +# -Denable-sse41= Use SSE4.1 hardware instructions. +# Default: OFF +# -Denable-sha2= Use ARM SHA1/SHA256 Extensions. +# Default: OFF +# -Denable-sha3= Use ARM SHA3 Extensions for SHA512. +# Default: OFF +# -Denable-aes= Use ARM AES and PMULL Extensions. +# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON +# -Dwith-valgrind= Use valgrind memcheck client requests. +# Default: OFF +# -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). +# Default: ON # --build-secp256k1 Build libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -39,54 +68,6 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # -# Hardware configuration options for arm64: -# --hardware-aes Use ARM AES and PMULL Extensions. -# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. -# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. -# -# Hardware configuration options for x64: -# --hardware-avx2 Use Intel AVX2 intrinsics. -# --hardware-avx512 Use Intel AVX512 intrinsics. -# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). -# --hardware-shani Use Intel SHA Extensions. -# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). -# --hardware-sse41 Use SSE4.1 hardware instructions. -# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. -# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# -# Recognized pass-through options: -# -Denable-shani= Add Intel SHA Extensions via compilation options. -# Default: OFF -# -Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options. -# Default: OFF -# -Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. -# Default: OFF -# -Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. -# Default: OFF -# -Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. -# Default: OFF -# -Denable-avx512= Add Intel AVX512 intrinsics via compilation options. -# Default: OFF -# -Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. -# Default: OFF -# -Denable-avx2= Add Intel AVX2 intrinsics via compilation options. -# Default: OFF -# -Denable-sse41= Add SSE4.1 hardware instructions via compilation options. -# Default: OFF -# -Denable-sha2= Check for ARM SHA1/SHA256 Extensions. -# Default: OFF -# -Denable-sha3= Check for ARM SHA3 Extensions for SHA512. -# Default: OFF -# -Denable-aes= Check for ARM AES and PMULL Extensions. -# Default: OFF -# -Dwith-secp256k1= Use bitcoin-core/secp256k1 library. -# Default: OFF -# -Dwith-valgrind= Use valgrind memcheck client requests. -# Default: OFF -# -Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON -# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -140,18 +121,6 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-secp256k1) BUILD_secp256k1="yes";; - (--hardware-aes) HARDWARE_AES="yes";; - (--hardware-sha2) HARDWARE_SHA2="yes";; - (--hardware-sha3) HARDWARE_SHA3="yes";; - (--hardware-avx2) HARDWARE_AVX2="yes";; - (--hardware-avx512) HARDWARE_AVX512="yes";; - (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; - (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; - (--hardware-shani) HARDWARE_SHANI="yes";; - (--hardware-sha512) HARDWARE_SHA512="yes";; - (--hardware-sse41) HARDWARE_SSE41="yes";; - (--hardware-aesni) HARDWARE_AESNI="yes";; - (--hardware-vaes) HARDWARE_VAES="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -197,18 +166,6 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" msg_verbose "*** SANITIZED: ${CONFIGURE_OPTIONS[*]}" @@ -436,99 +393,6 @@ main() ARCHTUNE="-march=native -mtune=native" fi - # Platform options: arm64 - - if [[ "${HARDWARE_AES}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+aes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aes=ON" ) - fi - - if [[ "${HARDWARE_SHA2}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha2" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha2=ON" ) - fi - - if [[ "${HARDWARE_SHA3}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8.2-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha3" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha3=ON" ) - fi - - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" - fi - - # Platform options: x64 - - if [[ "${HARDWARE_AVX2}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx2=ON" ) - fi - - if [[ "${HARDWARE_AVX512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512=ON" ) - fi - - if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512ifma=ON" ) - fi - - if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avxifma=ON" ) - fi - - if [[ "${HARDWARE_SHANI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-shani=ON" ) - fi - - if [[ "${HARDWARE_SHA512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha512=ON" ) - fi - - if [[ "${HARDWARE_SSE41}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sse41=ON" ) - fi - - if [[ "${HARDWARE_AESNI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aesni=ON" ) - fi - - if [[ "${HARDWARE_VAES}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-vaes=ON" ) - fi - - HARDWARE_PLATFORM_COUNT=0 - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - - if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then - msg_error "Hardware options spanning more than one platform have been specified." - exit 1 - fi - - if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && - [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then - msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." - exit 1 - fi - # translate BUILD_CONFIG to ZFLAGS if [[ -n "${BUILD_CONFIG}" ]]; then msg_verbose "*** Build config specified, calculating flags..." @@ -1029,7 +893,36 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - + msg "-Denable-shani= Use Intel SHA Extensions." + msg " Default: OFF" + msg "-Denable-sha512= Use Intel SHA512 Extensions (implies AVX2)." + msg " Default: OFF" + msg "-Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics." + msg " Default: OFF" + msg "-Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg " Default: OFF" + msg "-Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg " Default: OFF" + msg "-Denable-avx512= Use Intel AVX512 intrinsics." + msg " Default: OFF" + msg "-Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2)." + msg " Default: OFF" + msg "-Denable-avx2= Use Intel AVX2 intrinsics." + msg " Default: OFF" + msg "-Denable-sse41= Use SSE4.1 hardware instructions." + msg " Default: OFF" + msg "-Denable-sha2= Use ARM SHA1/SHA256 Extensions." + msg " Default: OFF" + msg "-Denable-sha3= Use ARM SHA3 Extensions for SHA512." + msg " Default: OFF" + msg "-Denable-aes= Use ARM AES and PMULL Extensions." + msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" + msg "-Dwith-valgrind= Use valgrind memcheck client requests." + msg " Default: OFF" + msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." + msg " Default: ON" msg "--build-secp256k1 Build libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" @@ -1060,54 +953,6 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" - msg "Hardware configuration options for arm64:" - msg "--hardware-aes Use ARM AES and PMULL Extensions." - msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." - msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." - msg "" - msg "Hardware configuration options for x64:" - msg "--hardware-avx2 Use Intel AVX2 intrinsics." - msg "--hardware-avx512 Use Intel AVX512 intrinsics." - msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." - msg "--hardware-shani Use Intel SHA Extensions." - msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." - msg "--hardware-sse41 Use SSE4.1 hardware instructions." - msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." - msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg "" - msg "Recognized pass-through options:" - msg "-Denable-shani= Add Intel SHA Extensions via compilation options." - msg " Default: OFF" - msg "-Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." - msg " Default: OFF" - msg "-Denable-avx512= Add Intel AVX512 intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-avx2= Add Intel AVX2 intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-sse41= Add SSE4.1 hardware instructions via compilation options." - msg " Default: OFF" - msg "-Denable-sha2= Check for ARM SHA1/SHA256 Extensions." - msg " Default: OFF" - msg "-Denable-sha3= Check for ARM SHA3 Extensions for SHA512." - msg " Default: OFF" - msg "-Denable-aes= Check for ARM AES and PMULL Extensions." - msg " Default: OFF" - msg "-Dwith-secp256k1= Use bitcoin-core/secp256k1 library." - msg " Default: OFF" - msg "-Dwith-valgrind= Use valgrind memcheck client requests." - msg " Default: OFF" - msg "-Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" - msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index f31b10314..09db92c88 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -8,7 +8,36 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: - +# -Denable-shani= Use Intel SHA Extensions. +# Default: OFF +# -Denable-sha512= Use Intel SHA512 Extensions (implies AVX2). +# Default: OFF +# -Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics. +# Default: OFF +# -Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# Default: OFF +# -Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# Default: OFF +# -Denable-avx512= Use Intel AVX512 intrinsics. +# Default: OFF +# -Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2). +# Default: OFF +# -Denable-avx2= Use Intel AVX2 intrinsics. +# Default: OFF +# -Denable-sse41= Use SSE4.1 hardware instructions. +# Default: OFF +# -Denable-sha2= Use ARM SHA1/SHA256 Extensions. +# Default: OFF +# -Denable-sha3= Use ARM SHA3 Extensions for SHA512. +# Default: OFF +# -Denable-aes= Use ARM AES and PMULL Extensions. +# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON +# -Dwith-valgrind= Use valgrind memcheck client requests. +# Default: OFF +# -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). +# Default: ON # --build-secp256k1 Build libsecp256k1 libraries # --build-preset= Specifies preset configuration to build. # --build-src-dir= Location for sources. @@ -29,54 +58,6 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # -# Hardware configuration options for arm64: -# --hardware-aes Use ARM AES and PMULL Extensions. -# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. -# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. -# -# Hardware configuration options for x64: -# --hardware-avx2 Use Intel AVX2 intrinsics. -# --hardware-avx512 Use Intel AVX512 intrinsics. -# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). -# --hardware-shani Use Intel SHA Extensions. -# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). -# --hardware-sse41 Use SSE4.1 hardware instructions. -# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. -# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# -# Recognized pass-through options: -# -Denable-shani= Add Intel SHA Extensions via compilation options. -# Default: OFF -# -Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options. -# Default: OFF -# -Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. -# Default: OFF -# -Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. -# Default: OFF -# -Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. -# Default: OFF -# -Denable-avx512= Add Intel AVX512 intrinsics via compilation options. -# Default: OFF -# -Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. -# Default: OFF -# -Denable-avx2= Add Intel AVX2 intrinsics via compilation options. -# Default: OFF -# -Denable-sse41= Add SSE4.1 hardware instructions via compilation options. -# Default: OFF -# -Denable-sha2= Check for ARM SHA1/SHA256 Extensions. -# Default: OFF -# -Denable-sha3= Check for ARM SHA3 Extensions for SHA512. -# Default: OFF -# -Denable-aes= Check for ARM AES and PMULL Extensions. -# Default: OFF -# -Dwith-secp256k1= Use bitcoin-core/secp256k1 library. -# Default: OFF -# -Dwith-valgrind= Use valgrind memcheck client requests. -# Default: OFF -# -Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON -# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -130,18 +111,6 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-secp256k1) BUILD_secp256k1="yes";; - (--hardware-aes) HARDWARE_AES="yes";; - (--hardware-sha2) HARDWARE_SHA2="yes";; - (--hardware-sha3) HARDWARE_SHA3="yes";; - (--hardware-avx2) HARDWARE_AVX2="yes";; - (--hardware-avx512) HARDWARE_AVX512="yes";; - (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; - (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; - (--hardware-shani) HARDWARE_SHANI="yes";; - (--hardware-sha512) HARDWARE_SHA512="yes";; - (--hardware-sse41) HARDWARE_SSE41="yes";; - (--hardware-aesni) HARDWARE_AESNI="yes";; - (--hardware-vaes) HARDWARE_VAES="yes";; (--build-preset=*) BUILD_PRESET="${OPTION#*=}";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-limit=*) BUILD_LIMIT="${OPTION#*=}";; @@ -179,18 +148,6 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" msg_verbose "*** SANITIZED: ${CONFIGURE_OPTIONS[*]}" @@ -468,99 +425,6 @@ main() ARCHTUNE="-march=native -mtune=native" fi - # Platform options: arm64 - - if [[ "${HARDWARE_AES}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+aes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aes=ON" ) - fi - - if [[ "${HARDWARE_SHA2}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha2" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha2=ON" ) - fi - - if [[ "${HARDWARE_SHA3}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8.2-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha3" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha3=ON" ) - fi - - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" - fi - - # Platform options: x64 - - if [[ "${HARDWARE_AVX2}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx2=ON" ) - fi - - if [[ "${HARDWARE_AVX512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512=ON" ) - fi - - if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512ifma=ON" ) - fi - - if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avxifma=ON" ) - fi - - if [[ "${HARDWARE_SHANI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-shani=ON" ) - fi - - if [[ "${HARDWARE_SHA512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha512=ON" ) - fi - - if [[ "${HARDWARE_SSE41}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sse41=ON" ) - fi - - if [[ "${HARDWARE_AESNI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aesni=ON" ) - fi - - if [[ "${HARDWARE_VAES}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-vaes=ON" ) - fi - - HARDWARE_PLATFORM_COUNT=0 - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - - if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then - msg_error "Hardware options spanning more than one platform have been specified." - exit 1 - fi - - if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && - [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then - msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." - exit 1 - fi - # Specify cmake build if [[ "${BUILD_CONFIG}" == "debug" ]]; then @@ -1094,7 +958,36 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - + msg "-Denable-shani= Use Intel SHA Extensions." + msg " Default: OFF" + msg "-Denable-sha512= Use Intel SHA512 Extensions (implies AVX2)." + msg " Default: OFF" + msg "-Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics." + msg " Default: OFF" + msg "-Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg " Default: OFF" + msg "-Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg " Default: OFF" + msg "-Denable-avx512= Use Intel AVX512 intrinsics." + msg " Default: OFF" + msg "-Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2)." + msg " Default: OFF" + msg "-Denable-avx2= Use Intel AVX2 intrinsics." + msg " Default: OFF" + msg "-Denable-sse41= Use SSE4.1 hardware instructions." + msg " Default: OFF" + msg "-Denable-sha2= Use ARM SHA1/SHA256 Extensions." + msg " Default: OFF" + msg "-Denable-sha3= Use ARM SHA3 Extensions for SHA512." + msg " Default: OFF" + msg "-Denable-aes= Use ARM AES and PMULL Extensions." + msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" + msg "-Dwith-valgrind= Use valgrind memcheck client requests." + msg " Default: OFF" + msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." + msg " Default: ON" msg "--build-secp256k1 Build libsecp256k1 libraries" msg "--build-preset= Specifies preset configuration to build." msg "--build-src-dir= Location for sources." @@ -1115,54 +1008,6 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" - msg "Hardware configuration options for arm64:" - msg "--hardware-aes Use ARM AES and PMULL Extensions." - msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." - msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." - msg "" - msg "Hardware configuration options for x64:" - msg "--hardware-avx2 Use Intel AVX2 intrinsics." - msg "--hardware-avx512 Use Intel AVX512 intrinsics." - msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." - msg "--hardware-shani Use Intel SHA Extensions." - msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." - msg "--hardware-sse41 Use SSE4.1 hardware instructions." - msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." - msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg "" - msg "Recognized pass-through options:" - msg "-Denable-shani= Add Intel SHA Extensions via compilation options." - msg " Default: OFF" - msg "-Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." - msg " Default: OFF" - msg "-Denable-avx512= Add Intel AVX512 intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." - msg " Default: OFF" - msg "-Denable-avx2= Add Intel AVX2 intrinsics via compilation options." - msg " Default: OFF" - msg "-Denable-sse41= Add SSE4.1 hardware instructions via compilation options." - msg " Default: OFF" - msg "-Denable-sha2= Check for ARM SHA1/SHA256 Extensions." - msg " Default: OFF" - msg "-Denable-sha3= Check for ARM SHA3 Extensions for SHA512." - msg " Default: OFF" - msg "-Denable-aes= Check for ARM AES and PMULL Extensions." - msg " Default: OFF" - msg "-Dwith-secp256k1= Use bitcoin-core/secp256k1 library." - msg " Default: OFF" - msg "-Dwith-valgrind= Use valgrind memcheck client requests." - msg " Default: OFF" - msg "-Dwith-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" - msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 540d56626..231ae1a96 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -8,7 +8,36 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: - +# ---shani Use Intel SHA Extensions. +# Default: --disable-shani +# ---sha512 Use Intel SHA512 Extensions (implies AVX2). +# Default: --disable-sha512 +# ---aesni Use Intel AES-NI and PCLMULQDQ intrinsics. +# Default: --disable-aesni +# ---vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# Default: --disable-vaes +# ---avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# Default: --disable-avx512ifma +# ---avx512 Use Intel AVX512 intrinsics. +# Default: --disable-avx512 +# ---avxifma Use Intel AVX IFMA intrinsics (implies AVX2). +# Default: --disable-avxifma +# ---avx2 Use Intel AVX2 intrinsics. +# Default: --disable-avx2 +# ---sse41 Use SSE4.1 hardware instructions. +# Default: --disable-sse41 +# ---sha2 Use ARM SHA1/SHA256 Extensions. +# Default: --disable-sha2 +# ---sha3 Use ARM SHA3 Extensions for SHA512. +# Default: --disable-sha3 +# ---aes Use ARM AES and PMULL Extensions. +# Default: --disable-aes +# ---secp256k1 Use native secp256k1 interface, otherwise external library. +# Default: --with-secp256k1 +# ---valgrind Use valgrind memcheck client requests. +# Default: --without-valgrind +# ---cuda Use cuda (gpu) batch signature verification (inert on macOS). +# Default: --enable-cuda # --build-secp256k1 Build libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -40,54 +69,6 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # -# Hardware configuration options for arm64: -# --hardware-aes Use ARM AES and PMULL Extensions. -# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. -# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. -# -# Hardware configuration options for x64: -# --hardware-avx2 Use Intel AVX2 intrinsics. -# --hardware-avx512 Use Intel AVX512 intrinsics. -# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). -# --hardware-shani Use Intel SHA Extensions. -# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). -# --hardware-sse41 Use SSE4.1 hardware instructions. -# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. -# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# -# Recognized pass-through options: -# ---shani Add Intel SHA Extensions via compilation options. -# Default: --disable-shani -# ---sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options. -# Default: --disable-sha512 -# ---aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. -# Default: --disable-aesni -# ---vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. -# Default: --disable-vaes -# ---avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. -# Default: --disable-avx512ifma -# ---avx512 Add Intel AVX512 intrinsics via compilation options. -# Default: --disable-avx512 -# ---avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. -# Default: --disable-avxifma -# ---avx2 Add Intel AVX2 intrinsics via compilation options. -# Default: --disable-avx2 -# ---sse41 Add SSE4.1 hardware instructions via compilation options. -# Default: --disable-sse41 -# ---sha2 Check for ARM SHA1/SHA256 Extensions. -# Default: --disable-sha2 -# ---sha3 Check for ARM SHA3 Extensions for SHA512. -# Default: --disable-sha3 -# ---aes Check for ARM AES and PMULL Extensions. -# Default: --disable-aes -# ---secp256k1 Use bitcoin-core/secp256k1 library. -# Default: --without-secp256k1 -# ---valgrind Use valgrind memcheck client requests. -# Default: --without-valgrind -# ---cuda Use cuda (gpu) batch signature verification (inert on macOS). -# Default: --with-cuda -# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -141,18 +122,6 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-secp256k1) BUILD_secp256k1="yes";; - (--hardware-aes) HARDWARE_AES="yes";; - (--hardware-sha2) HARDWARE_SHA2="yes";; - (--hardware-sha3) HARDWARE_SHA3="yes";; - (--hardware-avx2) HARDWARE_AVX2="yes";; - (--hardware-avx512) HARDWARE_AVX512="yes";; - (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; - (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; - (--hardware-shani) HARDWARE_SHANI="yes";; - (--hardware-sha512) HARDWARE_SHA512="yes";; - (--hardware-sse41) HARDWARE_SSE41="yes";; - (--hardware-aesni) HARDWARE_AESNI="yes";; - (--hardware-vaes) HARDWARE_VAES="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -196,18 +165,6 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=() CONFIGURE_OPTIONS_GNU=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" @@ -441,111 +398,6 @@ main() ARCHTUNE="-march=native -mtune=native" fi - # Platform options: arm64 - - if [[ "${HARDWARE_AES}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+aes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-aes" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-aes" ) - fi - - if [[ "${HARDWARE_SHA2}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha2" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha2" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha2" ) - fi - - if [[ "${HARDWARE_SHA3}" == "yes" ]]; then - HARDWARE_PLATFORM_ARM64="yes" - ARCHBASE="armv8.2-a" - ARCHSUFFIX="${ARCHSUFFIX}+sha3" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha3" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha3" ) - fi - - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" - fi - - # Platform options: x64 - - if [[ "${HARDWARE_AVX2}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx2" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx2" ) - fi - - if [[ "${HARDWARE_AVX512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx512" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx512" ) - fi - - if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx512ifma" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx512ifma" ) - fi - - if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avxifma" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avxifma" ) - fi - - if [[ "${HARDWARE_SHANI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-shani" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-shani" ) - fi - - if [[ "${HARDWARE_SHA512}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha512" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha512" ) - fi - - if [[ "${HARDWARE_SSE41}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sse41" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sse41" ) - fi - - if [[ "${HARDWARE_AESNI}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-aesni" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-aesni" ) - fi - - if [[ "${HARDWARE_VAES}" == "yes" ]]; then - HARDWARE_PLATFORM_X64="yes" - CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-vaes" ) - CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-vaes" ) - fi - - HARDWARE_PLATFORM_COUNT=0 - if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then - HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) - fi - - if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then - msg_error "Hardware options spanning more than one platform have been specified." - exit 1 - fi - - if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && - [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then - msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." - exit 1 - fi - # translate BUILD_CONFIG to ZFLAGS if [[ -n "${BUILD_CONFIG}" ]]; then msg_verbose "*** Build config specified, calculating flags..." @@ -1102,7 +954,36 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - + msg "---shani Use Intel SHA Extensions." + msg " Default: --disable-shani" + msg "---sha512 Use Intel SHA512 Extensions (implies AVX2)." + msg " Default: --disable-sha512" + msg "---aesni Use Intel AES-NI and PCLMULQDQ intrinsics." + msg " Default: --disable-aesni" + msg "---vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg " Default: --disable-vaes" + msg "---avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg " Default: --disable-avx512ifma" + msg "---avx512 Use Intel AVX512 intrinsics." + msg " Default: --disable-avx512" + msg "---avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." + msg " Default: --disable-avxifma" + msg "---avx2 Use Intel AVX2 intrinsics." + msg " Default: --disable-avx2" + msg "---sse41 Use SSE4.1 hardware instructions." + msg " Default: --disable-sse41" + msg "---sha2 Use ARM SHA1/SHA256 Extensions." + msg " Default: --disable-sha2" + msg "---sha3 Use ARM SHA3 Extensions for SHA512." + msg " Default: --disable-sha3" + msg "---aes Use ARM AES and PMULL Extensions." + msg " Default: --disable-aes" + msg "---secp256k1 Use native secp256k1 interface, otherwise external library." + msg " Default: --with-secp256k1" + msg "---valgrind Use valgrind memcheck client requests." + msg " Default: --without-valgrind" + msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." + msg " Default: --enable-cuda" msg "--build-secp256k1 Build libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" @@ -1134,54 +1015,6 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" - msg "Hardware configuration options for arm64:" - msg "--hardware-aes Use ARM AES and PMULL Extensions." - msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." - msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." - msg "" - msg "Hardware configuration options for x64:" - msg "--hardware-avx2 Use Intel AVX2 intrinsics." - msg "--hardware-avx512 Use Intel AVX512 intrinsics." - msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." - msg "--hardware-shani Use Intel SHA Extensions." - msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." - msg "--hardware-sse41 Use SSE4.1 hardware instructions." - msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." - msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg "" - msg "Recognized pass-through options:" - msg "---shani Add Intel SHA Extensions via compilation options." - msg " Default: --disable-shani" - msg "---sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options." - msg " Default: --disable-sha512" - msg "---aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." - msg " Default: --disable-aesni" - msg "---vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." - msg " Default: --disable-vaes" - msg "---avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." - msg " Default: --disable-avx512ifma" - msg "---avx512 Add Intel AVX512 intrinsics via compilation options." - msg " Default: --disable-avx512" - msg "---avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." - msg " Default: --disable-avxifma" - msg "---avx2 Add Intel AVX2 intrinsics via compilation options." - msg " Default: --disable-avx2" - msg "---sse41 Add SSE4.1 hardware instructions via compilation options." - msg " Default: --disable-sse41" - msg "---sha2 Check for ARM SHA1/SHA256 Extensions." - msg " Default: --disable-sha2" - msg "---sha3 Check for ARM SHA3 Extensions for SHA512." - msg " Default: --disable-sha3" - msg "---aes Check for ARM AES and PMULL Extensions." - msg " Default: --disable-aes" - msg "---secp256k1 Use bitcoin-core/secp256k1 library." - msg " Default: --without-secp256k1" - msg "---valgrind Use valgrind memcheck client requests." - msg " Default: --without-valgrind" - msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: --with-cuda" - msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props index 250099639..c387a47f9 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props @@ -32,21 +32,18 @@ - dynamic dynamic dynamic dynamic dynamic - ltcg ltcg ltcg ltcg ltcg - static static static static @@ -56,7 +53,6 @@ - diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj index e0c368564..d1a9d2d15 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.vcxproj @@ -131,13 +131,11 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}. - diff --git a/builds/msvc/vs2026/libbitcoin-node-test/packages.config b/builds/msvc/vs2026/libbitcoin-node-test/packages.config index a2cb1d1a4..9bca6543a 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/packages.config +++ b/builds/msvc/vs2026/libbitcoin-node-test/packages.config @@ -6,5 +6,4 @@ | --> - diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props index f31ce4cc6..19c89492a 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props @@ -38,19 +38,16 @@ - dynamic dynamic dynamic dynamic - ltcg ltcg ltcg ltcg - static static static static @@ -59,7 +56,6 @@ - diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj index 9191339d6..cf70bde96 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj @@ -235,13 +235,11 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}. - diff --git a/builds/msvc/vs2026/libbitcoin-node/packages.config b/builds/msvc/vs2026/libbitcoin-node/packages.config index a2cb1d1a4..9bca6543a 100644 --- a/builds/msvc/vs2026/libbitcoin-node/packages.config +++ b/builds/msvc/vs2026/libbitcoin-node/packages.config @@ -6,5 +6,4 @@ | --> - diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props index ff532d931..612b7c138 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.props +++ b/builds/msvc/vs2026/libbitcoin-system.import.props @@ -26,7 +26,7 @@ false false false - false + true From 44907cb957a65eebe9eda9016842e94b0a0b2c46 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 22:04:36 -0500 Subject: [PATCH 2/6] Rename --build-secp256k1 to --build-libsecp256k1. --- builds/cmake/install-cmake.sh | 12 ++++++------ builds/cmake/install-presets.sh | 12 ++++++------ builds/gnu/install-gnu.sh | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index d5beb95dc..0c361d7c6 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -38,7 +38,7 @@ # Default: OFF # -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). # Default: ON -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) # --build-obj-dir= Location for intermediate objects. @@ -120,7 +120,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -147,7 +147,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}") @@ -503,7 +503,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -829,7 +829,7 @@ test_cmake() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}" @@ -923,7 +923,7 @@ help() msg " Default: OFF" msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: ON" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" msg "--build-obj-dir= Location for intermediate objects." diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index 09db92c88..afb93e790 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -38,7 +38,7 @@ # Default: OFF # -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). # Default: ON -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-preset= Specifies preset configuration to build. # --build-src-dir= Location for sources. # Default: $(pwd) @@ -110,7 +110,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--build-preset=*) BUILD_PRESET="${OPTION#*=}";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-limit=*) BUILD_LIMIT="${OPTION#*=}";; @@ -133,7 +133,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-preset=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-limit=*/}") @@ -507,7 +507,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -893,7 +893,7 @@ test_cmake() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_PRESET : ${BUILD_PRESET}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" @@ -988,7 +988,7 @@ help() msg " Default: OFF" msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: ON" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-preset= Specifies preset configuration to build." msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 231ae1a96..7b354db49 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -38,7 +38,7 @@ # Default: --without-valgrind # ---cuda Use cuda (gpu) batch signature verification (inert on macOS). # Default: --enable-cuda -# --build-secp256k1 Build libsecp256k1 libraries +# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) # --build-obj-dir= Location for intermediate objects. @@ -121,7 +121,7 @@ main() for OPTION in "$@"; do case ${OPTION} in - (--build-secp256k1) BUILD_secp256k1="yes";; + (--build-libsecp256k1) BUILD_libsecp256k1="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -145,7 +145,7 @@ main() CONFIGURE_OPTIONS_ORIGINAL=("$@") CONFIGURE_OPTIONS=("$@") - CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}") @@ -538,7 +538,7 @@ main() if [[ ${BUILD_LIMIT} == "external" ]] || [[ ${BUILD_LIMIT} == "dependencies" ]] || [[ ${BUILD_LIMIT} == "none" ]]; then - if [[ ${BUILD_secp256k1} == "yes" ]]; then + if [[ ${BUILD_libsecp256k1} == "yes" ]]; then source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}" local SAVE_CPPFLAGS="${CPPFLAGS}" export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}" @@ -889,7 +889,7 @@ test_gnu() display_build_variables() { - msg "BUILD_secp256k1 : ${BUILD_secp256k1}" + msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}" msg "BUILD_LIMIT : ${BUILD_LIMIT}" msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}" msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}" @@ -984,7 +984,7 @@ help() msg " Default: --without-valgrind" msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: --enable-cuda" - msg "--build-secp256k1 Build libsecp256k1 libraries" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" msg "--build-obj-dir= Location for intermediate objects." From fc01fb340000f453b4aa84fbc49693385f424a79 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 22:09:47 -0500 Subject: [PATCH 3/6] Add --with-verbose option. --- builds/cmake/install-cmake.sh | 4 ++++ builds/cmake/install-presets.sh | 4 ++++ builds/gnu/install-gnu.sh | 4 ++++ builds/msvc/vs2026/libbitcoin-network.import.props | 13 +++++++++++++ builds/msvc/vs2026/libbitcoin-network.import.xml | 12 ++++++++++++ 5 files changed, 37 insertions(+) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 0c361d7c6..9695541cc 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -38,6 +38,8 @@ # Default: OFF # -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). # Default: ON +# -Dwith-verbose= Compile verbose logging. +# Default: OFF # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -923,6 +925,8 @@ help() msg " Default: OFF" msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: ON" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index afb93e790..1e4e10a1a 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -38,6 +38,8 @@ # Default: OFF # -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). # Default: ON +# -Dwith-verbose= Compile verbose logging. +# Default: OFF # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-preset= Specifies preset configuration to build. # --build-src-dir= Location for sources. @@ -988,6 +990,8 @@ help() msg " Default: OFF" msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: ON" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-preset= Specifies preset configuration to build." msg "--build-src-dir= Location for sources." diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 7b354db49..9d573b6bd 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -38,6 +38,8 @@ # Default: --without-valgrind # ---cuda Use cuda (gpu) batch signature verification (inert on macOS). # Default: --enable-cuda +# ---verbose Compile verbose logging. +# Default: --without-verbose # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -984,6 +986,8 @@ help() msg " Default: --without-valgrind" msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." msg " Default: --enable-cuda" + msg "---verbose Compile verbose logging." + msg " Default: --without-verbose" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props index f95585518..baeb82da3 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.props +++ b/builds/msvc/vs2026/libbitcoin-network.import.props @@ -11,6 +11,18 @@ + + + + false + + + + + + + + @@ -18,6 +30,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories) $(ProjectDir)..\..\..\..\..\libbitcoin-network\build\include\;%(AdditionalIncludeDirectories) BCT_STATIC;%(PreprocessorDefinitions) + WITH_LOGV;%(PreprocessorDefinitions) libbitcoin-network.lib;%(AdditionalDependencies) diff --git a/builds/msvc/vs2026/libbitcoin-network.import.xml b/builds/msvc/vs2026/libbitcoin-network.import.xml index 7bcfea233..73e57e10b 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.xml +++ b/builds/msvc/vs2026/libbitcoin-network.import.xml @@ -14,4 +14,16 @@ + + + + + + + + + + + + \ No newline at end of file From b445abb094001fdaf4d5698d409fd580627c348d Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 23:06:56 -0500 Subject: [PATCH 4/6] Limit --with-cuda to system. --- builds/cmake/install-cmake.sh | 4 --- builds/cmake/install-presets.sh | 4 --- builds/gnu/install-gnu.sh | 4 --- builds/msvc/build-msvc.cmd | 62 +++++++++++++-------------------- 4 files changed, 24 insertions(+), 50 deletions(-) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 9695541cc..84042cfac 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -36,8 +36,6 @@ # Default: ON # -Dwith-valgrind= Use valgrind memcheck client requests. # Default: OFF -# -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON # -Dwith-verbose= Compile verbose logging. # Default: OFF # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries @@ -923,8 +921,6 @@ help() msg " Default: ON" msg "-Dwith-valgrind= Use valgrind memcheck client requests." msg " Default: OFF" - msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" msg "-Dwith-verbose= Compile verbose logging." msg " Default: OFF" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index 1e4e10a1a..ee88fb1ab 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -36,8 +36,6 @@ # Default: ON # -Dwith-valgrind= Use valgrind memcheck client requests. # Default: OFF -# -Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS). -# Default: ON # -Dwith-verbose= Compile verbose logging. # Default: OFF # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries @@ -988,8 +986,6 @@ help() msg " Default: ON" msg "-Dwith-valgrind= Use valgrind memcheck client requests." msg " Default: OFF" - msg "-Denable-cuda= Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: ON" msg "-Dwith-verbose= Compile verbose logging." msg " Default: OFF" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 9d573b6bd..cfc14647e 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -36,8 +36,6 @@ # Default: --with-secp256k1 # ---valgrind Use valgrind memcheck client requests. # Default: --without-valgrind -# ---cuda Use cuda (gpu) batch signature verification (inert on macOS). -# Default: --enable-cuda # ---verbose Compile verbose logging. # Default: --without-verbose # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries @@ -984,8 +982,6 @@ help() msg " Default: --with-secp256k1" msg "---valgrind Use valgrind memcheck client requests." msg " Default: --without-valgrind" - msg "---cuda Use cuda (gpu) batch signature verification (inert on macOS)." - msg " Default: --enable-cuda" msg "---verbose Compile verbose logging." msg " Default: --without-verbose" msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" diff --git a/builds/msvc/build-msvc.cmd b/builds/msvc/build-msvc.cmd index 590019909..a67e16dc4 100644 --- a/builds/msvc/build-msvc.cmd +++ b/builds/msvc/build-msvc.cmd @@ -11,19 +11,18 @@ REM ########################################################################### REM Script managing the build of libbitcoin-node. REM REM Script options: -REM --enable-shani Add Intel SHA Extensions via compilation options. -REM --enable-sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options. -REM --enable-aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. -REM --enable-vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. -REM --enable-avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. -REM --enable-avx512 Add Intel AVX512 intrinsics via compilation options. -REM --enable-avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. -REM --enable-avx2 Add Intel AVX2 intrinsics via compilation options. -REM --enable-sse41 Add SSE4.1 hardware instructions via compilation options. -REM --enable-sha2 Check for ARM SHA1/SHA256 Extensions. -REM --enable-sha3 Check for ARM SHA3 Extensions for SHA512. -REM --enable-aes Check for ARM AES and PMULL Extensions. -REM --[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS). +REM --enable-shani Use Intel SHA Extensions. +REM --enable-sha512 Use Intel SHA512 Extensions (implies AVX2). +REM --enable-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. +REM --enable-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +REM --enable-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +REM --enable-avx512 Use Intel AVX512 intrinsics. +REM --enable-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). +REM --enable-avx2 Use Intel AVX2 intrinsics. +REM --enable-sse41 Use SSE4.1 hardware instructions. +REM --enable-sha2 Use ARM SHA1/SHA256 Extensions. +REM --enable-sha3 Use ARM SHA3 Extensions for SHA512. +REM --enable-aes Use ARM AES and PMULL Extensions. REM --build-config config Build configuration. REM --build-platform platform Build platform. REM --build-version version Build MSVC version. @@ -330,18 +329,6 @@ if "!libbitcoin_node_TAG!" == "" ( ) else ( set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-aes=true" ) - ) else if "%~1" == "--with-cuda" ( - if "!libbitcoin-system_PARAMS!" == "" ( - set "libbitcoin-system_PARAMS=/p:Option-cuda=true" - ) else ( - set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=true" - ) - ) else if "%~1" == "--without-cuda" ( - if "!libbitcoin-system_PARAMS!" == "" ( - set "libbitcoin-system_PARAMS=/p:Option-cuda=false" - ) else ( - set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=false" - ) ) else if "%~1" == "--build-config" ( set "BUILD_CONFIG=%~2" shift @@ -594,19 +581,18 @@ if "!libbitcoin_node_TAG!" == "" ( call :msg "Script managing the build of libbitcoin-node." call :msg "" call :msg "Script options:" - call :msg "--enable-shani Add Intel SHA Extensions via compilation options." - call :msg "--enable-sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options." - call :msg "--enable-aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." - call :msg "--enable-vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." - call :msg "--enable-avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." - call :msg "--enable-avx512 Add Intel AVX512 intrinsics via compilation options." - call :msg "--enable-avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." - call :msg "--enable-avx2 Add Intel AVX2 intrinsics via compilation options." - call :msg "--enable-sse41 Add SSE4.1 hardware instructions via compilation options." - call :msg "--enable-sha2 Check for ARM SHA1/SHA256 Extensions." - call :msg "--enable-sha3 Check for ARM SHA3 Extensions for SHA512." - call :msg "--enable-aes Check for ARM AES and PMULL Extensions." - call :msg "--[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS)." + call :msg "--enable-shani Use Intel SHA Extensions." + call :msg "--enable-sha512 Use Intel SHA512 Extensions (implies AVX2)." + call :msg "--enable-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." + call :msg "--enable-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + call :msg "--enable-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + call :msg "--enable-avx512 Use Intel AVX512 intrinsics." + call :msg "--enable-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." + call :msg "--enable-avx2 Use Intel AVX2 intrinsics." + call :msg "--enable-sse41 Use SSE4.1 hardware instructions." + call :msg "--enable-sha2 Use ARM SHA1/SHA256 Extensions." + call :msg "--enable-sha3 Use ARM SHA3 Extensions for SHA512." + call :msg "--enable-aes Use ARM AES and PMULL Extensions." call :msg "--build-config config Build configuration." call :msg "--build-platform platform Build platform." call :msg "--build-version version Build MSVC version." From e45f07491cba8ff4886e135d748cf27ba2e6bee5 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 22:44:43 -0500 Subject: [PATCH 5/6] Regenerate artifacts. --- builds/cmake/install-cmake.sh | 275 +++++++++++++++++++++++------- builds/cmake/install-presets.sh | 275 +++++++++++++++++++++++------- builds/gnu/install-gnu.sh | 287 +++++++++++++++++++++++++------- builds/msvc/build-msvc.cmd | 48 +++--- 4 files changed, 681 insertions(+), 204 deletions(-) diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 84042cfac..053de1a55 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -8,36 +8,7 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: -# -Denable-shani= Use Intel SHA Extensions. -# Default: OFF -# -Denable-sha512= Use Intel SHA512 Extensions (implies AVX2). -# Default: OFF -# -Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics. -# Default: OFF -# -Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# Default: OFF -# -Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# Default: OFF -# -Denable-avx512= Use Intel AVX512 intrinsics. -# Default: OFF -# -Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2). -# Default: OFF -# -Denable-avx2= Use Intel AVX2 intrinsics. -# Default: OFF -# -Denable-sse41= Use SSE4.1 hardware instructions. -# Default: OFF -# -Denable-sha2= Use ARM SHA1/SHA256 Extensions. -# Default: OFF -# -Denable-sha3= Use ARM SHA3 Extensions for SHA512. -# Default: OFF -# -Denable-aes= Use ARM AES and PMULL Extensions. -# Default: OFF -# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. -# Default: ON -# -Dwith-valgrind= Use valgrind memcheck client requests. -# Default: OFF -# -Dwith-verbose= Compile verbose logging. -# Default: OFF + # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -68,6 +39,54 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # +# Hardware configuration options for arm64: +# --hardware-aes Use ARM AES and PMULL Extensions. +# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. +# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. +# +# Hardware configuration options for x64: +# --hardware-avx2 Use Intel AVX2 intrinsics. +# --hardware-avx512 Use Intel AVX512 intrinsics. +# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). +# --hardware-shani Use Intel SHA Extensions. +# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). +# --hardware-sse41 Use SSE4.1 hardware instructions. +# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. +# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# +# Recognized pass-through options: +# -Denable-shani= Add Intel SHA Extensions via compilation options. +# Default: OFF +# -Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options. +# Default: OFF +# -Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. +# Default: OFF +# -Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. +# Default: OFF +# -Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. +# Default: OFF +# -Denable-avx512= Add Intel AVX512 intrinsics via compilation options. +# Default: OFF +# -Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. +# Default: OFF +# -Denable-avx2= Add Intel AVX2 intrinsics via compilation options. +# Default: OFF +# -Denable-sse41= Add SSE4.1 hardware instructions via compilation options. +# Default: OFF +# -Denable-sha2= Check for ARM SHA1/SHA256 Extensions. +# Default: OFF +# -Denable-sha3= Check for ARM SHA3 Extensions for SHA512. +# Default: OFF +# -Denable-aes= Check for ARM AES and PMULL Extensions. +# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON +# -Dwith-valgrind= Use valgrind memcheck client requests. +# Default: OFF +# -Dwith-verbose= Compile verbose logging. +# Default: OFF +# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -121,6 +140,18 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-libsecp256k1) BUILD_libsecp256k1="yes";; + (--hardware-aes) HARDWARE_AES="yes";; + (--hardware-sha2) HARDWARE_SHA2="yes";; + (--hardware-sha3) HARDWARE_SHA3="yes";; + (--hardware-avx2) HARDWARE_AVX2="yes";; + (--hardware-avx512) HARDWARE_AVX512="yes";; + (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; + (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; + (--hardware-shani) HARDWARE_SHANI="yes";; + (--hardware-sha512) HARDWARE_SHA512="yes";; + (--hardware-sse41) HARDWARE_SSE41="yes";; + (--hardware-aesni) HARDWARE_AESNI="yes";; + (--hardware-vaes) HARDWARE_VAES="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -166,6 +197,18 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" msg_verbose "*** SANITIZED: ${CONFIGURE_OPTIONS[*]}" @@ -393,6 +436,99 @@ main() ARCHTUNE="-march=native -mtune=native" fi + # Platform options: arm64 + + if [[ "${HARDWARE_AES}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+aes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aes=ON" ) + fi + + if [[ "${HARDWARE_SHA2}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha2" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha2=ON" ) + fi + + if [[ "${HARDWARE_SHA3}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8.2-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha3" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha3=ON" ) + fi + + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" + fi + + # Platform options: x64 + + if [[ "${HARDWARE_AVX2}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx2=ON" ) + fi + + if [[ "${HARDWARE_AVX512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512=ON" ) + fi + + if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512ifma=ON" ) + fi + + if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avxifma=ON" ) + fi + + if [[ "${HARDWARE_SHANI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-shani=ON" ) + fi + + if [[ "${HARDWARE_SHA512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha512=ON" ) + fi + + if [[ "${HARDWARE_SSE41}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sse41=ON" ) + fi + + if [[ "${HARDWARE_AESNI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aesni=ON" ) + fi + + if [[ "${HARDWARE_VAES}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-vaes=ON" ) + fi + + HARDWARE_PLATFORM_COUNT=0 + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + + if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then + msg_error "Hardware options spanning more than one platform have been specified." + exit 1 + fi + + if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && + [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then + msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." + exit 1 + fi + # translate BUILD_CONFIG to ZFLAGS if [[ -n "${BUILD_CONFIG}" ]]; then msg_verbose "*** Build config specified, calculating flags..." @@ -893,36 +1029,7 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - msg "-Denable-shani= Use Intel SHA Extensions." - msg " Default: OFF" - msg "-Denable-sha512= Use Intel SHA512 Extensions (implies AVX2)." - msg " Default: OFF" - msg "-Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics." - msg " Default: OFF" - msg "-Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg " Default: OFF" - msg "-Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg " Default: OFF" - msg "-Denable-avx512= Use Intel AVX512 intrinsics." - msg " Default: OFF" - msg "-Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2)." - msg " Default: OFF" - msg "-Denable-avx2= Use Intel AVX2 intrinsics." - msg " Default: OFF" - msg "-Denable-sse41= Use SSE4.1 hardware instructions." - msg " Default: OFF" - msg "-Denable-sha2= Use ARM SHA1/SHA256 Extensions." - msg " Default: OFF" - msg "-Denable-sha3= Use ARM SHA3 Extensions for SHA512." - msg " Default: OFF" - msg "-Denable-aes= Use ARM AES and PMULL Extensions." - msg " Default: OFF" - msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." - msg " Default: ON" - msg "-Dwith-valgrind= Use valgrind memcheck client requests." - msg " Default: OFF" - msg "-Dwith-verbose= Compile verbose logging." - msg " Default: OFF" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" @@ -953,6 +1060,54 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" + msg "Hardware configuration options for arm64:" + msg "--hardware-aes Use ARM AES and PMULL Extensions." + msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." + msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." + msg "" + msg "Hardware configuration options for x64:" + msg "--hardware-avx2 Use Intel AVX2 intrinsics." + msg "--hardware-avx512 Use Intel AVX512 intrinsics." + msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." + msg "--hardware-shani Use Intel SHA Extensions." + msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." + msg "--hardware-sse41 Use SSE4.1 hardware instructions." + msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." + msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg "" + msg "Recognized pass-through options:" + msg "-Denable-shani= Add Intel SHA Extensions via compilation options." + msg " Default: OFF" + msg "-Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." + msg " Default: OFF" + msg "-Denable-avx512= Add Intel AVX512 intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-avx2= Add Intel AVX2 intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-sse41= Add SSE4.1 hardware instructions via compilation options." + msg " Default: OFF" + msg "-Denable-sha2= Check for ARM SHA1/SHA256 Extensions." + msg " Default: OFF" + msg "-Denable-sha3= Check for ARM SHA3 Extensions for SHA512." + msg " Default: OFF" + msg "-Denable-aes= Check for ARM AES and PMULL Extensions." + msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" + msg "-Dwith-valgrind= Use valgrind memcheck client requests." + msg " Default: OFF" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" + msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index ee88fb1ab..4fb431640 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -8,36 +8,7 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: -# -Denable-shani= Use Intel SHA Extensions. -# Default: OFF -# -Denable-sha512= Use Intel SHA512 Extensions (implies AVX2). -# Default: OFF -# -Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics. -# Default: OFF -# -Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# Default: OFF -# -Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# Default: OFF -# -Denable-avx512= Use Intel AVX512 intrinsics. -# Default: OFF -# -Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2). -# Default: OFF -# -Denable-avx2= Use Intel AVX2 intrinsics. -# Default: OFF -# -Denable-sse41= Use SSE4.1 hardware instructions. -# Default: OFF -# -Denable-sha2= Use ARM SHA1/SHA256 Extensions. -# Default: OFF -# -Denable-sha3= Use ARM SHA3 Extensions for SHA512. -# Default: OFF -# -Denable-aes= Use ARM AES and PMULL Extensions. -# Default: OFF -# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. -# Default: ON -# -Dwith-valgrind= Use valgrind memcheck client requests. -# Default: OFF -# -Dwith-verbose= Compile verbose logging. -# Default: OFF + # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-preset= Specifies preset configuration to build. # --build-src-dir= Location for sources. @@ -58,6 +29,54 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # +# Hardware configuration options for arm64: +# --hardware-aes Use ARM AES and PMULL Extensions. +# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. +# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. +# +# Hardware configuration options for x64: +# --hardware-avx2 Use Intel AVX2 intrinsics. +# --hardware-avx512 Use Intel AVX512 intrinsics. +# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). +# --hardware-shani Use Intel SHA Extensions. +# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). +# --hardware-sse41 Use SSE4.1 hardware instructions. +# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. +# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# +# Recognized pass-through options: +# -Denable-shani= Add Intel SHA Extensions via compilation options. +# Default: OFF +# -Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options. +# Default: OFF +# -Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. +# Default: OFF +# -Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. +# Default: OFF +# -Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. +# Default: OFF +# -Denable-avx512= Add Intel AVX512 intrinsics via compilation options. +# Default: OFF +# -Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. +# Default: OFF +# -Denable-avx2= Add Intel AVX2 intrinsics via compilation options. +# Default: OFF +# -Denable-sse41= Add SSE4.1 hardware instructions via compilation options. +# Default: OFF +# -Denable-sha2= Check for ARM SHA1/SHA256 Extensions. +# Default: OFF +# -Denable-sha3= Check for ARM SHA3 Extensions for SHA512. +# Default: OFF +# -Denable-aes= Check for ARM AES and PMULL Extensions. +# Default: OFF +# -Dwith-secp256k1= Use native secp256k1 interface, otherwise external library. +# Default: ON +# -Dwith-valgrind= Use valgrind memcheck client requests. +# Default: OFF +# -Dwith-verbose= Compile verbose logging. +# Default: OFF +# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -111,6 +130,18 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-libsecp256k1) BUILD_libsecp256k1="yes";; + (--hardware-aes) HARDWARE_AES="yes";; + (--hardware-sha2) HARDWARE_SHA2="yes";; + (--hardware-sha3) HARDWARE_SHA3="yes";; + (--hardware-avx2) HARDWARE_AVX2="yes";; + (--hardware-avx512) HARDWARE_AVX512="yes";; + (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; + (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; + (--hardware-shani) HARDWARE_SHANI="yes";; + (--hardware-sha512) HARDWARE_SHA512="yes";; + (--hardware-sse41) HARDWARE_SSE41="yes";; + (--hardware-aesni) HARDWARE_AESNI="yes";; + (--hardware-vaes) HARDWARE_VAES="yes";; (--build-preset=*) BUILD_PRESET="${OPTION#*=}";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-limit=*) BUILD_LIMIT="${OPTION#*=}";; @@ -148,6 +179,18 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" msg_verbose "*** SANITIZED: ${CONFIGURE_OPTIONS[*]}" @@ -425,6 +468,99 @@ main() ARCHTUNE="-march=native -mtune=native" fi + # Platform options: arm64 + + if [[ "${HARDWARE_AES}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+aes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aes=ON" ) + fi + + if [[ "${HARDWARE_SHA2}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha2" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha2=ON" ) + fi + + if [[ "${HARDWARE_SHA3}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8.2-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha3" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha3=ON" ) + fi + + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" + fi + + # Platform options: x64 + + if [[ "${HARDWARE_AVX2}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx2=ON" ) + fi + + if [[ "${HARDWARE_AVX512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512=ON" ) + fi + + if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avx512ifma=ON" ) + fi + + if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-avxifma=ON" ) + fi + + if [[ "${HARDWARE_SHANI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-shani=ON" ) + fi + + if [[ "${HARDWARE_SHA512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sha512=ON" ) + fi + + if [[ "${HARDWARE_SSE41}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-sse41=ON" ) + fi + + if [[ "${HARDWARE_AESNI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-aesni=ON" ) + fi + + if [[ "${HARDWARE_VAES}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "-Denable-vaes=ON" ) + fi + + HARDWARE_PLATFORM_COUNT=0 + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + + if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then + msg_error "Hardware options spanning more than one platform have been specified." + exit 1 + fi + + if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && + [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then + msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." + exit 1 + fi + # Specify cmake build if [[ "${BUILD_CONFIG}" == "debug" ]]; then @@ -958,36 +1094,7 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - msg "-Denable-shani= Use Intel SHA Extensions." - msg " Default: OFF" - msg "-Denable-sha512= Use Intel SHA512 Extensions (implies AVX2)." - msg " Default: OFF" - msg "-Denable-aesni= Use Intel AES-NI and PCLMULQDQ intrinsics." - msg " Default: OFF" - msg "-Denable-vaes= Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg " Default: OFF" - msg "-Denable-avx512ifma= Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg " Default: OFF" - msg "-Denable-avx512= Use Intel AVX512 intrinsics." - msg " Default: OFF" - msg "-Denable-avxifma= Use Intel AVX IFMA intrinsics (implies AVX2)." - msg " Default: OFF" - msg "-Denable-avx2= Use Intel AVX2 intrinsics." - msg " Default: OFF" - msg "-Denable-sse41= Use SSE4.1 hardware instructions." - msg " Default: OFF" - msg "-Denable-sha2= Use ARM SHA1/SHA256 Extensions." - msg " Default: OFF" - msg "-Denable-sha3= Use ARM SHA3 Extensions for SHA512." - msg " Default: OFF" - msg "-Denable-aes= Use ARM AES and PMULL Extensions." - msg " Default: OFF" - msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." - msg " Default: ON" - msg "-Dwith-valgrind= Use valgrind memcheck client requests." - msg " Default: OFF" - msg "-Dwith-verbose= Compile verbose logging." - msg " Default: OFF" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-preset= Specifies preset configuration to build." msg "--build-src-dir= Location for sources." @@ -1008,6 +1115,54 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" + msg "Hardware configuration options for arm64:" + msg "--hardware-aes Use ARM AES and PMULL Extensions." + msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." + msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." + msg "" + msg "Hardware configuration options for x64:" + msg "--hardware-avx2 Use Intel AVX2 intrinsics." + msg "--hardware-avx512 Use Intel AVX512 intrinsics." + msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." + msg "--hardware-shani Use Intel SHA Extensions." + msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." + msg "--hardware-sse41 Use SSE4.1 hardware instructions." + msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." + msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg "" + msg "Recognized pass-through options:" + msg "-Denable-shani= Add Intel SHA Extensions via compilation options." + msg " Default: OFF" + msg "-Denable-sha512= Add Intel SHA512 Extensions (implies AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-aesni= Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-vaes= Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-avx512ifma= Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." + msg " Default: OFF" + msg "-Denable-avx512= Add Intel AVX512 intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-avxifma= Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." + msg " Default: OFF" + msg "-Denable-avx2= Add Intel AVX2 intrinsics via compilation options." + msg " Default: OFF" + msg "-Denable-sse41= Add SSE4.1 hardware instructions via compilation options." + msg " Default: OFF" + msg "-Denable-sha2= Check for ARM SHA1/SHA256 Extensions." + msg " Default: OFF" + msg "-Denable-sha3= Check for ARM SHA3 Extensions for SHA512." + msg " Default: OFF" + msg "-Denable-aes= Check for ARM AES and PMULL Extensions." + msg " Default: OFF" + msg "-Dwith-secp256k1= Use native secp256k1 interface, otherwise external library." + msg " Default: ON" + msg "-Dwith-valgrind= Use valgrind memcheck client requests." + msg " Default: OFF" + msg "-Dwith-verbose= Compile verbose logging." + msg " Default: OFF" + msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index cfc14647e..6a4078813 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -8,36 +8,7 @@ # Script managing the build and installation of libbitcoin-node and its dependencies. # # Script options: -# ---shani Use Intel SHA Extensions. -# Default: --disable-shani -# ---sha512 Use Intel SHA512 Extensions (implies AVX2). -# Default: --disable-sha512 -# ---aesni Use Intel AES-NI and PCLMULQDQ intrinsics. -# Default: --disable-aesni -# ---vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -# Default: --disable-vaes -# ---avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -# Default: --disable-avx512ifma -# ---avx512 Use Intel AVX512 intrinsics. -# Default: --disable-avx512 -# ---avxifma Use Intel AVX IFMA intrinsics (implies AVX2). -# Default: --disable-avxifma -# ---avx2 Use Intel AVX2 intrinsics. -# Default: --disable-avx2 -# ---sse41 Use SSE4.1 hardware instructions. -# Default: --disable-sse41 -# ---sha2 Use ARM SHA1/SHA256 Extensions. -# Default: --disable-sha2 -# ---sha3 Use ARM SHA3 Extensions for SHA512. -# Default: --disable-sha3 -# ---aes Use ARM AES and PMULL Extensions. -# Default: --disable-aes -# ---secp256k1 Use native secp256k1 interface, otherwise external library. -# Default: --with-secp256k1 -# ---valgrind Use valgrind memcheck client requests. -# Default: --without-valgrind -# ---verbose Compile verbose logging. -# Default: --without-verbose + # --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries # --build-src-dir= Location for sources. # Default: $(pwd) @@ -69,6 +40,54 @@ # --verbose Display verbose script output. # --help, -h Display usage, overriding script execution. # +# Hardware configuration options for arm64: +# --hardware-aes Use ARM AES and PMULL Extensions. +# --hardware-sha2 Use ARM SHA1/SHA256 Extensions. +# --hardware-sha3 Use ARM SHA3 Extensions for SHA512. +# +# Hardware configuration options for x64: +# --hardware-avx2 Use Intel AVX2 intrinsics. +# --hardware-avx512 Use Intel AVX512 intrinsics. +# --hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). +# --hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). +# --hardware-shani Use Intel SHA Extensions. +# --hardware-sha512 Use Intel SHA512 Extensions (implies AVX2). +# --hardware-sse41 Use SSE4.1 hardware instructions. +# --hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. +# --hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). +# +# Recognized pass-through options: +# ---shani Add Intel SHA Extensions via compilation options. +# Default: --disable-shani +# ---sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options. +# Default: --disable-sha512 +# ---aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. +# Default: --disable-aesni +# ---vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. +# Default: --disable-vaes +# ---avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. +# Default: --disable-avx512ifma +# ---avx512 Add Intel AVX512 intrinsics via compilation options. +# Default: --disable-avx512 +# ---avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. +# Default: --disable-avxifma +# ---avx2 Add Intel AVX2 intrinsics via compilation options. +# Default: --disable-avx2 +# ---sse41 Add SSE4.1 hardware instructions via compilation options. +# Default: --disable-sse41 +# ---sha2 Check for ARM SHA1/SHA256 Extensions. +# Default: --disable-sha2 +# ---sha3 Check for ARM SHA3 Extensions for SHA512. +# Default: --disable-sha3 +# ---aes Check for ARM AES and PMULL Extensions. +# Default: --disable-aes +# ---secp256k1 Use native secp256k1 interface, otherwise external library. +# Default: --with-secp256k1 +# ---valgrind Use valgrind memcheck client requests. +# Default: --without-valgrind +# ---verbose Compile verbose logging. +# Default: --without-verbose +# # All unrecognized options provided shall be passed as configuration # options for all dependencies. @@ -122,6 +141,18 @@ main() for OPTION in "$@"; do case ${OPTION} in (--build-libsecp256k1) BUILD_libsecp256k1="yes";; + (--hardware-aes) HARDWARE_AES="yes";; + (--hardware-sha2) HARDWARE_SHA2="yes";; + (--hardware-sha3) HARDWARE_SHA3="yes";; + (--hardware-avx2) HARDWARE_AVX2="yes";; + (--hardware-avx512) HARDWARE_AVX512="yes";; + (--hardware-avx512ifma) HARDWARE_AVX512IFMA="yes";; + (--hardware-avxifma) HARDWARE_AVXIFMA="yes";; + (--hardware-shani) HARDWARE_SHANI="yes";; + (--hardware-sha512) HARDWARE_SHA512="yes";; + (--hardware-sse41) HARDWARE_SSE41="yes";; + (--hardware-aesni) HARDWARE_AESNI="yes";; + (--hardware-vaes) HARDWARE_VAES="yes";; (--build-src-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; (--build-obj-dir=*) BUILD_OBJ_DIR="${OPTION#*=}";; (--build-obj-dir-relative) BUILD_OBJ_DIR_RELATIVE="yes";; @@ -165,6 +196,18 @@ main() CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--verbose/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--help/}") CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#-h/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aes/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha3/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx2/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avx512ifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-avxifma/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-shani/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sha512/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-sse41/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-aesni/}") + CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--hardware-vaes/}") CONFIGURE_OPTIONS_CMAKE=() CONFIGURE_OPTIONS_GNU=("${CONFIGURE_OPTIONS[@]}") msg_verbose "*** ARGUMENTS: ${CONFIGURE_OPTIONS_ORIGINAL[*]}" @@ -398,6 +441,111 @@ main() ARCHTUNE="-march=native -mtune=native" fi + # Platform options: arm64 + + if [[ "${HARDWARE_AES}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+aes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-aes" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-aes" ) + fi + + if [[ "${HARDWARE_SHA2}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha2" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha2" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha2" ) + fi + + if [[ "${HARDWARE_SHA3}" == "yes" ]]; then + HARDWARE_PLATFORM_ARM64="yes" + ARCHBASE="armv8.2-a" + ARCHSUFFIX="${ARCHSUFFIX}+sha3" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha3" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha3" ) + fi + + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + ARCHTUNE="${ARCHBASE}${ARCHSUFFIX}" + fi + + # Platform options: x64 + + if [[ "${HARDWARE_AVX2}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx2" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx2" ) + fi + + if [[ "${HARDWARE_AVX512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx512" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx512" ) + fi + + if [[ "${HARDWARE_AVX512IFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avx512ifma" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avx512ifma" ) + fi + + if [[ "${HARDWARE_AVXIFMA}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-avxifma" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-avxifma" ) + fi + + if [[ "${HARDWARE_SHANI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-shani" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-shani" ) + fi + + if [[ "${HARDWARE_SHA512}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sha512" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sha512" ) + fi + + if [[ "${HARDWARE_SSE41}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-sse41" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-sse41" ) + fi + + if [[ "${HARDWARE_AESNI}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-aesni" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-aesni" ) + fi + + if [[ "${HARDWARE_VAES}" == "yes" ]]; then + HARDWARE_PLATFORM_X64="yes" + CONFIGURE_OPTIONS_CMAKE=( "${CONFIGURE_OPTIONS_CMAKE[@]}" "--enable-vaes" ) + CONFIGURE_OPTIONS_GNU=( "${CONFIGURE_OPTIONS_GNU[@]}" "--enable-vaes" ) + fi + + HARDWARE_PLATFORM_COUNT=0 + if [[ ${HARDWARE_PLATFORM_ARM64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + if [[ ${HARDWARE_PLATFORM_X64} == "yes" ]]; then + HARDWARE_PLATFORM_COUNT=$((HARDWARE_PLATFORM_COUNT + 1)) + fi + + if [ ${HARDWARE_PLATFORM_COUNT} -gt 1 ]; then + msg_error "Hardware options spanning more than one platform have been specified." + exit 1 + fi + + if [[ "${HARDWARE_OPTIMIZED}" == "yes" ]] && + [ ${HARDWARE_PLATFORM_COUNT} -gt 0 ]; then + msg_error "Hardware optimization cannot be reliably rationalized with hardware platform options." + exit 1 + fi + # translate BUILD_CONFIG to ZFLAGS if [[ -n "${BUILD_CONFIG}" ]]; then msg_verbose "*** Build config specified, calculating flags..." @@ -954,36 +1102,7 @@ help() msg "Script managing the build and installation of libbitcoin-node and its dependencies." msg "" msg "Script options:" - msg "---shani Use Intel SHA Extensions." - msg " Default: --disable-shani" - msg "---sha512 Use Intel SHA512 Extensions (implies AVX2)." - msg " Default: --disable-sha512" - msg "---aesni Use Intel AES-NI and PCLMULQDQ intrinsics." - msg " Default: --disable-aesni" - msg "---vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - msg " Default: --disable-vaes" - msg "---avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - msg " Default: --disable-avx512ifma" - msg "---avx512 Use Intel AVX512 intrinsics." - msg " Default: --disable-avx512" - msg "---avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." - msg " Default: --disable-avxifma" - msg "---avx2 Use Intel AVX2 intrinsics." - msg " Default: --disable-avx2" - msg "---sse41 Use SSE4.1 hardware instructions." - msg " Default: --disable-sse41" - msg "---sha2 Use ARM SHA1/SHA256 Extensions." - msg " Default: --disable-sha2" - msg "---sha3 Use ARM SHA3 Extensions for SHA512." - msg " Default: --disable-sha3" - msg "---aes Use ARM AES and PMULL Extensions." - msg " Default: --disable-aes" - msg "---secp256k1 Use native secp256k1 interface, otherwise external library." - msg " Default: --with-secp256k1" - msg "---valgrind Use valgrind memcheck client requests." - msg " Default: --without-valgrind" - msg "---verbose Compile verbose logging." - msg " Default: --without-verbose" + msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries" msg "--build-src-dir= Location for sources." msg " Default: $(pwd)" @@ -1015,6 +1134,54 @@ help() msg "--verbose Display verbose script output." msg "--help, -h Display usage, overriding script execution." msg "" + msg "Hardware configuration options for arm64:" + msg "--hardware-aes Use ARM AES and PMULL Extensions." + msg "--hardware-sha2 Use ARM SHA1/SHA256 Extensions." + msg "--hardware-sha3 Use ARM SHA3 Extensions for SHA512." + msg "" + msg "Hardware configuration options for x64:" + msg "--hardware-avx2 Use Intel AVX2 intrinsics." + msg "--hardware-avx512 Use Intel AVX512 intrinsics." + msg "--hardware-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." + msg "--hardware-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." + msg "--hardware-shani Use Intel SHA Extensions." + msg "--hardware-sha512 Use Intel SHA512 Extensions (implies AVX2)." + msg "--hardware-sse41 Use SSE4.1 hardware instructions." + msg "--hardware-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." + msg "--hardware-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." + msg "" + msg "Recognized pass-through options:" + msg "---shani Add Intel SHA Extensions via compilation options." + msg " Default: --disable-shani" + msg "---sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options." + msg " Default: --disable-sha512" + msg "---aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." + msg " Default: --disable-aesni" + msg "---vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." + msg " Default: --disable-vaes" + msg "---avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." + msg " Default: --disable-avx512ifma" + msg "---avx512 Add Intel AVX512 intrinsics via compilation options." + msg " Default: --disable-avx512" + msg "---avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." + msg " Default: --disable-avxifma" + msg "---avx2 Add Intel AVX2 intrinsics via compilation options." + msg " Default: --disable-avx2" + msg "---sse41 Add SSE4.1 hardware instructions via compilation options." + msg " Default: --disable-sse41" + msg "---sha2 Check for ARM SHA1/SHA256 Extensions." + msg " Default: --disable-sha2" + msg "---sha3 Check for ARM SHA3 Extensions for SHA512." + msg " Default: --disable-sha3" + msg "---aes Check for ARM AES and PMULL Extensions." + msg " Default: --disable-aes" + msg "---secp256k1 Use native secp256k1 interface, otherwise external library." + msg " Default: --with-secp256k1" + msg "---valgrind Use valgrind memcheck client requests." + msg " Default: --without-valgrind" + msg "---verbose Compile verbose logging." + msg " Default: --without-verbose" + msg "" msg "All unrecognized options provided shall be passed as configuration" msg "options for all dependencies." } diff --git a/builds/msvc/build-msvc.cmd b/builds/msvc/build-msvc.cmd index a67e16dc4..a4055d2a9 100644 --- a/builds/msvc/build-msvc.cmd +++ b/builds/msvc/build-msvc.cmd @@ -11,18 +11,18 @@ REM ########################################################################### REM Script managing the build of libbitcoin-node. REM REM Script options: -REM --enable-shani Use Intel SHA Extensions. -REM --enable-sha512 Use Intel SHA512 Extensions (implies AVX2). -REM --enable-aesni Use Intel AES-NI and PCLMULQDQ intrinsics. -REM --enable-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2). -REM --enable-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL). -REM --enable-avx512 Use Intel AVX512 intrinsics. -REM --enable-avxifma Use Intel AVX IFMA intrinsics (implies AVX2). -REM --enable-avx2 Use Intel AVX2 intrinsics. -REM --enable-sse41 Use SSE4.1 hardware instructions. -REM --enable-sha2 Use ARM SHA1/SHA256 Extensions. -REM --enable-sha3 Use ARM SHA3 Extensions for SHA512. -REM --enable-aes Use ARM AES and PMULL Extensions. +REM --enable-shani Add Intel SHA Extensions via compilation options. +REM --enable-sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options. +REM --enable-aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options. +REM --enable-vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options. +REM --enable-avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options. +REM --enable-avx512 Add Intel AVX512 intrinsics via compilation options. +REM --enable-avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options. +REM --enable-avx2 Add Intel AVX2 intrinsics via compilation options. +REM --enable-sse41 Add SSE4.1 hardware instructions via compilation options. +REM --enable-sha2 Check for ARM SHA1/SHA256 Extensions. +REM --enable-sha3 Check for ARM SHA3 Extensions for SHA512. +REM --enable-aes Check for ARM AES and PMULL Extensions. REM --build-config config Build configuration. REM --build-platform platform Build platform. REM --build-version version Build MSVC version. @@ -581,18 +581,18 @@ if "!libbitcoin_node_TAG!" == "" ( call :msg "Script managing the build of libbitcoin-node." call :msg "" call :msg "Script options:" - call :msg "--enable-shani Use Intel SHA Extensions." - call :msg "--enable-sha512 Use Intel SHA512 Extensions (implies AVX2)." - call :msg "--enable-aesni Use Intel AES-NI and PCLMULQDQ intrinsics." - call :msg "--enable-vaes Use Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2)." - call :msg "--enable-avx512ifma Use Intel AVX512 IFMA intrinsics (implies AVX512VL)." - call :msg "--enable-avx512 Use Intel AVX512 intrinsics." - call :msg "--enable-avxifma Use Intel AVX IFMA intrinsics (implies AVX2)." - call :msg "--enable-avx2 Use Intel AVX2 intrinsics." - call :msg "--enable-sse41 Use SSE4.1 hardware instructions." - call :msg "--enable-sha2 Use ARM SHA1/SHA256 Extensions." - call :msg "--enable-sha3 Use ARM SHA3 Extensions for SHA512." - call :msg "--enable-aes Use ARM AES and PMULL Extensions." + call :msg "--enable-shani Add Intel SHA Extensions via compilation options." + call :msg "--enable-sha512 Add Intel SHA512 Extensions (implies AVX2) via compilation options." + call :msg "--enable-aesni Add Intel AES-NI and PCLMULQDQ intrinsics via compilation options." + call :msg "--enable-vaes Add Intel VAES and VPCLMULQDQ intrinsics (implies AES-NI and AVX2) via compilation options." + call :msg "--enable-avx512ifma Add Intel AVX512 IFMA intrinsics (implies AVX512VL) via compilation options." + call :msg "--enable-avx512 Add Intel AVX512 intrinsics via compilation options." + call :msg "--enable-avxifma Add Intel AVX IFMA intrinsics (implies AVX2) via compilation options." + call :msg "--enable-avx2 Add Intel AVX2 intrinsics via compilation options." + call :msg "--enable-sse41 Add SSE4.1 hardware instructions via compilation options." + call :msg "--enable-sha2 Check for ARM SHA1/SHA256 Extensions." + call :msg "--enable-sha3 Check for ARM SHA3 Extensions for SHA512." + call :msg "--enable-aes Check for ARM AES and PMULL Extensions." call :msg "--build-config config Build configuration." call :msg "--build-platform platform Build platform." call :msg "--build-version version Build MSVC version." From 78f0b5d87bb25f890613694d50912d03825a5979 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Thu, 5 Nov 2026 23:50:12 -0500 Subject: [PATCH 6/6] Delint (log only params). --- src/chasers/chaser_confirm.cpp | 2 +- src/chasers/chaser_validate.cpp | 2 +- src/protocols/protocol_block_in_31800.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp index 4b67c387e..4454f4a40 100644 --- a/src/chasers/chaser_confirm.cpp +++ b/src/chasers/chaser_confirm.cpp @@ -353,7 +353,7 @@ bool chaser_confirm::complete_block(const code& ec, const header_link& link, } bool chaser_confirm::notify_block(const code& ec, size_t height, - const header_link& link, bool bypass) NOEXCEPT + const header_link& link, bool LOG_ONLY(bypass)) NOEXCEPT { if (ec) { diff --git a/src/chasers/chaser_validate.cpp b/src/chasers/chaser_validate.cpp index 539c57230..eb72532f7 100644 --- a/src/chasers/chaser_validate.cpp +++ b/src/chasers/chaser_validate.cpp @@ -349,7 +349,7 @@ void chaser_validate::complete_block(const code& ec, const header_link& link, } void chaser_validate::notify_block(const code& ec, size_t height, - const header_link& link, bool bypass, bool startup) NOEXCEPT + const header_link& link, bool LOG_ONLY(bypass), bool startup) NOEXCEPT { // Not stranded when complete_block is called from validate_block. diff --git a/src/protocols/protocol_block_in_31800.cpp b/src/protocols/protocol_block_in_31800.cpp index 440ef20d5..4946d0601 100644 --- a/src/protocols/protocol_block_in_31800.cpp +++ b/src/protocols/protocol_block_in_31800.cpp @@ -393,7 +393,7 @@ void protocol_block_in_31800::restore(const map_ptr& map) NOEXCEPT } void protocol_block_in_31800::handle_put_hashes(const code& ec, - size_t count) NOEXCEPT + size_t LOG_ONLY(count)) NOEXCEPT { LOGV("Put (" << count << ") work for [" << opposite() << "].");