depends: drop -O1 workaround from arm64 apple Qt build

fanquake commented at 4:29 pm on November 2, 2023: member

Drop the workaround of setting optimization flags to -O1 for the arm64-apple-darwin builds. I no-longer see reproducibility issues when building across x86_64 and aarch64:

 0real	7m21.192s
 1user	67m41.047s
 2sys	5m8.596s
 3fedora-32gb-hel1-1 bitcoin]# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 462373549d2884e8ef8f46a77b9a93f64ebfc88603569e9d33b68fc67beaf2226  guix-build-664c87354f9e/output/arm64-apple-darwin/SHA256SUMS.part
 5597889f1908fdb67a6419177a98935b7119c637a962f03f47270893c5ba3fd6f  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.tar.gz
 6289340354532a54a42b7235c831d13fdb28751c643f0fa0fc417ab195e9b5d90  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.zip
 774f4ab3819a186d6c34ca0a4b9dda7c38fcb36bd9b22075a5d91df9bdd5df98a  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin.tar.gz
 8f0d0dad63057c7dddf6d6ccee244e7916ac0ee26b3bef8dd35f8430280043b38  guix-build-664c87354f9e/output/dist-archive/bitcoin-664c87354f9e.tar.gz
 9fedora-32gb-hel1-1 bitcoin]# uname -m
10aarch64

 0real	18m10.759s
 1user	108m21.656s
 2sys	6m12.930s
 3ubuntu-32gb-hel1-1:~/bitcoin# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
 462373549d2884e8ef8f46a77b9a93f64ebfc88603569e9d33b68fc67beaf2226  guix-build-664c87354f9e/output/arm64-apple-darwin/SHA256SUMS.part
 5597889f1908fdb67a6419177a98935b7119c637a962f03f47270893c5ba3fd6f  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.tar.gz
 6289340354532a54a42b7235c831d13fdb28751c643f0fa0fc417ab195e9b5d90  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.zip
 774f4ab3819a186d6c34ca0a4b9dda7c38fcb36bd9b22075a5d91df9bdd5df98a  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin.tar.gz
 8f0d0dad63057c7dddf6d6ccee244e7916ac0ee26b3bef8dd35f8430280043b38  guix-build-664c87354f9e/output/dist-archive/bitcoin-664c87354f9e.tar.gz
 9ubuntu-32gb-hel1-1:~/bitcoin# uname -m
10x86_64

depends: drop -O1 workaround from arm64 apple Qt build 664c87354f

DrahtBot commented at 4:29 pm on November 2, 2023: contributor

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	hebasto, TheCharlatan

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

DrahtBot added the label Build system on Nov 2, 2023

hebasto commented at 4:33 pm on November 2, 2023: member

Concept ACK. Nice :)

DrahtBot added the label CI failed on Nov 2, 2023

maflcko added the label DrahtBot Guix build requested on Nov 3, 2023

hebasto approved

hebasto commented at 11:32 am on November 3, 2023: member

ACK 664c87354f9ec5df95346eab72a034296b83914d.

My Guix builds:

0x86_64
162373549d2884e8ef8f46a77b9a93f64ebfc88603569e9d33b68fc67beaf2226  guix-build-664c87354f9e/output/arm64-apple-darwin/SHA256SUMS.part
2597889f1908fdb67a6419177a98935b7119c637a962f03f47270893c5ba3fd6f  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.tar.gz
3289340354532a54a42b7235c831d13fdb28751c643f0fa0fc417ab195e9b5d90  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.zip
474f4ab3819a186d6c34ca0a4b9dda7c38fcb36bd9b22075a5d91df9bdd5df98a  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin.tar.gz
5f0d0dad63057c7dddf6d6ccee244e7916ac0ee26b3bef8dd35f8430280043b38  guix-build-664c87354f9e/output/dist-archive/bitcoin-664c87354f9e.tar.gz

0aarch64
162373549d2884e8ef8f46a77b9a93f64ebfc88603569e9d33b68fc67beaf2226  guix-build-664c87354f9e/output/arm64-apple-darwin/SHA256SUMS.part
2597889f1908fdb67a6419177a98935b7119c637a962f03f47270893c5ba3fd6f  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.tar.gz
3289340354532a54a42b7235c831d13fdb28751c643f0fa0fc417ab195e9b5d90  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin-unsigned.zip
474f4ab3819a186d6c34ca0a4b9dda7c38fcb36bd9b22075a5d91df9bdd5df98a  guix-build-664c87354f9e/output/arm64-apple-darwin/bitcoin-664c87354f9e-arm64-apple-darwin.tar.gz
5f0d0dad63057c7dddf6d6ccee244e7916ac0ee26b3bef8dd35f8430280043b38  guix-build-664c87354f9e/output/dist-archive/bitcoin-664c87354f9e.tar.gz

TheCharlatan approved

TheCharlatan commented at 12:25 pm on November 3, 2023: contributor

ACK 664c87354f9ec5df95346eab72a034296b83914d

I get the same hashes on both platforms.

fanquake merged this on Nov 3, 2023

fanquake closed this on Nov 3, 2023

fanquake deleted the branch on Nov 3, 2023

DrahtBot commented at 10:47 pm on November 3, 2023: contributor

Guix builds (on x86_64)

File	commit f23ac10ca5a322e87664b58233dccc4cb74c0570(master)	commit 1669f4fff6b964ea0c284d13c4745825ee135618(master and this pull)
SHA256SUMS.part	`92659357fc97fc8e...`	`211b6d4fa72bf6e2...`
*-aarch64-linux-gnu-debug.tar.gz	`8e85af4277097e63...`	`0eb731d6627e9455...`
*-aarch64-linux-gnu.tar.gz	`d29c219e45146ed7...`	`e8a600f9707db751...`
*-arm-linux-gnueabihf-debug.tar.gz	`e9564bc7151e514d...`	`f6051729915f9e91...`
*-arm-linux-gnueabihf.tar.gz	`0dea490de2900729...`	`d2e5032aa674ce4a...`
*-arm64-apple-darwin-unsigned.tar.gz	`ed905a38a6985922...`	`8e73315081b1c4b6...`
*-arm64-apple-darwin-unsigned.zip	`5ff300abccc86e16...`	`6089e2ed3e96c816...`
*-arm64-apple-darwin.tar.gz	`a46b5b97c3daaad9...`	`9ee04855e6e23393...`
*-powerpc64-linux-gnu-debug.tar.gz	`ed88e835f99cd5cc...`	`33e99cd311c31db7...`
*-powerpc64-linux-gnu.tar.gz	`0be7a7cb50a4dd4a...`	`2b4783713489565d...`
*-powerpc64le-linux-gnu-debug.tar.gz	`9565b3c366b349e0...`	`50fc16ba05e8d06b...`
*-powerpc64le-linux-gnu.tar.gz	`01c7d06acaa2bda9...`	`9f2fd46a4c2d7043...`
*-riscv64-linux-gnu-debug.tar.gz	`bcc048b2f5be12e1...`	`6184b27b7c8551cb...`
*-riscv64-linux-gnu.tar.gz	`e9b064d98292bf76...`	`c1c36cdcbddcf43a...`
*-x86_64-apple-darwin-unsigned.tar.gz	`a0715a07c1dcf9d3...`	`f8e7c176b8c33b38...`
*-x86_64-apple-darwin-unsigned.zip	`31b6d7106c930a54...`	`a36e63bb6d60a591...`
*-x86_64-apple-darwin.tar.gz	`5ab5018cc8162e08...`	`c6d723ef3e6aec67...`
*-x86_64-linux-gnu-debug.tar.gz	`250b3ad75c897648...`	`aef211de3fd3cf84...`
*-x86_64-linux-gnu.tar.gz	`2011c32866473392...`	`6b33623054f2c9d2...`
*.tar.gz	`2ea368703376018d...`	`1348c8b681769fda...`
guix_build.log	`cb9055f69265de9e...`	`4f5592bb6b68920b...`
guix_build.log.diff		`d2de79cb1dc40b85...`

DrahtBot removed the label DrahtBot Guix build requested on Nov 3, 2023

depends: drop -O1 workaround from arm64 apple Qt build #28778

Code Coverage

Reviews

Guix builds (on x86_64)