Skip to content

[fix](build) Strip sanitizer and platform-specific flags for OpenBLAS/FAISS #64171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heguanhui wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −2
Open

[fix](build) Strip sanitizer and platform-specific flags for OpenBLAS/FAISS #64171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion be/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,10 @@ set(CXX_FLAGS_ASAN_UT "-O0 -fsanitize=address -DADDRESS_SANITIZER")

# Set the flags to the undefined behavior sanitizer, also known as "ubsan"
# Turn on sanitizer and debug symbols to get stack traces:
set(CXX_FLAGS_UBSAN "-O0 -fno-wrapv -mcmodel=medium -fsanitize=undefined -DUNDEFINED_BEHAVIOR_SANITIZER")
set(CXX_FLAGS_UBSAN "-O0 -fno-wrapv -fsanitize=undefined -DUNDEFINED_BEHAVIOR_SANITIZER")
if (ARCH_AMD64)
set(CXX_FLAGS_UBSAN "${CXX_FLAGS_UBSAN} -mcmodel=medium")
endif()

# Set the flags to the thread sanitizer, also known as "tsan"
# Turn on sanitizer and debug symbols to get stack traces:
Expand Down
2 changes: 1 addition & 1 deletion be/src/common/phdr_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ extern "C"
*/

extern "C" {
#ifdef ADDRESS_SANITIZER
#if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
void __lsan_ignore_object(const void*);
#else
void __lsan_ignore_object(const void*) {} // NOLINT
Expand Down
13 changes: 13 additions & 0 deletions be/src/storage/index/ann/cmake-protect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
# under the License.

# Make sure compile check in doris will not break compilation of faiss and openblas
# Strip sanitizer flags to prevent build-time tools (e.g., openblas getarch) from
# triggering LeakSanitizer/AddressSanitizer errors during CMake configure phase
string(REGEX REPLACE "-fsanitize=[a-z,=_./-]+" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "-fsanitize=[a-z,=_./-]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "-fno-sanitize=[a-z,=_./-]+" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "-fno-sanitize=[a-z,=_./-]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "-fsanitize-ignorelist=[a-z,=_./-]+" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "-fsanitize-ignorelist=[a-z,=_./-]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "-D[A-Z_]+SANITIZER" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "-D[A-Z_]+SANITIZER" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
# Strip -mcmodel= which is x86_64-specific and unsupported on aarch64
string(REGEX REPLACE "-mcmodel=[a-z]+" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "-mcmodel=[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")

Expand Down
Loading