From c71ebe915d4082754f231a244791ee6e011dab81 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Sat, 26 Sep 2026 15:43:56 -0400 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci-expanded.yml | 6 ++--- .github/workflows/ci.yml | 6 ++--- builds/cmake/install-cmake.sh | 4 ++++ builds/cmake/install-presets.sh | 4 ++++ builds/gnu/install-gnu.sh | 4 ++++ builds/msvc/build-msvc.cmd | 8 +++++++ builds/msvc/properties/Release.props | 2 -- .../libbitcoin-database-test.vcxproj | 24 ------------------- .../libbitcoin-database-tools.vcxproj | 24 ------------------- builds/msvc/vs2026/libbitcoin-database.sln | 14 ----------- .../libbitcoin-database.vcxproj | 24 ------------------- .../vs2026/libbitcoin-system.import.props | 3 +++ .../msvc/vs2026/libbitcoin-system.import.xml | 5 ++++ 13 files changed, 34 insertions(+), 94 deletions(-) diff --git a/.github/workflows/ci-expanded.yml b/.github/workflows/ci-expanded.yml index a5a5f820a..e32103e95 100644 --- a/.github/workflows/ci-expanded.yml +++ b/.github/workflows/ci-expanded.yml @@ -507,7 +507,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} @@ -1028,7 +1028,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} @@ -1472,7 +1472,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d5c1785c..431daba5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,7 +203,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} @@ -417,7 +417,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} @@ -589,7 +589,7 @@ jobs: working-directory: 'libbitcoin-database' run: | lcov --ignore-errors version,gcov,mismatch,mismatch --directory . --capture --output-file coverage.info - lcov --ignore-errors unused --remove coverage.info "${{ github.workspace }}/prefix/*" "${{ github.workspace }}/libbitcoin-database/examples/*" "${{ github.workspace }}/libbitcoin-database/test/*" --output-file coverage.info + lcov --ignore-errors unused --extract coverage.info "${{ github.workspace }}/libbitcoin-database/include/*" "${{ github.workspace }}/libbitcoin-database/src/*" --output-file coverage.info - name: Coveralls.io upload if: ${{ matrix.coverage == 'lcov' }} diff --git a/builds/cmake/install-cmake.sh b/builds/cmake/install-cmake.sh index 5f9c6fe54..4ff7eae8f 100755 --- a/builds/cmake/install-cmake.sh +++ b/builds/cmake/install-cmake.sh @@ -12,6 +12,8 @@ # Default: OFF # -Denable-avx512= Use Intel AVX512 intrinsics. # Default: OFF +# -Denable-ifma= Use Intel AVX512 IFMA intrinsics. +# Default: OFF # -Denable-sse41= Use SSE4.1 hardware instructions. # Default: OFF # -Denable-shani= Use Intel/ARM SHA Extensions. @@ -1002,6 +1004,8 @@ help() msg " Default: OFF" msg "-Denable-avx512= Use Intel AVX512 intrinsics." msg " Default: OFF" + msg "-Denable-ifma= Use Intel AVX512 IFMA intrinsics." + msg " Default: OFF" msg "-Denable-sse41= Use SSE4.1 hardware instructions." msg " Default: OFF" msg "-Denable-shani= Use Intel/ARM SHA Extensions." diff --git a/builds/cmake/install-presets.sh b/builds/cmake/install-presets.sh index e69fa4358..2f44b88e8 100755 --- a/builds/cmake/install-presets.sh +++ b/builds/cmake/install-presets.sh @@ -12,6 +12,8 @@ # Default: OFF # -Denable-avx512= Use Intel AVX512 intrinsics. # Default: OFF +# -Denable-ifma= Use Intel AVX512 IFMA intrinsics. +# Default: OFF # -Denable-sse41= Use SSE4.1 hardware instructions. # Default: OFF # -Denable-shani= Use Intel/ARM SHA Extensions. @@ -1080,6 +1082,8 @@ help() msg " Default: OFF" msg "-Denable-avx512= Use Intel AVX512 intrinsics." msg " Default: OFF" + msg "-Denable-ifma= Use Intel AVX512 IFMA intrinsics." + msg " Default: OFF" msg "-Denable-sse41= Use SSE4.1 hardware instructions." msg " Default: OFF" msg "-Denable-shani= Use Intel/ARM SHA Extensions." diff --git a/builds/gnu/install-gnu.sh b/builds/gnu/install-gnu.sh index 9436889ae..4cd3b3a20 100755 --- a/builds/gnu/install-gnu.sh +++ b/builds/gnu/install-gnu.sh @@ -12,6 +12,8 @@ # Default: --disable-avx2 # ---avx512 Use Intel AVX512 intrinsics. # Default: --disable-avx512 +# ---ifma Use Intel AVX512 IFMA intrinsics. +# Default: --disable-ifma # ---sse41 Use SSE4.1 hardware instructions. # Default: --disable-sse41 # ---shani Use Intel/ARM SHA Extensions. @@ -1234,6 +1236,8 @@ help() msg " Default: --disable-avx2" msg "---avx512 Use Intel AVX512 intrinsics." msg " Default: --disable-avx512" + msg "---ifma Use Intel AVX512 IFMA intrinsics." + msg " Default: --disable-ifma" msg "---sse41 Use SSE4.1 hardware instructions." msg " Default: --disable-sse41" msg "---shani Use Intel/ARM SHA Extensions." diff --git a/builds/msvc/build-msvc.cmd b/builds/msvc/build-msvc.cmd index 7ee938fc6..3685c8663 100644 --- a/builds/msvc/build-msvc.cmd +++ b/builds/msvc/build-msvc.cmd @@ -13,6 +13,7 @@ REM REM Script options: REM --enable-avx2 Use Intel AVX2 intrinsics. REM --enable-avx512 Use Intel AVX512 intrinsics. +REM --enable-ifma Use Intel AVX512 IFMA intrinsics. REM --enable-sse41 Use SSE4.1 hardware instructions. REM --enable-shani Use Intel/ARM SHA Extensions. REM --enable-crypto Use ARM Crypto Extensions. @@ -216,6 +217,12 @@ if "!libbitcoin_database_TAG!" == "" ( ) else ( set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-arch=AdvancedVectorExtensions512" ) + ) else if "%~1" == "--enable-ifma" ( + if "!libbitcoin-system_PARAMS!" == "" ( + set "libbitcoin-system_PARAMS=/p:Option-ifma=true" + ) else ( + set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-ifma=true" + ) ) else if "%~1" == "--enable-sse41" ( if "!libbitcoin-system_PARAMS!" == "" ( set "libbitcoin-system_PARAMS=/p:Option-arch=AdvancedVectorExtensions" @@ -475,6 +482,7 @@ if "!libbitcoin_database_TAG!" == "" ( call :msg "Script options:" call :msg "--enable-avx2 Use Intel AVX2 intrinsics." call :msg "--enable-avx512 Use Intel AVX512 intrinsics." + call :msg "--enable-ifma Use Intel AVX512 IFMA intrinsics." call :msg "--enable-sse41 Use SSE4.1 hardware instructions." call :msg "--enable-shani Use Intel/ARM SHA Extensions." call :msg "--enable-crypto Use ARM Crypto Extensions." diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props index 9fc038977..d7482af81 100644 --- a/builds/msvc/properties/Release.props +++ b/builds/msvc/properties/Release.props @@ -35,8 +35,6 @@ MaxSpeed - NotSet - NoExtensions StreamingSIMDExtensions StreamingSIMDExtensions2 AdvancedVectorExtensions diff --git a/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj b/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj index 64e547cfe..03791461c 100644 --- a/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj @@ -13,30 +13,6 @@ libbitcoin-database-test - - DebugDEXE - ARM - - - ReleaseDEXE - ARM - - - DebugLEXE - ARM - - - ReleaseLEXE - ARM - - - DebugSEXE - ARM - - - ReleaseSEXE - ARM - DebugDEXE ARM64 diff --git a/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj b/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj index dadb58877..38f0abf59 100644 --- a/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj @@ -13,30 +13,6 @@ libbitcoin-database-tools - - DebugDEXE - ARM - - - ReleaseDEXE - ARM - - - DebugLEXE - ARM - - - ReleaseLEXE - ARM - - - DebugSEXE - ARM - - - ReleaseSEXE - ARM - DebugDEXE ARM64 diff --git a/builds/msvc/vs2026/libbitcoin-database.sln b/builds/msvc/vs2026/libbitcoin-database.sln index 5395b4dcd..f4d2c5413 100644 --- a/builds/msvc/vs2026/libbitcoin-database.sln +++ b/builds/msvc/vs2026/libbitcoin-database.sln @@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin-database-tools", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - StaticDebug|ARM = StaticDebug|ARM - StaticRelease|ARM = StaticRelease|ARM StaticDebug|ARM64 = StaticDebug|ARM64 StaticRelease|ARM64 = StaticRelease|ARM64 StaticDebug|Win32 = StaticDebug|Win32 @@ -21,10 +19,6 @@ Global StaticRelease|x64 = StaticRelease|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticDebug|ARM.ActiveCfg = DebugLIB|ARM - {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticDebug|ARM.Build.0 = DebugLIB|ARM - {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticRelease|ARM.ActiveCfg = ReleaseLIB|ARM - {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticRelease|ARM.Build.0 = ReleaseLIB|ARM {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticDebug|ARM64.ActiveCfg = DebugLIB|ARM64 {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticDebug|ARM64.Build.0 = DebugLIB|ARM64 {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticRelease|ARM64.ActiveCfg = ReleaseLIB|ARM64 @@ -37,10 +31,6 @@ Global {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticDebug|x64.Build.0 = DebugLIB|x64 {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 {62D7FBEE-4D52-424A-8938-59756E13D9F5}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 - {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticDebug|ARM.ActiveCfg = DebugSEXE|ARM - {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticDebug|ARM.Build.0 = DebugSEXE|ARM - {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticRelease|ARM.ActiveCfg = ReleaseSEXE|ARM - {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticRelease|ARM.Build.0 = ReleaseSEXE|ARM {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticDebug|ARM64.ActiveCfg = DebugSEXE|ARM64 {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticDebug|ARM64.Build.0 = DebugSEXE|ARM64 {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticRelease|ARM64.ActiveCfg = ReleaseSEXE|ARM64 @@ -53,10 +43,6 @@ Global {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticDebug|x64.Build.0 = DebugSEXE|x64 {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64 {5C4DA53A-8C06-4DA6-A2A8-3C30F338ED70}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64 - {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticDebug|ARM.ActiveCfg = DebugSEXE|ARM - {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticDebug|ARM.Build.0 = DebugSEXE|ARM - {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticRelease|ARM.ActiveCfg = ReleaseSEXE|ARM - {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticRelease|ARM.Build.0 = ReleaseSEXE|ARM {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticDebug|ARM64.ActiveCfg = DebugSEXE|ARM64 {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticDebug|ARM64.Build.0 = DebugSEXE|ARM64 {005F2A86-F937-4AB5-B041-0F21B67EEC66}.StaticRelease|ARM64.ActiveCfg = ReleaseSEXE|ARM64 diff --git a/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj b/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj index c3bfef19a..7e0957072 100644 --- a/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj @@ -12,30 +12,6 @@ libbitcoin-database - - DebugDLL - ARM - - - ReleaseDLL - ARM - - - DebugLTCG - ARM - - - ReleaseLTCG - ARM - - - DebugLIB - ARM - - - ReleaseLIB - ARM - DebugDLL ARM64 diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props index 6aaae20b2..7f9ea8cf3 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.props +++ b/builds/msvc/vs2026/libbitcoin-system.import.props @@ -21,6 +21,7 @@ false + false true false false @@ -39,6 +40,7 @@ + @@ -62,6 +64,7 @@ WITH_SHA;%(PreprocessorDefinitions) + WITH_IFMA;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2026/libbitcoin-system.import.xml b/builds/msvc/vs2026/libbitcoin-system.import.xml index 1501f8dfa..e43fb5284 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.xml +++ b/builds/msvc/vs2026/libbitcoin-system.import.xml @@ -20,6 +20,7 @@ + @@ -28,6 +29,10 @@ + + + +