Skip to content

Commit 48a72fa

Browse files
committed
Add sha256_arm_shani to build system
Also rename AArch64 intrinsics to ARMv8 intrinsics as these are not necessarily limited to 64-bit
1 parent c2b7934 commit 48a72fa

File tree

4 files changed

+100
-1
lines changed

4 files changed

+100
-1
lines changed

configure.ac

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,11 @@ CXXFLAGS="$TEMP_CXXFLAGS"
569569

570570
# ARM
571571
AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_CRC_CXXFLAGS="-march=armv8-a+crc+crypto"], [], [$CXXFLAG_WERROR])
572+
AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_SHANI_CXXFLAGS="-march=armv8-a+crc+crypto"], [], [$CXXFLAG_WERROR])
572573

573574
TEMP_CXXFLAGS="$CXXFLAGS"
574575
CXXFLAGS="$CXXFLAGS $ARM_CRC_CXXFLAGS"
575-
AC_MSG_CHECKING([for AArch64 CRC32 intrinsics])
576+
AC_MSG_CHECKING([for ARMv8 CRC32 intrinsics])
576577
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
577578
#include <arm_acle.h>
578579
#include <arm_neon.h>
@@ -589,6 +590,24 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
589590
)
590591
CXXFLAGS="$TEMP_CXXFLAGS"
591592

593+
TEMP_CXXFLAGS="$CXXFLAGS"
594+
CXXFLAGS="$CXXFLAGS $ARM_SHANI_CXXFLAGS"
595+
AC_MSG_CHECKING([for ARMv8 SHA-NI intrinsics])
596+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
597+
#include <arm_acle.h>
598+
#include <arm_neon.h>
599+
]],[[
600+
uint32x4_t a, b, c;
601+
vsha256h2q_u32(a, b, c);
602+
vsha256hq_u32(a, b, c);
603+
vsha256su0q_u32(a, b);
604+
vsha256su1q_u32(a, b, c);
605+
]])],
606+
[ AC_MSG_RESULT([yes]); enable_arm_shani=yes; AC_DEFINE([ENABLE_ARM_SHANI], [1], [Define this symbol to build code that uses ARMv8 SHA-NI intrinsics]) ],
607+
[ AC_MSG_RESULT([no])]
608+
)
609+
CXXFLAGS="$TEMP_CXXFLAGS"
610+
592611
fi
593612

594613
CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO"
@@ -1808,6 +1827,7 @@ AM_CONDITIONAL([ENABLE_SSE41], [test "$enable_sse41" = "yes"])
18081827
AM_CONDITIONAL([ENABLE_AVX2], [test "$enable_avx2" = "yes"])
18091828
AM_CONDITIONAL([ENABLE_X86_SHANI], [test "$enable_x86_shani" = "yes"])
18101829
AM_CONDITIONAL([ENABLE_ARM_CRC], [test "$enable_arm_crc" = "yes"])
1830+
AM_CONDITIONAL([ENABLE_ARM_SHANI], [test "$enable_arm_shani" = "yes"])
18111831
AM_CONDITIONAL([USE_ASM], [test "$use_asm" = "yes"])
18121832
AM_CONDITIONAL([WORDS_BIGENDIAN], [test "$ac_cv_c_bigendian" = "yes"])
18131833
AM_CONDITIONAL([USE_NATPMP], [test "$use_natpmp" = "yes"])
@@ -1866,6 +1886,7 @@ AC_SUBST(CLMUL_CXXFLAGS)
18661886
AC_SUBST(AVX2_CXXFLAGS)
18671887
AC_SUBST(X86_SHANI_CXXFLAGS)
18681888
AC_SUBST(ARM_CRC_CXXFLAGS)
1889+
AC_SUBST(ARM_SHANI_CXXFLAGS)
18691890
AC_SUBST(LIBTOOL_APP_LDFLAGS)
18701891
AC_SUBST(USE_SQLITE)
18711892
AC_SUBST(USE_BDB)

src/Makefile.am

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ if ENABLE_X86_SHANI
5050
LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libbitcoin_crypto_x86_shani.a
5151
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_X86_SHANI)
5252
endif
53+
if ENABLE_ARM_SHANI
54+
LIBBITCOIN_CRYPTO_ARM_SHANI = crypto/libbitcoin_crypto_arm_shani.a
55+
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
56+
endif
5357

5458
$(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
5559
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@@ -504,6 +508,12 @@ crypto_libbitcoin_crypto_x86_shani_a_CXXFLAGS += $(X86_SHANI_CXXFLAGS)
504508
crypto_libbitcoin_crypto_x86_shani_a_CPPFLAGS += -DENABLE_X86_SHANI
505509
crypto_libbitcoin_crypto_x86_shani_a_SOURCES = crypto/sha256_x86_shani.cpp
506510

511+
crypto_libbitcoin_crypto_arm_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
512+
crypto_libbitcoin_crypto_arm_shani_a_CPPFLAGS = $(AM_CPPFLAGS)
513+
crypto_libbitcoin_crypto_arm_shani_a_CXXFLAGS += $(ARM_SHANI_CXXFLAGS)
514+
crypto_libbitcoin_crypto_arm_shani_a_CPPFLAGS += -DENABLE_ARM_SHANI
515+
crypto_libbitcoin_crypto_arm_shani_a_SOURCES = crypto/sha256_arm_shani.cpp
516+
507517
# consensus: shared between all executables that validate any consensus rules.
508518
libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
509519
libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)

src/crypto/sha256.cpp

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010

1111
#include <compat/cpuid.h>
1212

13+
#if defined(__linux__) && defined(ENABLE_ARM_SHANI) && !defined(BUILD_BITCOIN_INTERNAL)
14+
#include <sys/auxv.h>
15+
#include <asm/hwcap.h>
16+
#endif
17+
18+
#if defined(MAC_OSX) && defined(ENABLE_ARM_SHANI) && !defined(BUILD_BITCOIN_INTERNAL)
19+
#include <sys/types.h>
20+
#include <sys/sysctl.h>
21+
#endif
22+
1323
#if defined(__x86_64__) || defined(__amd64__) || defined(__i386__)
1424
#if defined(USE_ASM)
1525
namespace sha256_sse4
@@ -39,6 +49,11 @@ namespace sha256_x86_shani
3949
void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks);
4050
}
4151

52+
namespace sha256_arm_shani
53+
{
54+
void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks);
55+
}
56+
4257
// Internal implementation code.
4358
namespace
4459
{
@@ -623,6 +638,37 @@ std::string SHA256AutoDetect()
623638
#endif
624639
#endif
625640

641+
#if defined(ENABLE_ARM_SHANI) && !defined(BUILD_BITCOIN_INTERNAL)
642+
bool have_arm_shani = false;
643+
644+
#if defined(__linux__)
645+
#if defined(__arm__) // 32-bit
646+
if (getauxval(AT_HWCAP2) & HWCAP2_SHA2) {
647+
have_arm_shani = true;
648+
}
649+
#endif
650+
#if defined(__aarch64__) // 64-bit
651+
if (getauxval(AT_HWCAP) & HWCAP_SHA2) {
652+
have_arm_shani = true;
653+
}
654+
#endif
655+
#endif
656+
657+
#if defined(MAC_OSX)
658+
int val = 0;
659+
size_t len = sizeof(val);
660+
if (sysctlbyname("hw.optional.arm.FEAT_SHA256", &val, &len, nullptr, 0) == 0) {
661+
have_arm_shani = val != 0;
662+
}
663+
#endif
664+
665+
if (have_arm_shani) {
666+
Transform = sha256_arm_shani::Transform;
667+
TransformD64 = TransformD64Wrapper<sha256_arm_shani::Transform>;
668+
ret = "arm_shani(1way)";
669+
}
670+
#endif
671+
626672
assert(SelfTest());
627673
return ret;
628674
}

src/crypto/sha256_arm_shani.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright (c) 2022 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
//
5+
// Based on https://github.com/noloader/SHA-Intrinsics/blob/master/sha256-arm.c,
6+
// Written and placed in public domain by Jeffrey Walton.
7+
// Based on code from ARM, and by Johannes Schneiders, Skip Hovsmith and
8+
// Barry O'Rourke for the mbedTLS project.
9+
10+
#ifdef ENABLE_ARM_SHANI
11+
12+
#include <cstdint>
13+
#include <cstddef>
14+
15+
namespace sha256_arm_shani {
16+
void Transform(uint32_t* s, const unsigned char* chunk, size_t blocks)
17+
{
18+
19+
}
20+
}
21+
22+
#endif

0 commit comments

Comments
 (0)