Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: move sha256_sse4 into libbitcoin_crypto_base #29528

Merged
merged 1 commit into from Mar 2, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Mar 1, 2024

Followup to discussion in #29407.
Drops LIBBITCOIN_CRYPTO_SSE4.

Followup to discussion in bitcoin#29407.
Drops LIBBITCOIN_CRYPTO_SSE4.
@fanquake fanquake requested a review from theuni March 1, 2024 16:58
@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 1, 2024

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK theuni, hebasto, TheCharlatan

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

Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. That's simpler than I thought. Apologies @hebasto, you were right to request this in the previous PR.

utACK 5216933.

I think it's still worth a refactor of the CPPFLAGS handling, but I'll poke at that and PR it separately.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 5216933.

@fanquake
Copy link
Member Author

fanquake commented Mar 1, 2024

Guix build (aarch64):

7ba2cf1ad25101ddd6178eeb6b5ae0ea36c9efb3a84eb1d388d95e6bb61f66a7  guix-build-521693378b86/output/aarch64-linux-gnu/SHA256SUMS.part
ecf79558afb9df407c9383d3635b51cf5f61ec65ef5b002ea896922d7e77d12f  guix-build-521693378b86/output/aarch64-linux-gnu/bitcoin-521693378b86-aarch64-linux-gnu-debug.tar.gz
175c5d3b456d2d2fc46bff562b9d364cec3fe09e7ca11618d48f20f30d7a4cfe  guix-build-521693378b86/output/aarch64-linux-gnu/bitcoin-521693378b86-aarch64-linux-gnu.tar.gz
dabe00495a9ef12a102fab96ff58b9b5110e63880e5338757d55c105bf43bce3  guix-build-521693378b86/output/arm-linux-gnueabihf/SHA256SUMS.part
d2cdb58daec5c383d3a451b3004bb51055c7859a57b6f5dbcdee8fbf7069d3a8  guix-build-521693378b86/output/arm-linux-gnueabihf/bitcoin-521693378b86-arm-linux-gnueabihf-debug.tar.gz
b6feb5b9680901d039f0cc5a168197eb66067d63b7fcf039e35230602f98d043  guix-build-521693378b86/output/arm-linux-gnueabihf/bitcoin-521693378b86-arm-linux-gnueabihf.tar.gz
f56f73b1b4e8961fc49e952df16d164be91e565dcdd42015c0e6fc7191fad6a9  guix-build-521693378b86/output/arm64-apple-darwin/SHA256SUMS.part
fff78b516394f0c739b939d05c3a8d3111673e94395ed13832d2db3fa849a0c8  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin-unsigned.tar.gz
6655910d43b5a4d185933f2749b716136a1587b3a340fddc56aef6d01708d285  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin-unsigned.zip
9baa2141d93e58ae66c4285b3f00c8274cba5525e97a17d57daa20cb76d5071b  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin.tar.gz
9e6f66517fc7f7c1a1435826d386daf62f360bd1704e210cb080dc2c6362b6b4  guix-build-521693378b86/output/dist-archive/bitcoin-521693378b86.tar.gz
31b51f8b7aaedfbd69808c9e89b6cd4ef58fab7f2533786a4e23d1e1fc097137  guix-build-521693378b86/output/powerpc64-linux-gnu/SHA256SUMS.part
d0224c51c53494606711446ad6bb9a8e5f0b13a0d8656dc87f66aec934057981  guix-build-521693378b86/output/powerpc64-linux-gnu/bitcoin-521693378b86-powerpc64-linux-gnu-debug.tar.gz
4fe1217705e27e05a997bad75a1105e4cd347860311554434d09f5b8f94a5ea1  guix-build-521693378b86/output/powerpc64-linux-gnu/bitcoin-521693378b86-powerpc64-linux-gnu.tar.gz
bf1ce3c3302d11d368f64204d5b01b02c1d3e8635052fe82c67ef941bc388805  guix-build-521693378b86/output/powerpc64le-linux-gnu/SHA256SUMS.part
ab619fa2ef67986eff559b4700858727894213dd214b203dcd2f0d98ab8e31d4  guix-build-521693378b86/output/powerpc64le-linux-gnu/bitcoin-521693378b86-powerpc64le-linux-gnu-debug.tar.gz
d924262e1d68d1ca08c431e4d97957dd47b3e822866381a9bd11477a4c96360f  guix-build-521693378b86/output/powerpc64le-linux-gnu/bitcoin-521693378b86-powerpc64le-linux-gnu.tar.gz
3f650328ed27e62bdbe27dd4fbf436b8bb9989d1e19c0350f0b08dc2b57dbb58  guix-build-521693378b86/output/riscv64-linux-gnu/SHA256SUMS.part
7816c26bfe0f849f2c6830d17c5a38a1cf133376051a4e89a23a025b31a36c2d  guix-build-521693378b86/output/riscv64-linux-gnu/bitcoin-521693378b86-riscv64-linux-gnu-debug.tar.gz
c8c94a618f82d8e1ddaf4153c42a634c6f565a3770cb6a0836ee1c1b98e6c665  guix-build-521693378b86/output/riscv64-linux-gnu/bitcoin-521693378b86-riscv64-linux-gnu.tar.gz
e4085e2d17b13c06da63c318c3e1a12ebcf8207e24a0babc09a6ead213d611d9  guix-build-521693378b86/output/x86_64-apple-darwin/SHA256SUMS.part
202291f243618c94635d7bd09f6d46aba0a9269220b530efef722f8b8d6e4a29  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin-unsigned.tar.gz
25de5874ef0b756c01679973ac2f647ca97e2527965e86a0625771e81cc111a2  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin-unsigned.zip
ccfb25db4ce0e7d6a4f6fad1a42668b6333795e5560b931de725e4c679cd3245  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin.tar.gz
c540d93ea1f6e9c645f802135e365848927f950ad8d4891728153eb6a3060871  guix-build-521693378b86/output/x86_64-linux-gnu/SHA256SUMS.part
08cc0590ce3d6b93ce0175ef8e5b144af4b4b93cd72d7e783101ad3aedee37b5  guix-build-521693378b86/output/x86_64-linux-gnu/bitcoin-521693378b86-x86_64-linux-gnu-debug.tar.gz
592211699162df290e2bdc43a14e7bed5ad080645425e49f91a5478ebbd7a942  guix-build-521693378b86/output/x86_64-linux-gnu/bitcoin-521693378b86-x86_64-linux-gnu.tar.gz
98a9b6909caa532552a429f4efb7e5865bd0016501dad111c5fe9fda4178011c  guix-build-521693378b86/output/x86_64-w64-mingw32/SHA256SUMS.part
fb68574a7bdf932bdbb157d2a7aa1ec55156230ff5259de5d1489dcd41fda330  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-debug.zip
f19fdff76bc49c717dc8fc884aff4c6cb448b62983afd30d4e3d3408ea7e9d3f  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-setup-unsigned.exe
9c3b68e4ff2e68eb1caa942f222dfa62de9ed947ab78153b80b3399cf1f5df57  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-unsigned.tar.gz
72ddf68e6e4fd1c500d7c0a1fc0d48fd620f431b6c4a0a5f0ee392999ebc1e69  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64.zip

This also removes the archive library: crypto/.libs/libbitcoin_crypto_sse4.a the table of contents is empty (no object file members in the library define global symbols) build output on arm macOS.

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 2, 2024

Guix builds (on x86_64)

File commit 8da62a1
(master)
commit 99875a7
(master and this pull)
SHA256SUMS.part 5022aba338b92b93... 027ca7374eea3acd...
*-aarch64-linux-gnu-debug.tar.gz d64e80c3ae810e91... 785d4601342336e2...
*-aarch64-linux-gnu.tar.gz 1c7103a60413e957... 4923bf29282cd9f9...
*-arm-linux-gnueabihf-debug.tar.gz f03ddbd7f0024870... 7f54571856539814...
*-arm-linux-gnueabihf.tar.gz d2f65379f7e18f98... 141c65d67db27742...
*-arm64-apple-darwin-unsigned.tar.gz 4232969367c80b59... 9025000ec1dd581d...
*-arm64-apple-darwin-unsigned.zip 81f88ca95fdd4613... a43b984d5369eb49...
*-arm64-apple-darwin.tar.gz 48764bab7cb87b90... b830eb8abd498f38...
*-powerpc64-linux-gnu-debug.tar.gz fcb7c76d2338377f... 22ac312aedf36dac...
*-powerpc64-linux-gnu.tar.gz 190ec6d7dd99ce2c... 0cb55a8a6f4ef87a...
*-powerpc64le-linux-gnu-debug.tar.gz d95557dc9031baa4... 675614459eb54095...
*-powerpc64le-linux-gnu.tar.gz 4e2c55cc369661da... 45935a6052c6d2d2...
*-riscv64-linux-gnu-debug.tar.gz b7fc3642546aa4e4... feb39f8a6ce119d0...
*-riscv64-linux-gnu.tar.gz 7c90a89565156fd4... fc19eb85a2669063...
*-x86_64-apple-darwin-unsigned.tar.gz df7676b774e0939c... eff2efa336206570...
*-x86_64-apple-darwin-unsigned.zip 91d2453410431904... 31321264e3bc378a...
*-x86_64-apple-darwin.tar.gz 4d08a5be158932d9... d77fda67e102096d...
*-x86_64-linux-gnu-debug.tar.gz 0ffcf721f8c0f534... 2675d0b836b2f6c8...
*-x86_64-linux-gnu.tar.gz e14a9b702251c803... 47a49f125f25056b...
*.tar.gz 3f4295325508931d... 0777e2ea90467655...
guix_build.log 3ff6869563b2aac8... f9c7c7a9944ecd35...
guix_build.log.diff ac43fddb4f206551...

@TheCharlatan
Copy link
Contributor

Guix build (x86):

7ba2cf1ad25101ddd6178eeb6b5ae0ea36c9efb3a84eb1d388d95e6bb61f66a7  guix-build-521693378b86/output/aarch64-linux-gnu/SHA256SUMS.part
ecf79558afb9df407c9383d3635b51cf5f61ec65ef5b002ea896922d7e77d12f  guix-build-521693378b86/output/aarch64-linux-gnu/bitcoin-521693378b86-aarch64-linux-gnu-debug.tar.gz
175c5d3b456d2d2fc46bff562b9d364cec3fe09e7ca11618d48f20f30d7a4cfe  guix-build-521693378b86/output/aarch64-linux-gnu/bitcoin-521693378b86-aarch64-linux-gnu.tar.gz
dabe00495a9ef12a102fab96ff58b9b5110e63880e5338757d55c105bf43bce3  guix-build-521693378b86/output/arm-linux-gnueabihf/SHA256SUMS.part
d2cdb58daec5c383d3a451b3004bb51055c7859a57b6f5dbcdee8fbf7069d3a8  guix-build-521693378b86/output/arm-linux-gnueabihf/bitcoin-521693378b86-arm-linux-gnueabihf-debug.tar.gz
b6feb5b9680901d039f0cc5a168197eb66067d63b7fcf039e35230602f98d043  guix-build-521693378b86/output/arm-linux-gnueabihf/bitcoin-521693378b86-arm-linux-gnueabihf.tar.gz
f56f73b1b4e8961fc49e952df16d164be91e565dcdd42015c0e6fc7191fad6a9  guix-build-521693378b86/output/arm64-apple-darwin/SHA256SUMS.part
fff78b516394f0c739b939d05c3a8d3111673e94395ed13832d2db3fa849a0c8  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin-unsigned.tar.gz
6655910d43b5a4d185933f2749b716136a1587b3a340fddc56aef6d01708d285  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin-unsigned.zip
9baa2141d93e58ae66c4285b3f00c8274cba5525e97a17d57daa20cb76d5071b  guix-build-521693378b86/output/arm64-apple-darwin/bitcoin-521693378b86-arm64-apple-darwin.tar.gz
9e6f66517fc7f7c1a1435826d386daf62f360bd1704e210cb080dc2c6362b6b4  guix-build-521693378b86/output/dist-archive/bitcoin-521693378b86.tar.gz
31b51f8b7aaedfbd69808c9e89b6cd4ef58fab7f2533786a4e23d1e1fc097137  guix-build-521693378b86/output/powerpc64-linux-gnu/SHA256SUMS.part
d0224c51c53494606711446ad6bb9a8e5f0b13a0d8656dc87f66aec934057981  guix-build-521693378b86/output/powerpc64-linux-gnu/bitcoin-521693378b86-powerpc64-linux-gnu-debug.tar.gz
4fe1217705e27e05a997bad75a1105e4cd347860311554434d09f5b8f94a5ea1  guix-build-521693378b86/output/powerpc64-linux-gnu/bitcoin-521693378b86-powerpc64-linux-gnu.tar.gz
bf1ce3c3302d11d368f64204d5b01b02c1d3e8635052fe82c67ef941bc388805  guix-build-521693378b86/output/powerpc64le-linux-gnu/SHA256SUMS.part
ab619fa2ef67986eff559b4700858727894213dd214b203dcd2f0d98ab8e31d4  guix-build-521693378b86/output/powerpc64le-linux-gnu/bitcoin-521693378b86-powerpc64le-linux-gnu-debug.tar.gz
d924262e1d68d1ca08c431e4d97957dd47b3e822866381a9bd11477a4c96360f  guix-build-521693378b86/output/powerpc64le-linux-gnu/bitcoin-521693378b86-powerpc64le-linux-gnu.tar.gz
3f650328ed27e62bdbe27dd4fbf436b8bb9989d1e19c0350f0b08dc2b57dbb58  guix-build-521693378b86/output/riscv64-linux-gnu/SHA256SUMS.part
7816c26bfe0f849f2c6830d17c5a38a1cf133376051a4e89a23a025b31a36c2d  guix-build-521693378b86/output/riscv64-linux-gnu/bitcoin-521693378b86-riscv64-linux-gnu-debug.tar.gz
c8c94a618f82d8e1ddaf4153c42a634c6f565a3770cb6a0836ee1c1b98e6c665  guix-build-521693378b86/output/riscv64-linux-gnu/bitcoin-521693378b86-riscv64-linux-gnu.tar.gz
e4085e2d17b13c06da63c318c3e1a12ebcf8207e24a0babc09a6ead213d611d9  guix-build-521693378b86/output/x86_64-apple-darwin/SHA256SUMS.part
202291f243618c94635d7bd09f6d46aba0a9269220b530efef722f8b8d6e4a29  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin-unsigned.tar.gz
25de5874ef0b756c01679973ac2f647ca97e2527965e86a0625771e81cc111a2  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin-unsigned.zip
ccfb25db4ce0e7d6a4f6fad1a42668b6333795e5560b931de725e4c679cd3245  guix-build-521693378b86/output/x86_64-apple-darwin/bitcoin-521693378b86-x86_64-apple-darwin.tar.gz
c540d93ea1f6e9c645f802135e365848927f950ad8d4891728153eb6a3060871  guix-build-521693378b86/output/x86_64-linux-gnu/SHA256SUMS.part
08cc0590ce3d6b93ce0175ef8e5b144af4b4b93cd72d7e783101ad3aedee37b5  guix-build-521693378b86/output/x86_64-linux-gnu/bitcoin-521693378b86-x86_64-linux-gnu-debug.tar.gz
592211699162df290e2bdc43a14e7bed5ad080645425e49f91a5478ebbd7a942  guix-build-521693378b86/output/x86_64-linux-gnu/bitcoin-521693378b86-x86_64-linux-gnu.tar.gz
98a9b6909caa532552a429f4efb7e5865bd0016501dad111c5fe9fda4178011c  guix-build-521693378b86/output/x86_64-w64-mingw32/SHA256SUMS.part
fb68574a7bdf932bdbb157d2a7aa1ec55156230ff5259de5d1489dcd41fda330  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-debug.zip
f19fdff76bc49c717dc8fc884aff4c6cb448b62983afd30d4e3d3408ea7e9d3f  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-setup-unsigned.exe
9c3b68e4ff2e68eb1caa942f222dfa62de9ed947ab78153b80b3399cf1f5df57  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64-unsigned.tar.gz
72ddf68e6e4fd1c500d7c0a1fc0d48fd620f431b6c4a0a5f0ee392999ebc1e69  guix-build-521693378b86/output/x86_64-w64-mingw32/bitcoin-521693378b86-win64.zip

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 5216933

hebasto added a commit to hebasto/bitcoin that referenced this pull request Mar 2, 2024
Align `bitcoin_crypto` library implementation with:
- bitcoin#29407
- bitcoin#29528

Note. Failed to present this change as git-autosquash-ready.
@fanquake fanquake merged commit fce53f1 into bitcoin:master Mar 2, 2024
16 checks passed
@fanquake fanquake deleted the move_sse4_into_crypto branch March 2, 2024 15:00
hebasto added a commit to hebasto/bitcoin that referenced this pull request Mar 4, 2024
…ecent sync to the master branch

4e19692 FIXUP: cmake: Build `bitcoin_crypto` library (Hennadii Stepanov)
fc662d9 fixup! cmake: Build `secp256k1` static library (Hennadii Stepanov)

Pull request description:

  Align `bitcoin_crypto` library implementation with:
  - bitcoin#29407
  - bitcoin#29528

  Note. Failed to present this change as git-autosquash-ready.

ACKs for top commit:
  pablomartin4btc:
    crACK 4e19692

Tree-SHA512: 2d87cc7dc8423bcd345eb9282bd4091a6c9a4e768fe6f7fb6a96922f40335d5f85ef288a5af5279aa9795832fd617c8167fc776b6fb06bb7d3f698866cc5e3e5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants