diff options
| -rw-r--r-- | default_build_settings.cmake | 9 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 580124993e6..41ab347f8a0 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -131,8 +131,13 @@ function(vespa_use_default_build_settings) 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 "GNU") - # Default to haswell cpu or newer - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake-avx512") + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.3) + # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") + else() + # Default to haswell cpu or newer + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake-avx512") + endif() endif() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=armv8.2-a+fp16+dotprod+crypto -mtune=neoverse-n1") diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 12130005bdb..cf9ab5c3973 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -314,7 +314,7 @@ public class Flags { NODE_TYPE, HOSTNAME); public static final UnboundBooleanFlag ENABLE_THE_ONE_THAT_SHOULD_NOT_BE_NAMED = defineFeatureFlag( - "enable-the-one-that-should-not-be-named", false, List.of("hmusum"), "2023-05-08", "2024-01-15", + "enable-the-one-that-should-not-be-named", false, List.of("hmusum"), "2023-05-08", "2024-02-01", "Whether to enable the one program that should not be named", "Takes effect at next host-admin tick"); @@ -386,7 +386,7 @@ public class Flags { public static final UnboundBooleanFlag DYNAMIC_HEAP_SIZE = defineFeatureFlag( "dynamic-heap-size", false, - List.of("bjorncs"), "2023-09-21", "2024-01-15", + List.of("bjorncs"), "2023-09-21", "2024-02-15", "Whether to calculate JVM heap size based on predicted Onnx model memory requirements", "Takes effect at redeployment", INSTANCE_ID); |