diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-24 10:20:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 10:20:25 +0100 |
| commit | 03c33bce00052d8f07ab6278705e03ffe6669853 (patch) | |
| tree | d1e34e73ce8cd62196a0f308493f4b04a7d1c15e | |
| parent | c0c2437269f95a77cc2f5e25c5c8e077f632f1fa (diff) | |
| parent | 13f0016aa5542644b96a0a15a045121373cb62fa (diff) | |
Merge pull request #25693 from vespa-engine/balder/require-haswell-as-default
Require haswell as minimum instruction set.
| -rw-r--r-- | default_build_settings.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index d46b9a71f08..a13e4501c3a 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -130,10 +130,8 @@ function(vespa_use_default_build_settings) message("-- CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(APPLE AND (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))) - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell") else() - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel") + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell") endif() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=armv8.2-a+fp16+rcpc+dotprod+crypto -mtune=neoverse-n1") |