diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-16 19:01:39 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-16 19:01:39 +0000 |
| commit | 390c85e540139593ef30a2bf2f77df8d4ad92c5c (patch) | |
| tree | a9c9a2aaacdb4794eecf1cbb8a922aa72e643ddb /default_build_settings.cmake | |
| parent | 64269d848c2b187754400f052a7d8fb633b40053 (diff) | |
- Since we have a legacy build that builds vespa image for older cpus we can now require haswell.
- We still need to keep ivybridge for gcc 13 due to known bug.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 14766fc612c..2da6af61211 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -130,17 +130,12 @@ 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") - # Require haswell cpu or newer when compiling with clang on linux. - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0) + # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=ivybridge") else() - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) - # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 - # Also xxhash-0.8.2 heavy inlining being too hard on GCC 12 and up - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=ivybridge") - else() - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-msse3 -mcx16 -mtune=intel") - endif() + # Default to haswell cpu or newer + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") endif() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=armv8.2-a+fp16+rcpc+dotprod+crypto -mtune=neoverse-n1") |