From fb6bf4c11a45b95d52df930c6ad97403c3df116a Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Fri, 24 Jan 2025 21:01:53 -0800 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 99 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf797e36ec..cc22478ac7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,12 +23,13 @@ jobs: optimization: "debug" assert: "debug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "clang-15" flags: "-Og -fPIE" - options: "--enable-isystem --enable-avx2 --enable-sse4" + options: "--enable-isystem --enable-avx2 --enable-sse41" packager: "apt" packages: "" @@ -38,6 +39,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" @@ -53,12 +55,13 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "gcc-11" flags: "-Os -fPIE" - options: "--enable-isystem --enable-sse4" + options: "--enable-isystem --enable-sse41" packager: "apt" packages: "" @@ -68,6 +71,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "cov" + detectcpuflags: "detect" boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" @@ -83,6 +87,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" @@ -98,6 +103,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" @@ -136,6 +142,29 @@ jobs: run: | brew install autoconf automake libtool ${{ matrix.packages }} + - name: Determine CPU flags + shell: bash + run: | + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sse4_1 ") ]]; then + echo "CPU_SUPPORT_SSE41=--enable-sse41" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx " | grep " avx2 ") ]]; then + echo "CPU_SUPPORT_AVX2=--enable-avx2" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx512bw ") ]]; then + echo "CPU_SUPPORT_AVX512=--enable-avx512" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sha_ni ") ]]; then + echo "CPU_SUPPORT_SHANI=--enable-shani" >> $GITHUB_ENV + fi + + if [[ ${{ matrix.detectcpuflags }} == 'detect' ]]; then + echo "CPU_SUPPORTED_FLAGS='$CPU_SUPPORT_SSE41 $CPU_SUPPORT_AVX2 $CPU_SUPPORT_AVX512 $CPU_SUPPORT_SHANI'" >> $GITHUB_ENV + fi + - name: Denormalize parameterization shell: bash run: | @@ -174,6 +203,7 @@ jobs: --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} + ${{ env.CPU_SUPPORTED_FLAGS }} ${{ matrix.boost }} ${{ matrix.icu }} ${{ matrix.secp256k1 }} @@ -255,12 +285,13 @@ jobs: optimization: "debug" assert: "debug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "clang-15" flags: "-Og -fPIE" - options: "-Denable-avx2=on -Denable-sse4=on" + options: "-Denable-avx2=on -Denable-sse41=on" packager: "apt" packages: "" @@ -270,6 +301,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" @@ -285,12 +317,13 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "gcc-11" flags: "-Os -fPIE" - options: "-Denable-sse4=on" + options: "-Denable-sse41=on" packager: "apt" packages: "" @@ -300,6 +333,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" @@ -315,6 +349,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" @@ -330,6 +365,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" @@ -368,6 +404,29 @@ jobs: run: | brew install autoconf automake libtool ${{ matrix.packages }} + - name: Determine CPU flags + shell: bash + run: | + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sse4_1 ") ]]; then + echo "CPU_SUPPORT_SSE41=-Denable-sse41=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx " | grep " avx2 ") ]]; then + echo "CPU_SUPPORT_AVX2=-Denable-avx2=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx512bw ") ]]; then + echo "CPU_SUPPORT_AVX512=-Denable-avx512=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sha_ni ") ]]; then + echo "CPU_SUPPORT_SHANI=-Denable-shani=on" >> $GITHUB_ENV + fi + + if [[ ${{ matrix.detectcpuflags }} == 'detect' ]]; then + echo "CPU_SUPPORTED_FLAGS='$CPU_SUPPORT_SSE41 $CPU_SUPPORT_AVX2 $CPU_SUPPORT_AVX512 $CPU_SUPPORT_SHANI'" >> $GITHUB_ENV + fi + - name: Denormalize parameterization shell: bash run: | @@ -409,6 +468,7 @@ jobs: --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} + ${{ env.CPU_SUPPORTED_FLAGS }} ${{ matrix.boost }} ${{ matrix.icu }} ${{ matrix.secp256k1 }} @@ -501,12 +561,13 @@ jobs: optimization: "debug" assert: "debug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "clang-15" flags: "-Og -fPIE" - options: "-Denable-avx2=on -Denable-sse4=on" + options: "-Denable-avx2=on -Denable-sse41=on" packager: "apt" packages: "" @@ -517,6 +578,7 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "--build-icu --with-icu" secp256k1: "--build-secp256k1" @@ -533,12 +595,13 @@ jobs: optimization: "size" assert: "ndebug" coverage: "nocov" + detectcpuflags: "ignore" boost: "--build-boost" icu: "" secp256k1: "--build-secp256k1" cc: "gcc-11" flags: "-Os -fPIE" - options: "-Denable-sse4=on" + options: "-Denable-sse41=on" packager: "apt" packages: "" @@ -571,6 +634,29 @@ jobs: run: | brew install autoconf automake libtool ${{ matrix.packages }} + - name: Determine CPU flags + shell: bash + run: | + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sse4_1 ") ]]; then + echo "CPU_SUPPORT_SSE41=-Denable-sse41=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx " | grep " avx2 ") ]]; then + echo "CPU_SUPPORT_AVX2=-Denable-avx2=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " avx512bw ") ]]; then + echo "CPU_SUPPORT_AVX512=-Denable-avx512=on" >> $GITHUB_ENV + fi + + if [[ -n $(cat /proc/cpuinfo | grep flags | grep " sha_ni ") ]]; then + echo "CPU_SUPPORT_SHANI=-Denable-shani=on" >> $GITHUB_ENV + fi + + if [[ ${{ matrix.detectcpuflags }} == 'detect' ]]; then + echo "CPU_SUPPORTED_FLAGS='$CPU_SUPPORT_SSE41 $CPU_SUPPORT_AVX2 $CPU_SUPPORT_AVX512 $CPU_SUPPORT_SHANI'" >> $GITHUB_ENV + fi + - name: Denormalize parameterization shell: bash run: | @@ -613,6 +699,7 @@ jobs: --preset=${{ matrix.preset }} ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} + ${{ env.CPU_SUPPORTED_FLAGS }} ${{ matrix.boost }} ${{ matrix.icu }} ${{ matrix.secp256k1 }}