Skip to content

Commit 9ebdf04

Browse files
committed
build: CRC32C build system integration
1 parent 402252a commit 9ebdf04

File tree

4 files changed

+153
-6
lines changed

4 files changed

+153
-6
lines changed

configure.ac

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
355355
AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
356356
fi
357357

358-
enable_hwcrc32=no
358+
enable_sse42=no
359359
enable_sse41=no
360360
enable_avx2=no
361361
enable_shani=no
@@ -365,14 +365,16 @@ if test "x$use_asm" = "xyes"; then
365365
dnl Check for optional instruction set support. Enabling these does _not_ imply that all code will
366366
dnl be compiled with them, rather that specific objects/libs may use them after checking for runtime
367367
dnl compatibility.
368+
369+
dnl x86
368370
AX_CHECK_COMPILE_FLAG([-msse4.2],[[SSE42_CXXFLAGS="-msse4.2"]],,[[$CXXFLAG_WERROR]])
369371
AX_CHECK_COMPILE_FLAG([-msse4.1],[[SSE41_CXXFLAGS="-msse4.1"]],,[[$CXXFLAG_WERROR]])
370372
AX_CHECK_COMPILE_FLAG([-mavx -mavx2],[[AVX2_CXXFLAGS="-mavx -mavx2"]],,[[$CXXFLAG_WERROR]])
371373
AX_CHECK_COMPILE_FLAG([-msse4 -msha],[[SHANI_CXXFLAGS="-msse4 -msha"]],,[[$CXXFLAG_WERROR]])
372374

373375
TEMP_CXXFLAGS="$CXXFLAGS"
374376
CXXFLAGS="$CXXFLAGS $SSE42_CXXFLAGS"
375-
AC_MSG_CHECKING(for assembler crc32 support)
377+
AC_MSG_CHECKING(for SSE4.2 intrinsics)
376378
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
377379
#include <stdint.h>
378380
#if defined(_MSC_VER)
@@ -387,7 +389,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
387389
l = _mm_crc32_u64(l, 0);
388390
return l;
389391
]])],
390-
[ AC_MSG_RESULT(yes); enable_hwcrc32=yes],
392+
[ AC_MSG_RESULT(yes); enable_sse42=yes],
391393
[ AC_MSG_RESULT(no)]
392394
)
393395
CXXFLAGS="$TEMP_CXXFLAGS"
@@ -439,6 +441,24 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
439441
)
440442
CXXFLAGS="$TEMP_CXXFLAGS"
441443

444+
# ARM
445+
AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto],[[ARM_CRC_CXXFLAGS="-march=armv8-a+crc+crypto"]],,[[$CXXFLAG_WERROR]])
446+
447+
TEMP_CXXFLAGS="$CXXFLAGS"
448+
CXXFLAGS="$CXXFLAGS $ARM_CRC_CXXFLAGS"
449+
AC_MSG_CHECKING(for ARM CRC32 intrinsics)
450+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
451+
#include <arm_acle.h>
452+
#include <arm_neon.h>
453+
]],[[
454+
__crc32cb(0, 0); __crc32ch(0, 0); __crc32cw(0, 0); __crc32cd(0, 0);
455+
vmull_p64(0, 0);
456+
]])],
457+
[ AC_MSG_RESULT(yes); enable_arm_crc=yes; ],
458+
[ AC_MSG_RESULT(no)]
459+
)
460+
CXXFLAGS="$TEMP_CXXFLAGS"
461+
442462
fi
443463

444464
CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
@@ -956,6 +976,50 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>]],
956976
[ AC_MSG_RESULT(no); HAVE_O_CLOEXEC=0 ]
957977
)
958978

979+
dnl crc32c platform checks
980+
AC_MSG_CHECKING(for __builtin_prefetch)
981+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
982+
char data = 0;
983+
const char* address = &data;
984+
__builtin_prefetch(address, 0, 0);
985+
]])],
986+
[ AC_MSG_RESULT(yes); HAVE_BUILTIN_PREFETCH=1 ],
987+
[ AC_MSG_RESULT(no); HAVE_BUILTIN_PREFETCH=0 ]
988+
)
989+
990+
AC_MSG_CHECKING(for _mm_prefetch)
991+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[
992+
char data = 0;
993+
const char* address = &data;
994+
_mm_prefetch(address, _MM_HINT_NTA);
995+
]])],
996+
[ AC_MSG_RESULT(yes); HAVE_MM_PREFETCH=1 ],
997+
[ AC_MSG_RESULT(no); HAVE_MM_PREFETCH=0 ]
998+
)
999+
1000+
AC_MSG_CHECKING(for strong getauxval support in the system headers)
1001+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1002+
#include <arm_acle.h>
1003+
#include <arm_neon.h>
1004+
#include <sys/auxv.h>
1005+
]], [[
1006+
getauxval(AT_HWCAP);
1007+
]])],
1008+
[ AC_MSG_RESULT(yes); HAVE_STRONG_GETAUXVAL=1 ],
1009+
[ AC_MSG_RESULT(no); HAVE_STRONG_GETAUXVAL=0 ]
1010+
)
1011+
1012+
AC_MSG_CHECKING(for weak getauxval support in the compiler)
1013+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1014+
unsigned long getauxval(unsigned long type) __attribute__((weak));
1015+
#define AT_HWCAP 16
1016+
]], [[
1017+
getauxval(AT_HWCAP);
1018+
]])],
1019+
[ AC_MSG_RESULT(yes); HAVE_WEAK_GETAUXVAL=1 ],
1020+
[ AC_MSG_RESULT(no); HAVE_WEAK_GETAUXVAL=0 ]
1021+
)
1022+
9591023
dnl Check for reduced exports
9601024
if test x$use_reduce_exports = xyes; then
9611025
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"],
@@ -1511,10 +1575,11 @@ AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
15111575
AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
15121576
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
15131577
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
1514-
AM_CONDITIONAL([ENABLE_HWCRC32],[test x$enable_hwcrc32 = xyes])
1578+
AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
15151579
AM_CONDITIONAL([ENABLE_SSE41],[test x$enable_sse41 = xyes])
15161580
AM_CONDITIONAL([ENABLE_AVX2],[test x$enable_avx2 = xyes])
15171581
AM_CONDITIONAL([ENABLE_SHANI],[test x$enable_shani = xyes])
1582+
AM_CONDITIONAL([ENABLE_ARM_CRC],[test x$enable_arm_crc = xyes])
15181583
AM_CONDITIONAL([USE_ASM],[test x$use_asm = xyes])
15191584
AM_CONDITIONAL([WORDS_BIGENDIAN],[test x$ac_cv_c_bigendian = xyes])
15201585

@@ -1563,6 +1628,7 @@ AC_SUBST(SSE42_CXXFLAGS)
15631628
AC_SUBST(SSE41_CXXFLAGS)
15641629
AC_SUBST(AVX2_CXXFLAGS)
15651630
AC_SUBST(SHANI_CXXFLAGS)
1631+
AC_SUBST(ARM_CRC_CXXFLAGS)
15661632
AC_SUBST(LIBTOOL_APP_LDFLAGS)
15671633
AC_SUBST(USE_UPNP)
15681634
AC_SUBST(USE_QRCODE)
@@ -1577,6 +1643,10 @@ AC_SUBST(QR_LIBS)
15771643
AC_SUBST(HAVE_FDATASYNC)
15781644
AC_SUBST(HAVE_FULLFSYNC)
15791645
AC_SUBST(HAVE_O_CLOEXEC)
1646+
AC_SUBST(HAVE_BUILTIN_PREFETCH)
1647+
AC_SUBST(HAVE_MM_PREFETCH)
1648+
AC_SUBST(HAVE_STRONG_GETAUXVAL)
1649+
AC_SUBST(HAVE_WEAK_GETAUXVAL)
15801650
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini])
15811651
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
15821652
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])

src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ if HARDEN
716716
endif
717717

718718
if EMBEDDED_LEVELDB
719+
include Makefile.crc32c.include
719720
include Makefile.leveldb.include
720721
endif
721722

src/Makefile.crc32c.include

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Copyright (c) 2019 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+
LIBCRC32C_INT = crc32c/libcrc32c.a
6+
LIBLEVELDB_SSE42_INT = leveldb/libleveldb_sse42.a
7+
8+
EXTRA_LIBRARIES += $(LIBCRC32C_INT)
9+
10+
LIBCRC32C = $(LIBCRC32C_INT)
11+
12+
CRC32C_CPPFLAGS_INT =
13+
CRC32C_CPPFLAGS_INT += -I$(srcdir)/crc32c/include
14+
CRC32C_CPPFLAGS_INT += -DHAVE_BUILTIN_PREFETCH=@HAVE_BUILTIN_PREFETCH@
15+
CRC32C_CPPFLAGS_INT += -DHAVE_MM_PREFETCH=@HAVE_MM_PREFETCH@
16+
CRC32C_CPPFLAGS_INT += -DHAVE_STRONG_GETAUXVAL=@HAVE_STRONG_GETAUXVAL@
17+
CRC32C_CPPFLAGS_INT += -DHAVE_WEAK_GETAUXVAL=@HAVE_WEAK_GETAUXVAL@
18+
CRC32C_CPPFLAGS_INT += -DCRC32C_TESTS_BUILT_WITH_GLOG=0
19+
20+
if ENABLE_SSE42
21+
CRC32C_CPPFLAGS_INT += -DHAVE_SSE42=1
22+
else
23+
CRC32C_CPPFLAGS_INT += -DHAVE_SSE42=0
24+
endif
25+
26+
if ENABLE_ARM_CRC
27+
CRC32C_CPPFLAGS_INT += -DHAVE_ARM64_CRC32C=1
28+
else
29+
CRC32C_CPPFLAGS_INT += -DHAVE_ARM64_CRC32C=0
30+
endif
31+
32+
if WORDS_BIGENDIAN
33+
CRC32C_CPPFLAGS_INT += -DBYTE_ORDER_BIG_ENDIAN=1
34+
else
35+
CRC32C_CPPFLAGS_INT += -DBYTE_ORDER_BIG_ENDIAN=0
36+
endif
37+
38+
crc32c_libcrc32c_a_CPPFLAGS = $(AM_CPPFLAGS) $(CRC32C_CPPFLAGS_INT) $(CRC32C_CPPFLAGS)
39+
crc32c_libcrc32c_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
40+
41+
crc32c_libcrc32c_a_SOURCES =
42+
crc32c_libcrc32c_a_SOURCES += crc32c/include/crc32c/crc32c.h
43+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_arm64.h
44+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_arm64_linux_check.h
45+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_internal.h
46+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_prefetch.h
47+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_read_le.h
48+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_round_up.h
49+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_sse42_check.h
50+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_sse42.h
51+
52+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c.cc
53+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_portable.cc
54+
55+
if ENABLE_SSE42
56+
LIBCRC32C_SSE42_INT = crc32c/libcrc32c_sse42.a
57+
EXTRA_LIBRARIES += $(LIBCRC32C_SSE42_INT)
58+
LIBCRC32C += $(LIBCRC32C_SSE42_INT)
59+
60+
crc32c_libcrc32c_sse42_a_CPPFLAGS = $(crc32c_libcrc32c_a_CPPFLAGS)
61+
crc32c_libcrc32c_sse42_a_CXXFLAGS = $(crc32c_libcrc32c_a_CXXFLAGS) $(SSE42_CXXFLAGS)
62+
63+
crc32c_libcrc32c_sse42_a_SOURCES = crc32c/src/crc32c_sse42.cc
64+
endif
65+
66+
if ENABLE_ARM_CRC
67+
LIBCRC32C_ARM_CRC_INT = crc32c/libcrc32c_arm_crc.a
68+
EXTRA_LIBRARIES += $(LIBCRC32C_ARM_CRC_INT)
69+
LIBCRC32C += $(LIBCRC32C_ARM_CRC_INT)
70+
71+
crc32c_libcrc32c_arm_crc_a_CPPFLAGS = $(crc32c_libcrc32c_a_CPPFLAGS)
72+
crc32c_libcrc32c_arm_crc_a_CXXFLAGS = $(crc32c_libcrc32c_a_CXXFLAGS) $(ARM_CRC_CXXFLAGS)
73+
74+
crc32c_libcrc32c_arm_crc_a_SOURCES = crc32c/src/crc32c_arm64.cc
75+
endif

src/Makefile.leveldb.include

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ LIBMEMENV_INT = leveldb/libmemenv.a
88
EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
99
EXTRA_LIBRARIES += $(LIBMEMENV_INT)
1010

11-
LIBLEVELDB += $(LIBLEVELDB_INT)
11+
LIBLEVELDB += $(LIBLEVELDB_INT) $(LIBCRC32C)
1212
LIBMEMENV += $(LIBMEMENV_INT)
1313

1414
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
1515
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
1616

1717
LEVELDB_CPPFLAGS_INT =
1818
LEVELDB_CPPFLAGS_INT += -I$(srcdir)/leveldb
19+
LEVELDB_CPPFLAGS_INT += -I$(srcdir)/crc32c/include
1920
LEVELDB_CPPFLAGS_INT += -D__STDC_LIMIT_MACROS
20-
LEVELDB_CPPFLAGS_INT += -DHAVE_SNAPPY=0 -DHAVE_CRC32C=0
21+
LEVELDB_CPPFLAGS_INT += -DHAVE_SNAPPY=0 -DHAVE_CRC32C=1
2122
LEVELDB_CPPFLAGS_INT += -DHAVE_FDATASYNC=@HAVE_FDATASYNC@
2223
LEVELDB_CPPFLAGS_INT += -DHAVE_FULLFSYNC=@HAVE_FULLFSYNC@
2324
LEVELDB_CPPFLAGS_INT += -DHAVE_O_CLOEXEC=@HAVE_O_CLOEXEC@

0 commit comments

Comments
 (0)