Skip to content

Commit 4635205

Browse files
committed
[ASan][ROCm][Staging] Disable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR.
Add LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF for ASan cmake configuration of release/debug build/install of openmp && offload components.
1 parent 4922ca5 commit 4635205

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

bin/build_offload.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
161161
fi
162162

163163
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
164-
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=/asan"
164+
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=/asan"
165165
mkdir -p $BUILD_DIR/build/offload/asan
166166
cd $BUILD_DIR/build/offload/asan
167167
echo " ------Running offload-asan cmake ---- "
@@ -195,7 +195,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
195195

196196
# Only use CMAKE_CXX/C_FLAGS on non-asan builds as these will overwrite the asan flags
197197
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
198-
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=-debug/asan"
198+
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=-debug/asan"
199199
fi
200200

201201
MYCMAKEOPTS="$MYCMAKEOPTS -DOFFLOAD_LIBDIR_SUFFIX=-debug"

bin/build_openmp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
161161
fi
162162

163163
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
164-
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=/asan"
164+
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=/asan"
165165
mkdir -p $BUILD_DIR/build/openmp/asan
166166
cd $BUILD_DIR/build/openmp/asan
167167
echo " ------Running openmp-asan cmake ---- "
@@ -195,7 +195,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
195195

196196
# Only use CMAKE_CXX/C_FLAGS on non-asan builds as these will overwrite the asan flags
197197
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
198-
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=-debug/asan"
198+
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=-debug/asan"
199199
fi
200200

201201
MYCMAKEOPTS="$MYCMAKEOPTS -DLLVM_LIBDIR_SUFFIX=-debug"

0 commit comments

Comments
 (0)