From 31edfa075859011d78d2ccda223c3384b3d8a5b3 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Sep 2023 20:20:43 +0100 Subject: [PATCH] Enable optimizations. --- CMakeLists.txt | 111 +++++++++++++++++++++++++++++++++---------------- build.sh | 20 +++++---- 2 files changed, 89 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af7b257..5ed3def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,60 +16,101 @@ cmake_minimum_required(VERSION 3.15) # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, see . -IF(APPLE) - IF("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "") - SET(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE) - ENDIF() -ENDIF(APPLE) +if (APPLE) + # Too early cmake has not yet set it + if ((NOT DEFINED CMAKE_SYSTEM_PROCESSOR) AND (NOT DEFINED AARU_MACOS_TARGET_ARCH)) + execute_process(COMMAND uname -m OUTPUT_VARIABLE AARU_MACOS_TARGET_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + 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) -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) -else() +else () 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 vs platform name: ${CMAKE_C_COMPILER_ARCHITECTURE_ID}") message("Detected compiler: ${CMAKE_C_COMPILER_ID}") message("Detected build type: ${CMAKE_BUILD_TYPE}") message("Detected platform: ${CMAKE_C_PLATFORM_ID}") -if("${CMAKE_BUILD_TYPE}" MATCHES "Release") - if("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC") - add_compile_options("/O2" "/fp:fast") - if(${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "X86" OR ${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "x64") +if ("${CMAKE_BUILD_TYPE}" MATCHES "Release" OR "${CMAKE_BUILD_TYPE}" MATCHES "RelWithDebInfo" OR "${CMAKE_BUILD_TYPE}" MATCHES "MinSizeRel") + if ("${CMAKE_BUILD_TYPE}" MATCHES "Release") + add_compile_definitions(NDEBUG) + 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") - endif() - else() - add_compile_options(-ffast-math -O3) + elseif (${CMAKE_C_COMPILER_ARCHITECTURE_ID} MATCHES "ARM") + add_compile_options("/arch:VFPv4") + 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(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") - add_compile_options(-march=core2 -mtune=westmere -mfpmath=sse) - endif() + if ("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") + if (${AARU_MACOS_TARGET_ARCH} MATCHES "x86_64") + add_compile_options(-march=ivybridge -mtune=westmere -msse4.2) + 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) - endif() - elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") - if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") - add_compile_options(-march=armv8-a) - endif() + endif () + elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") + if (NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") + add_compile_options(-mtune=cortex-a53) + endif () - if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW") + if (NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW") add_compile_options(-flto) - endif() - elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") - if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") - add_compile_options(-march=armv7) - endif() - endif() - endif() -endif() + endif () + elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang") + if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") + add_compile_options(-mtune=cortex-a53 -mcpu=cortex-a7) + else () + add_compile_options(-mtune=cortex-a53 -march=armv7-a+neon-vfpv4) + 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) diff --git a/build.sh b/build.sh index 4d0c234..663bafc 100644 --- a/build.sh +++ b/build.sh @@ -206,13 +206,17 @@ mv libAaru.Checksums.Native.dll runtimes/win-x86/native/ ## Mac OS X (arm64 and x64) if [[ ${OS_NAME} == Darwin ]]; then - rm -f CMakeCache.txt - cmake -DCMAKE_BUILD_TYPE=Release -DAARU_BUILD_PACKAGE=1 . . - make - mkdir -p runtimes/osx-arm64/native - mkdir -p 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=x86_64 . + make + mkdir -p runtimes/osx-x64/native + mv libAaru.Checksums.Native.dylib runtimes/osx-x64/native + + 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 # TODO: "linux-musl-x64" @@ -220,3 +224,5 @@ fi # TODO: "linux-musl-arm" nuget pack + +rm -f CMakeCache.txt