Skip to content

[backport] Various secp256k1 ASM-related

freetrader requested to merge freetrader/bitcoin-cash-node:backport/D5480_5542_5521_5590 into master

This is a backport of: D5480 D5542 D5521 D5590 -- all secp256k1 build-related.

Upstream commits:

  • 727eab4bdd69e118415e0e8712006a9cd8f51635 [SECP256K1] CMake: Build the ARM ASM field implementation (Fabien)
  • 479f3d836613ce512ab716e84ad8dc7a1a9c6130 [SECP256K1] Disable ASM for native executables (Fabien)
  • c631b912b1e75c8451fec288c0c10be4dea39716 [cmake] Fix typo in error message (Amaury Séchet)
  • e32abdcf10e91b478ec12e07918c6210fc933ca6 [SECP256K1] Turn off ASM by default on target with no ASM support (Fabien)

Merge instructions: DO NOT SQUASH!

[SECP256K1] CMake: Build the ARM ASM field implementation

Summary: This diff allow cmake to use the ARM optimized assembly (equivalent to autotools --with-asm=arm).

It attempts to guess the build target, and default with an error if assembly is enabled but unsupported by the target (or the target is not known). This makes the build to succeed by default on x86_64, and on ARM when the toolchain file is used, so no user intervention is needed for the "normal" path.

Depends on D5501.

Test Plan: Should ask to use -DSECP256K1_USE_ASM=OFF:

cmake -GNinja .. -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Linux32.cmake

Should succeed:

cmake -GNinja .. -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/LinuxARM.cmake
ninja

Run the test binaries on an ARM target and check there is no error (tested on a RPi).

Run the build on OSX.

Run the Gitian builds.

Run the Travis build (see https://travis-ci.org/github/Fabcien/secp256k1/builds/663863958).

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5480

[SECP256K1] Disable ASM for native executables

Summary: If the platforms is detected x86_64 and the ASM check fails, the native executable will fail as well even if -DSECP256K1_USE_ASM=OFF is passed to cmake. This diff disables the ASM for the native executables and get rids of the issue.

Got the issue on FreeBSD 12.0.

Test Plan:

ninja check

Build on FreeBSD 12.0.

Reviewers: #bitcoin_abc, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D5542

[cmake] Fix typo in error message

Summary: cmake variable are case sensitive.

Test Plan: build on linux32 and check it actually build with the flag provided by the error message

Reviewers: #bitcoin_abc, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D5521

[SECP256K1] Turn off ASM by default on target with no ASM support

Summary: This will drop the need to set -DSECP256K1_USE_ASM=OFF for targets with no support for ASM in secp256k1.

Test Plan: Run cmake on various platforms and check the ASM is enabled/disabled as needed.

Run the Gitian builds.

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5590

Edited by freetrader

Merge request reports