From d0a3d6c578baf22d50a82c44a89a2c2c5358ab8e Mon Sep 17 00:00:00 2001 From: ouguoyu Date: Tue, 26 Mar 2024 14:59:43 +0800 Subject: [PATCH] [misc] move asan options to hpcc --- CMakeLists.txt | 5 +++-- cmake/arm.cmake | 14 -------------- cmake/x86.cmake | 14 -------------- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6af44a21c..788c80a0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,6 @@ option(PPLNN_ENABLE_PYTHON_API "enable python api support" OFF) option(PPLNN_HOLD_DEPS "don't update dependencies" OFF) -option(PPLNN_ENABLE_SANITIZE_OPTIONS "use -fsanitize options to check memory errors. Note that this option is only available for GCC and Clang." OFF) - if(MSVC) option(PPLNN_USE_MSVC_STATIC_RUNTIME "" ON) endif() @@ -44,6 +42,9 @@ endif() if(HPCC_USE_RISCV) message(FATAL_ERROR "`HPCC_USE_RISCV` is deprecated. use `PPLNN_USE_RISCV64` instead.") endif() +if(PPLNN_ENABLE_SANITIZE_OPTIONS) + message(FATAL_ERROR "`PPLNN_ENABLE_SANITIZE_OPTIONS` is deprecated. use `HPCC_ENABLE_SANITIZE_OPTIONS` instead.") +endif() # --------------------------------------------------------------------------- # diff --git a/cmake/arm.cmake b/cmake/arm.cmake index caaf0480e..01044a43a 100644 --- a/cmake/arm.cmake +++ b/cmake/arm.cmake @@ -86,20 +86,6 @@ if (PPLNN_USE_NUMA) target_compile_definitions(pplnn_arm_static PUBLIC PPLNN_USE_NUMA) endif() -if(PPLNN_ENABLE_SANITIZE_OPTIONS) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(__ASAN_FLAGS__ "-fsanitize=undefined -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__ASAN_FLAGS__}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__ASAN_FLAGS__}") - unset(__ASAN_FLAGS__) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - add_link_options("-static-libasan") - endif() - else() - message(FATAL_ERROR "UNSUPPORTED: `PPLNN_USE_SANITIZE` is ON when using compiler `${CMAKE_CXX_COMPILER_ID}`.") - endif() -endif() - target_link_libraries(pplnn_static INTERFACE pplnn_arm_static) if(PPLNN_INSTALL) diff --git a/cmake/x86.cmake b/cmake/x86.cmake index ba209b059..845151d82 100644 --- a/cmake/x86.cmake +++ b/cmake/x86.cmake @@ -21,20 +21,6 @@ target_link_libraries(pplnn_x86_static PUBLIC pplnn_basic_static pplkernelx86_st target_compile_definitions(pplnn_x86_static PUBLIC PPLNN_USE_X86) -if(PPLNN_ENABLE_SANITIZE_OPTIONS) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(__ASAN_FLAGS__ "-fsanitize=undefined -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${__ASAN_FLAGS__}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${__ASAN_FLAGS__}") - unset(__ASAN_FLAGS__) - if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - add_link_options("-static-libasan") - endif() - else() - message(FATAL_ERROR "UNSUPPORTED: `PPLNN_USE_SANITIZE` is ON when using compiler `${CMAKE_CXX_COMPILER_ID}`.") - endif() -endif() - target_link_libraries(pplnn_static INTERFACE pplnn_x86_static) if(PPLNN_INSTALL)