cmake: Remove `ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI}` from `bitcoin-build-config.h`

hebasto commented at 3:24 pm on May 18, 2025: member

ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI} are already conditionally defined for the bitcoin_crypto 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.

hebasto added the label Build system on May 18, 2025

DrahtBot commented at 3:24 pm on May 18, 2025: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32551.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

No conflicts as of last run.

DrahtBot added the label CI failed on May 18, 2025

hebasto commented at 1:59 pm on May 19, 2025: member

Added a commit from #32550.

DrahtBot removed the label CI failed on May 19, 2025

DrahtBot added the label Needs rebase on May 20, 2025

cmake: Remove `ENABLE_SSE41` from `bitcoin-build-config.h`

`ENABLE_SSE41` is already conditionally defined for the `bitcoin_crypto`
target, so defining it in `bitcoin-build-config.h` is redundant.

a8e2342dca

cmake: Remove `ENABLE_AVX2` from `bitcoin-build-config.h`

`ENABLE_AVX2` is already conditionally defined for the `bitcoin_crypto`
target, so defining it in `bitcoin-build-config.h` is redundant.

8689628e2e

cmake: Remove `ENABLE_X86_SHANI` from `bitcoin-build-config.h`

`ENABLE_X86_SHANI` is already conditionally defined for the
`bitcoin_crypto` target, so defining it in `bitcoin-build-config.h` is
redundant.

1e900528d2

cmake: Remove `ENABLE_ARM_SHANI` from `bitcoin-build-config.h`

`ENABLE_ARM_SHANI` is already conditionally defined for the
`bitcoin_crypto` target, so defining it in `bitcoin-build-config.h` is
redundant.

028476e71f

cmake: Add missed `SSE41_CXXFLAGS` 800b7cc42c

hebasto force-pushed on May 20, 2025

hebasto commented at 10:15 am on May 20, 2025: member

Rebased to resolve a conflict with the merged bitcoin/bitcoin#32477.

DrahtBot removed the label Needs rebase on May 20, 2025

fanquake added the label DrahtBot Guix build requested on May 20, 2025

fanquake added the label Needs backport (29.x) on May 20, 2025

fanquake commented at 3:41 pm on May 20, 2025: member

Concept ACK

hebasto commented at 5:01 pm on May 20, 2025: member

My Guix build:

 0aarch64
 1d899fe5104a77d8c86d40518cb872e8200142e5711689a7bec1e116fcb1807af  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/SHA256SUMS.part
 28f81b2cd236c0116937b950964f1a4a88c0fdf1baf0d859c055153c4fceddcdc  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/bitcoin-800b7cc42ca6-aarch64-linux-gnu-debug.tar.gz
 343812573c4d833df3cae58332dfd632afedd428fc0c46a403b872bdfb344bfb7  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/bitcoin-800b7cc42ca6-aarch64-linux-gnu.tar.gz
 41e93c16fa60545e3103ee16ab4e251326dafdddb193a9e8b88bb6410edde5cd8  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/SHA256SUMS.part
 56f260d7bb26fe76ab637d751bd390fb4f5a8aaea405f3c3b05b33bc7eb1f5266  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/bitcoin-800b7cc42ca6-arm-linux-gnueabihf-debug.tar.gz
 6028d88df8073b27b109f25d6ccc25cabf27dee837562c49e4a456fda96b31a11  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/bitcoin-800b7cc42ca6-arm-linux-gnueabihf.tar.gz
 79042f5fe09b0d61120ca2dda5488e7a1acc93ac1b2e66dd8a8f3107a4fae4700  guix-build-800b7cc42ca6/output/arm64-apple-darwin/SHA256SUMS.part
 8073fe6a231024932d38d9126cb2d5926e96384cb3ea544d03e6f5b8a53db72e6  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-codesigning.tar.gz
 9f017e990180322579b21214cb2cc6b9a183dc43b5f11f14aaef8633009673726  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-unsigned.tar.gz
1014e2c8c7aece407c6225194374ab90b4604532cd870502ac4b3915821967fcf2  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-unsigned.zip
11ee33c3391262e4c897a85d7b2f033743e70825378157d3a621ff8055e39f3b69  guix-build-800b7cc42ca6/output/dist-archive/bitcoin-800b7cc42ca6.tar.gz
12b1f54424ce1c6cf3380f4d5ad99d181c52753ecb3c61ae8e34f40b2ee643ef0e  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/SHA256SUMS.part
136b1c52ca508144aa5ea911a0d95a96973fca647eb9033cf6d09f1e7ada478c17  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/bitcoin-800b7cc42ca6-powerpc64-linux-gnu-debug.tar.gz
14505a6998e67b2cda843f85d3194b836910a1a33f54511650d1736c309765fbc7  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/bitcoin-800b7cc42ca6-powerpc64-linux-gnu.tar.gz
15ade36e9cf2f3b06e1d9bbb1a45e4806296656441c237a2b04dc649f8631a576e  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/SHA256SUMS.part
16be44082f545987aef1783e8fdc19c99f02324b89ab1e94c6081bd27db74228b5  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/bitcoin-800b7cc42ca6-riscv64-linux-gnu-debug.tar.gz
17e826c85054bbcedce5de8121467179f5d3eb9d7973c22508c6e0c04d70c38909  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/bitcoin-800b7cc42ca6-riscv64-linux-gnu.tar.gz
18ce3a0948679d6effac6323693b935e048bf5ecaf268e4d95710f7e3e6a2bd5be  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/SHA256SUMS.part
19efad91469e957bf90af9a62bdc94df1241f23e51715f0da8fecb8de9c3e4f0bc  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-codesigning.tar.gz
208f763359ae3b1cd638cd83f51e7baa07903fe307fd17502faba48959405bb241  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-unsigned.tar.gz
218d8ce884550ad5054c773157bdc11b7f5192a9075f2b6247688e580706a596dd  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-unsigned.zip
22acff10fa6e8e86811dff20ce7420c220cec55dfe3eb24d427ffc766dc2079be6  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/SHA256SUMS.part
23d6d30f4888fcc4d19916d5a6c774a22a0a216d64588950893746a9c0ce919dca  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/bitcoin-800b7cc42ca6-x86_64-linux-gnu-debug.tar.gz
248a78a2d009c0fef11274ea47a6a46dbeb6effe8aca82ea9aea71b5abbb1b5207  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/bitcoin-800b7cc42ca6-x86_64-linux-gnu.tar.gz
258de26cd66a67a029f06b71661ab64233f380b109b211ce9d26e02ef4634673f0  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/SHA256SUMS.part
268d66924d1b0f23a9e9cb48b051702ba851d9753cb093f25bca712d0c3b1add11  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-codesigning.tar.gz
274acd6691ea9c913e5065380c26f06918e475ded290e111584e6a6ac5b77e5185  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-debug.zip
2860d4293e162455b6cc329072199dee750e5a1afbc6017307b447dd556b23e6ee  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-setup-unsigned.exe
299024c5428fcdd695808d2b105fc3f1b52210b8ec5af3ee407e884c7927adb99e  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-unsigned.zip

DrahtBot commented at 6:55 am on May 21, 2025: contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File	commit 9a887baadebce7c2e76df831fad54c5fa81d309e(master)	commit a443d9a83795584d3b7e94d63ca73a0a4c2b6150(pull/32551/merge)
*-aarch64-linux-gnu-debug.tar.gz	`bd6620a740c95e51...`	`d71b736ff6198891...`
*-aarch64-linux-gnu.tar.gz	`e2f34f0460731c77...`	`69d4a74167ab8cb4...`
*-arm-linux-gnueabihf-debug.tar.gz	`cba7ba1ac3c77dc6...`	`415edfffd2ba8f98...`
*-arm-linux-gnueabihf.tar.gz	`c18cbb0c11903d8e...`	`bf3086e1d4cf381e...`
*-arm64-apple-darwin-codesigning.tar.gz	`08ce1faf4a4f3c97...`	`9dec9c209267c463...`
*-arm64-apple-darwin-unsigned.tar.gz	`8e1eac93dc5b6a27...`	`64c31b3855beeb08...`
*-arm64-apple-darwin-unsigned.zip	`974a2db506d578cb...`	`39319dd70b85c6f2...`
*-powerpc64-linux-gnu-debug.tar.gz	`40806ef6f4ecfc64...`	`8a9b0c3d9aaa4f6d...`
*-powerpc64-linux-gnu.tar.gz	`439500417e348a03...`	`8da9418d12e5561d...`
*-riscv64-linux-gnu-debug.tar.gz	`c2937e060b74e215...`	`6189dc10a8fa1ddf...`
*-riscv64-linux-gnu.tar.gz	`6d23f4f6251bf6c4...`	`05a34b2405ffd231...`
*-x86_64-apple-darwin-codesigning.tar.gz	`df215521d1c8fdf9...`	`d73a7e4711e6fffb...`
*-x86_64-apple-darwin-unsigned.tar.gz	`d6c812fdc9ccaacc...`	`e2065729d1c75792...`
*-x86_64-apple-darwin-unsigned.zip	`22a87644fc7e889b...`	`389c30d84be3e82e...`
*-x86_64-linux-gnu-debug.tar.gz	`0bc049eb0bc995e6...`	`bfce972dfcf2a82e...`
*-x86_64-linux-gnu.tar.gz	`40b2ca54189f86d2...`	`df782b376745bd60...`
*.tar.gz	`97e0d03982493bef...`	`df44462a303ea747...`
SHA256SUMS.part	`4890017f5dc45ba9...`	`b504a36d7c6a0a9a...`
guix_build.log	`ce6093588c6ed8e9...`	`ddf8f757093329db...`
guix_build.log.diff		`67cc0aa128a6c864...`

DrahtBot removed the label DrahtBot Guix build requested on May 21, 2025

fanquake commented at 1:25 pm on May 21, 2025: member

Guix Build:

 0d899fe5104a77d8c86d40518cb872e8200142e5711689a7bec1e116fcb1807af  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/SHA256SUMS.part
 18f81b2cd236c0116937b950964f1a4a88c0fdf1baf0d859c055153c4fceddcdc  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/bitcoin-800b7cc42ca6-aarch64-linux-gnu-debug.tar.gz
 243812573c4d833df3cae58332dfd632afedd428fc0c46a403b872bdfb344bfb7  guix-build-800b7cc42ca6/output/aarch64-linux-gnu/bitcoin-800b7cc42ca6-aarch64-linux-gnu.tar.gz
 31e93c16fa60545e3103ee16ab4e251326dafdddb193a9e8b88bb6410edde5cd8  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/SHA256SUMS.part
 46f260d7bb26fe76ab637d751bd390fb4f5a8aaea405f3c3b05b33bc7eb1f5266  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/bitcoin-800b7cc42ca6-arm-linux-gnueabihf-debug.tar.gz
 5028d88df8073b27b109f25d6ccc25cabf27dee837562c49e4a456fda96b31a11  guix-build-800b7cc42ca6/output/arm-linux-gnueabihf/bitcoin-800b7cc42ca6-arm-linux-gnueabihf.tar.gz
 69042f5fe09b0d61120ca2dda5488e7a1acc93ac1b2e66dd8a8f3107a4fae4700  guix-build-800b7cc42ca6/output/arm64-apple-darwin/SHA256SUMS.part
 7073fe6a231024932d38d9126cb2d5926e96384cb3ea544d03e6f5b8a53db72e6  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-codesigning.tar.gz
 8f017e990180322579b21214cb2cc6b9a183dc43b5f11f14aaef8633009673726  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-unsigned.tar.gz
 914e2c8c7aece407c6225194374ab90b4604532cd870502ac4b3915821967fcf2  guix-build-800b7cc42ca6/output/arm64-apple-darwin/bitcoin-800b7cc42ca6-arm64-apple-darwin-unsigned.zip
10ee33c3391262e4c897a85d7b2f033743e70825378157d3a621ff8055e39f3b69  guix-build-800b7cc42ca6/output/dist-archive/bitcoin-800b7cc42ca6.tar.gz
11b1f54424ce1c6cf3380f4d5ad99d181c52753ecb3c61ae8e34f40b2ee643ef0e  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/SHA256SUMS.part
126b1c52ca508144aa5ea911a0d95a96973fca647eb9033cf6d09f1e7ada478c17  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/bitcoin-800b7cc42ca6-powerpc64-linux-gnu-debug.tar.gz
13505a6998e67b2cda843f85d3194b836910a1a33f54511650d1736c309765fbc7  guix-build-800b7cc42ca6/output/powerpc64-linux-gnu/bitcoin-800b7cc42ca6-powerpc64-linux-gnu.tar.gz
14ade36e9cf2f3b06e1d9bbb1a45e4806296656441c237a2b04dc649f8631a576e  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/SHA256SUMS.part
15be44082f545987aef1783e8fdc19c99f02324b89ab1e94c6081bd27db74228b5  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/bitcoin-800b7cc42ca6-riscv64-linux-gnu-debug.tar.gz
16e826c85054bbcedce5de8121467179f5d3eb9d7973c22508c6e0c04d70c38909  guix-build-800b7cc42ca6/output/riscv64-linux-gnu/bitcoin-800b7cc42ca6-riscv64-linux-gnu.tar.gz
17ce3a0948679d6effac6323693b935e048bf5ecaf268e4d95710f7e3e6a2bd5be  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/SHA256SUMS.part
18efad91469e957bf90af9a62bdc94df1241f23e51715f0da8fecb8de9c3e4f0bc  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-codesigning.tar.gz
198f763359ae3b1cd638cd83f51e7baa07903fe307fd17502faba48959405bb241  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-unsigned.tar.gz
208d8ce884550ad5054c773157bdc11b7f5192a9075f2b6247688e580706a596dd  guix-build-800b7cc42ca6/output/x86_64-apple-darwin/bitcoin-800b7cc42ca6-x86_64-apple-darwin-unsigned.zip
21acff10fa6e8e86811dff20ce7420c220cec55dfe3eb24d427ffc766dc2079be6  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/SHA256SUMS.part
22d6d30f4888fcc4d19916d5a6c774a22a0a216d64588950893746a9c0ce919dca  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/bitcoin-800b7cc42ca6-x86_64-linux-gnu-debug.tar.gz
238a78a2d009c0fef11274ea47a6a46dbeb6effe8aca82ea9aea71b5abbb1b5207  guix-build-800b7cc42ca6/output/x86_64-linux-gnu/bitcoin-800b7cc42ca6-x86_64-linux-gnu.tar.gz
248de26cd66a67a029f06b71661ab64233f380b109b211ce9d26e02ef4634673f0  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/SHA256SUMS.part
258d66924d1b0f23a9e9cb48b051702ba851d9753cb093f25bca712d0c3b1add11  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-codesigning.tar.gz
264acd6691ea9c913e5065380c26f06918e475ded290e111584e6a6ac5b77e5185  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-debug.zip
2760d4293e162455b6cc329072199dee750e5a1afbc6017307b447dd556b23e6ee  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-setup-unsigned.exe
289024c5428fcdd695808d2b105fc3f1b52210b8ec5af3ee407e884c7927adb99e  guix-build-800b7cc42ca6/output/x86_64-w64-mingw32/bitcoin-800b7cc42ca6-win64-unsigned.zip

fanquake approved

fanquake commented at 2:23 pm on May 21, 2025: member

ACK 800b7cc42ca63f2a6b245a4d327c7092289da6e1

fanquake merged this on May 22, 2025

fanquake closed this on May 22, 2025

fanquake commented at 9:01 am on May 22, 2025: member

Only 800b7cc42ca63f2a6b245a4d327c7092289da6e1 needs backporting here.

hebasto deleted the branch on May 22, 2025

fanquake referenced this in commit 142153ee42 on May 22, 2025

fanquake removed the label Needs backport (29.x) on May 22, 2025

fanquake commented at 1:57 pm on May 22, 2025: member

Backported to 29.x in #32589.

cmake: Remove ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI} from bitcoin-build-config.h #32551

Code Coverage & Benchmarks

Reviews

Conflicts

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

cmake: Remove `ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI}` from `bitcoin-build-config.h` #32551