Skip to content

Commit a42faa2

Browse files
committed
Merge bitcoin/bitcoin#32551: cmake: Remove ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI} from bitcoin-build-config.h
800b7cc cmake: Add missed `SSE41_CXXFLAGS` (Hennadii Stepanov) 028476e cmake: Remove `ENABLE_ARM_SHANI` from `bitcoin-build-config.h` (Hennadii Stepanov) 1e90052 cmake: Remove `ENABLE_X86_SHANI` from `bitcoin-build-config.h` (Hennadii Stepanov) 8689628 cmake: Remove `ENABLE_AVX2` from `bitcoin-build-config.h` (Hennadii Stepanov) a8e2342 cmake: Remove `ENABLE_SSE41` from `bitcoin-build-config.h` (Hennadii Stepanov) Pull request description: `ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI}` are already conditionally defined for the [`bitcoin_crypto`](https://github.com/bitcoin/bitcoin/blob/master/src/crypto/CMakeLists.txt) target, and they are not used by any other targets. Defining them globally in `bitcoin-build-config.h` is therefore redundant. Additionally, the previously missing `SSE41_CXXFLAGS` variable has been [added](bitcoin/bitcoin#32550 (comment)). ACKs for top commit: fanquake: ACK 800b7cc Tree-SHA512: da792a0b780c67b432b09c9288ca98d62545315c721fed13510d1c11f8bb0cddd9a4ed7a009b4d052471dda19d0641bbc1eae4805fc306d23bf9b4ef510089c8
2 parents 87ec923 + 800b7cc commit a42faa2

File tree

5 files changed

+2
-28
lines changed

5 files changed

+2
-28
lines changed

cmake/bitcoin-build-config.h.in

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,16 @@
2929
/* Copyright year */
3030
#define COPYRIGHT_YEAR @COPYRIGHT_YEAR@
3131

32-
/* Define this symbol to build code that uses ARMv8 SHA-NI intrinsics */
33-
#cmakedefine ENABLE_ARM_SHANI 1
34-
35-
/* Define this symbol to build code that uses AVX2 intrinsics */
36-
#cmakedefine ENABLE_AVX2 1
37-
3832
/* Define if external signer support is enabled */
3933
#cmakedefine ENABLE_EXTERNAL_SIGNER 1
4034

41-
/* Define this symbol to build code that uses SSE4.1 intrinsics */
42-
#cmakedefine ENABLE_SSE41 1
43-
4435
/* Define to 1 to enable tracepoints for Userspace, Statically Defined Tracing
4536
*/
4637
#cmakedefine ENABLE_TRACING 1
4738

4839
/* Define to 1 to enable wallet functions. */
4940
#cmakedefine ENABLE_WALLET 1
5041

51-
/* Define this symbol to build code that uses x86 SHA-NI intrinsics */
52-
#cmakedefine ENABLE_X86_SHANI 1
53-
5442
/* Define to 1 if you have the declaration of `fork', and to 0 if you don't.
5543
*/
5644
#cmakedefine01 HAVE_DECL_FORK

cmake/introspection.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ if(NOT MSVC)
170170
" HAVE_SSE41
171171
CXXFLAGS ${SSE41_CXXFLAGS}
172172
)
173-
set(ENABLE_SSE41 ${HAVE_SSE41})
174173

175174
# Check for AVX2 intrinsics.
176175
set(AVX2_CXXFLAGS -mavx -mavx2)
@@ -185,7 +184,6 @@ if(NOT MSVC)
185184
" HAVE_AVX2
186185
CXXFLAGS ${AVX2_CXXFLAGS}
187186
)
188-
set(ENABLE_AVX2 ${HAVE_AVX2})
189187

190188
# Check for x86 SHA-NI intrinsics.
191189
set(X86_SHANI_CXXFLAGS -msse4 -msha)
@@ -202,7 +200,6 @@ if(NOT MSVC)
202200
" HAVE_X86_SHANI
203201
CXXFLAGS ${X86_SHANI_CXXFLAGS}
204202
)
205-
set(ENABLE_X86_SHANI ${HAVE_X86_SHANI})
206203

207204
# Check for ARMv8 SHA-NI intrinsics.
208205
set(ARM_SHANI_CXXFLAGS -march=armv8-a+crypto)
@@ -220,5 +217,4 @@ if(NOT MSVC)
220217
" HAVE_ARM_SHANI
221218
CXXFLAGS ${ARM_SHANI_CXXFLAGS}
222219
)
223-
set(ENABLE_ARM_SHANI ${HAVE_ARM_SHANI})
224220
endif()

src/crypto/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if(HAVE_SSE41 AND HAVE_X86_SHANI)
4747
target_compile_definitions(bitcoin_crypto PRIVATE ENABLE_SSE41 ENABLE_X86_SHANI)
4848
target_sources(bitcoin_crypto PRIVATE sha256_x86_shani.cpp)
4949
set_property(SOURCE sha256_x86_shani.cpp PROPERTY
50-
COMPILE_OPTIONS ${X86_SHANI_CXXFLAGS}
50+
COMPILE_OPTIONS ${SSE41_CXXFLAGS} ${X86_SHANI_CXXFLAGS}
5151
)
5252
endif()
5353

src/crypto/sha256.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bitcoin-build-config.h> // IWYU pragma: keep
6-
75
#include <crypto/sha256.h>
86
#include <crypto/common.h>
97

test/lint/test_runner/src/main.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -614,15 +614,7 @@ fn lint_includes_build_config() -> LintResult {
614614
"*.cpp",
615615
"*.h",
616616
])
617-
.args(get_pathspecs_default_excludes())
618-
.args([
619-
// These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
620-
// these cppflags manually.
621-
":(exclude)src/crypto/sha256_arm_shani.cpp",
622-
":(exclude)src/crypto/sha256_avx2.cpp",
623-
":(exclude)src/crypto/sha256_sse41.cpp",
624-
":(exclude)src/crypto/sha256_x86_shani.cpp",
625-
]),
617+
.args(get_pathspecs_default_excludes()),
626618
)
627619
.expect("grep failed");
628620
git()

0 commit comments

Comments
 (0)