diff --git a/cmake/mode.Debug.cmake b/cmake/mode.Debug.cmake index b677c69e28..b68cfd39c8 100644 --- a/cmake/mode.Debug.cmake +++ b/cmake/mode.Debug.cmake @@ -1,9 +1,4 @@ -if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") - # -fasan -Og breaks some coroutines on aarch64, use -O0 instead - set(OptimizationLevel "0") -else() - set(OptimizationLevel "g") -endif() +set(OptimizationLevel "g") update_cxx_flags(CMAKE_CXX_FLAGS_DEBUG WITH_DEBUG_INFO diff --git a/cmake/mode.RelWithDebInfo.cmake b/cmake/mode.RelWithDebInfo.cmake index 22041caa35..a16c7e091d 100644 --- a/cmake/mode.RelWithDebInfo.cmake +++ b/cmake/mode.RelWithDebInfo.cmake @@ -16,11 +16,7 @@ set(scylla_build_mode_RelWithDebInfo "release") add_compile_definitions( $<$:SCYLLA_BUILD_MODE=${scylla_build_mode_RelWithDebInfo}>) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64") - set(clang_inline_threshold 300) -else() - set(clang_inline_threshold 2500) -endif() +set(clang_inline_threshold 2500) add_compile_options( "$<$,$>:--param;inline-unit-growth=300>" "$<$,$>:-mllvm;-inline-threshold=${clang_inline_threshold}>") diff --git a/configure.py b/configure.py index 9a5175ff34..d520389169 100755 --- a/configure.py +++ b/configure.py @@ -371,8 +371,7 @@ modes = { 'cxxflags': '-DDEBUG -DSANITIZE -DDEBUG_LSA_SANITIZER -DSCYLLA_ENABLE_ERROR_INJECTION', 'cxx_ld_flags': '', 'stack-usage-threshold': 1024*40, - # -fasan -Og breaks some coroutines on aarch64, use -O0 instead - 'optimization-level': ('0' if platform.machine() == 'aarch64' else 'g'), + 'optimization-level': 'g', 'per_src_extra_cxxflags': {}, 'cmake_build_type': 'Debug', 'can_have_debug_info': True, @@ -1543,10 +1542,6 @@ def get_warning_options(cxx): def get_clang_inline_threshold(): if args.clang_inline_threshold != -1: return args.clang_inline_threshold - elif platform.machine() == 'aarch64': - # we see miscompiles with 1200 and above with format("{}", uuid) - # also coroutine miscompiles with 600 - return 300 else: return 2500