Skip to content

Commit a0d8df4

Browse files
authored
set faiss related *san options (#626)
* set faiss related *san options * set library dir of the respective compiler * dequote * de-duplicate /
1 parent 112a360 commit a0d8df4

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

helper.linux.fish

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,28 @@ function compiler
8383
end
8484
end
8585

86+
function compiler_libraries
87+
set -l cversion $argv[1]
88+
89+
if test "$cversion" = ""
90+
set -e COMPILER_VERSION
91+
return 0
92+
end
93+
94+
switch $cversion
95+
case 13.2.0
96+
set -xg COMPILER_LIB_DIR /usr/lib/gcc-13/lib
97+
case clang16.0.6
98+
set -xg COMPILER_LIB_DIR /usr/lib/llvm-16/lib
99+
100+
case clang19.1.7
101+
set -xg COMPILER_LIB_DIR /usr/lib/llvm-19/lib
102+
103+
case '*'
104+
echo "unknown compiler version $cversion"
105+
end
106+
end
107+
86108
function opensslVersion
87109
set -l oversion $argv[1]
88110

scripts/lib/buildSanFlags.fish

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ function buildSanFlags --argument SRCDIR
77
# Enable full SAN mode
88
# This also has to be in runRTAtest.fish
99
if not test -z "$SAN"; and test "$SAN" = "On"
10+
compiler_libraries "$COMPILER_VERSION"
1011
echo "Use SAN mode: $SAN_MODE"
1112
set common_options "log_exe_name=true:external_symbolizer_path=$INNERWORKDIR/ArangoDB/utils/llvm-symbolizer-client.py"
12-
13+
set -xg ARCHER_OPTIONS verbose=1
14+
set -xg OMP_TOOL_LIBRARIES "$COMPILER_LIB_DIR/libarcher.so"
1315
switch "$SAN_MODE"
1416
case "AULSan"
1517
# address sanitizer
@@ -43,7 +45,7 @@ function buildSanFlags --argument SRCDIR
4345

4446
# suppressions
4547
if test -f "$SRCDIR/tsan_arangodb_suppressions.txt"
46-
set -xg TSAN_OPTIONS "$TSAN_OPTIONS:suppressions=$INNERWORKDIR/ArangoDB/tsan_arangodb_suppressions.txt:print_suppressions=0"
48+
set -xg TSAN_OPTIONS "$TSAN_OPTIONS:suppressions=$INNERWORKDIR/ArangoDB/tsan_arangodb_suppressions.txt:print_suppressions=0:ignore_noninstrumented_modules=1"
4749
end
4850

4951
echo "TSAN: $TSAN_OPTIONS"

0 commit comments

Comments
 (0)