Enable optimizations.

This commit is contained in:
2023-09-24 20:20:43 +01:00
parent 0d9d1d92eb
commit 31edfa0758
2 changed files with 89 additions and 42 deletions

View File

@@ -16,60 +16,101 @@ cmake_minimum_required(VERSION 3.15)
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, see <http://www.gnu.org/licenses/>. # License along with this library; if not, see <http://www.gnu.org/licenses/>.
IF(APPLE) if (APPLE)
IF("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "") # Too early cmake has not yet set it
SET(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE) if ((NOT DEFINED CMAKE_SYSTEM_PROCESSOR) AND (NOT DEFINED AARU_MACOS_TARGET_ARCH))
ENDIF() execute_process(COMMAND uname -m OUTPUT_VARIABLE AARU_MACOS_TARGET_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
ENDIF(APPLE) endif ()
if (NOT DEFINED AARU_MACOS_TARGET_ARCH)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for macOS" FORCE)
elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Build architectures for macOS" FORCE)
else ()
message(FATAL_ERROR "Unknown system processor ${CMAKE_SYSTEM_PROCESSOR} for macOS")
endif ()
elseif (AARU_MACOS_TARGET_ARCH STREQUAL "x86_64")
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for macOS" FORCE)
elseif (AARU_MACOS_TARGET_ARCH STREQUAL "arm64")
set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Build architectures for macOS" FORCE)
else ()
message(FATAL_ERROR "Unknown Aaru target architecture ${AARU_MACOS_TARGET_ARCH} for macOS")
endif ()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
endif (APPLE)
project("Aaru.Checksums.Native" C) project("Aaru.Checksums.Native" C)
if("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" AND "${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARMV7") if ("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" AND "${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARMV7")
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
else() else ()
set(CMAKE_C_STANDARD 90) set(CMAKE_C_STANDARD 90)
endif() endif ()
if (DEFINED AARU_MACOS_TARGET_ARCH)
message("Requested target architecture: ${AARU_MACOS_TARGET_ARCH}")
endif ()
message("Detected system processor: ${CMAKE_SYSTEM_PROCESSOR}") message("Detected system processor: ${CMAKE_SYSTEM_PROCESSOR}")
message("Detected vs platform name: ${CMAKE_C_COMPILER_ARCHITECTURE_ID}") message("Detected vs platform name: ${CMAKE_C_COMPILER_ARCHITECTURE_ID}")
message("Detected compiler: ${CMAKE_C_COMPILER_ID}") message("Detected compiler: ${CMAKE_C_COMPILER_ID}")
message("Detected build type: ${CMAKE_BUILD_TYPE}") message("Detected build type: ${CMAKE_BUILD_TYPE}")
message("Detected platform: ${CMAKE_C_PLATFORM_ID}") message("Detected platform: ${CMAKE_C_PLATFORM_ID}")
if("${CMAKE_BUILD_TYPE}" MATCHES "Release") if ("${CMAKE_BUILD_TYPE}" MATCHES "Release" OR "${CMAKE_BUILD_TYPE}" MATCHES "RelWithDebInfo" OR "${CMAKE_BUILD_TYPE}" MATCHES "MinSizeRel")
if("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC") if ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
add_compile_options("/O2" "/fp:fast") add_compile_definitions(NDEBUG)
if(${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "X86" OR ${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "x64") endif ()
if ("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
add_compile_options("/O2 /Ob2 /Oi /Ot /Oy /Og /fp:fast")
if (${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "X86")
add_compile_options("/arch:SSE2") add_compile_options("/arch:SSE2")
endif() elseif (${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "ARM")
else() add_compile_options("/arch:VFPv4")
add_compile_options(-ffast-math -O3) endif ()
else ()
add_compile_options(-ffast-math -Ofast)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") if ("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") if (${AARU_MACOS_TARGET_ARCH} MATCHES "x86_64")
add_compile_options(-march=core2 -mtune=westmere -mfpmath=sse) add_compile_options(-march=ivybridge -mtune=westmere -msse4.2)
endif() elseif (${AARU_MACOS_TARGET_ARCH} MATCHES "arm64")
add_compile_options(-mcpu=apple-m1 -mtune=apple-m1)
endif ()
endif ()
add_compile_options(-msse3) if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
if (NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
add_compile_options(-march=westmere -mtune=skylake -mfpmath=sse)
add_compile_options(-msse4.2)
endif ()
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW") if (NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
add_compile_options(-flto) add_compile_options(-flto)
endif() endif ()
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") if (NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
add_compile_options(-march=armv8-a) add_compile_options(-mtune=cortex-a53)
endif() endif ()
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW") if (NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
add_compile_options(-flto) add_compile_options(-flto)
endif() endif ()
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
add_compile_options(-march=armv7) add_compile_options(-mtune=cortex-a53 -mcpu=cortex-a7)
endif() else ()
endif() add_compile_options(-mtune=cortex-a53 -march=armv7-a+neon-vfpv4)
endif() endif ()
endif() elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
if (NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
add_compile_options(-flto)
endif ()
endif ()
endif ()
endif ()
add_library("Aaru.Checksums.Native" SHARED adler32.h adler32.c crc16.h crc16.c crc16_ccitt.h crc16_ccitt.c crc32.c crc32.h crc64.c crc64.h fletcher16.h fletcher16.c fletcher16_avx2.c fletcher16_neon.c fletcher16_ssse3.c fletcher32.h fletcher32.c fletcher32_avx2.c fletcher32_neon.c fletcher32_ssse3.c library.h spamsum.c spamsum.h crc32_clmul.c crc64_clmul.c simd.c simd.h adler32_ssse3.c adler32_avx2.c adler32_neon.c crc32_arm_simd.c crc32_vmull.c crc32_simd.h arm_vmull.c arm_vmull.h crc64_vmull.c library.c) add_library("Aaru.Checksums.Native" SHARED adler32.h adler32.c crc16.h crc16.c crc16_ccitt.h crc16_ccitt.c crc32.c crc32.h crc64.c crc64.h fletcher16.h fletcher16.c fletcher16_avx2.c fletcher16_neon.c fletcher16_ssse3.c fletcher32.h fletcher32.c fletcher32_avx2.c fletcher32_neon.c fletcher32_ssse3.c library.h spamsum.c spamsum.h crc32_clmul.c crc64_clmul.c simd.c simd.h adler32_ssse3.c adler32_avx2.c adler32_neon.c crc32_arm_simd.c crc32_vmull.c crc32_simd.h arm_vmull.c arm_vmull.h crc64_vmull.c library.c)

View File

@@ -206,13 +206,17 @@ mv libAaru.Checksums.Native.dll runtimes/win-x86/native/
## Mac OS X (arm64 and x64) ## Mac OS X (arm64 and x64)
if [[ ${OS_NAME} == Darwin ]]; then if [[ ${OS_NAME} == Darwin ]]; then
rm -f CMakeCache.txt rm -f CMakeCache.txt
cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 . . cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 -DAARU_MACOS_TARGET_ARCH=x86_64 .
make make
mkdir -p runtimes/osx-arm64/native mkdir -p runtimes/osx-x64/native
mkdir -p runtimes/osx-x64/native mv libAaru.Checksums.Native.dylib runtimes/osx-x64/native
lipo libAaru.Checksums.Native.dylib -thin arm64 -output runtimes/osx-arm64/native/libAaru.Checksums.Native.dylib
lipo libAaru.Checksums.Native.dylib -thin x86_64 -output runtimes/osx-x64/native/libAaru.Checksums.Native.dylib rm -f CMakeCache.txt
cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 -DAARU_MACOS_TARGET_ARCH=arm64 .
make
mkdir -p runtimes/osx-arm64/native
mv libAaru.Checksums.Native.dylib runtimes/osx-arm64/native
fi fi
# TODO: "linux-musl-x64" # TODO: "linux-musl-x64"
@@ -220,3 +224,5 @@ fi
# TODO: "linux-musl-arm" # TODO: "linux-musl-arm"
nuget pack nuget pack
rm -f CMakeCache.txt