Skip to content

[Flang-RT] No flang hostdevice runtime flag #1595

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

Closed
DominikAdamski wants to merge 1 commit into from
Closed

[Flang-RT] No flang hostdevice runtime flag #1595

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
1 change: 1 addition & 0 deletions bin/build_llvm-flang-rt-host-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ ${AOMP_CMAKE} "${AOMP_SET_NINJA_GEN[@]}" $CM_BUILD_TYPE \
-DCMAKE_CXX_COMPILER="$CMAKE_CXX_COMPILER" \
-DFLANG_RT_DEVICE_ARCHITECTURES="$ARCH_LIST" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DFLANG_RT_EMBED_GPU_LLVM_IR=OFF \
"$AOMP_REPOS/$AOMP_NAME_LLVM_PROJECT/runtimes"

$AOMP_NINJA_BIN --version
Expand Down
9 changes: 7 additions & 2 deletions bin/build_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE"
if [ -f "$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/device/CMakeLists.txt" ]; then
MYCMAKEOPTS=("${MYCMAKEOPTS[@]}"
-DLLVM_RUNTIME_TARGETS='default;amdgcn-amd-amdhsa'
-DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES='openmp'
-DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES='compiler-rt;libc;libcxx;libcxxabi;flang-rt;openmp'
-DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON)
fi

Expand All @@ -169,7 +169,12 @@ MYCMAKEOPTS=("${MYCMAKEOPTS[@]}"
-DCLANG_ENABLE_AMDCLANG=ON
-DLLVM_ENABLE_RUNTIMES="$LLVM_RUNTIMES"
-DLIBCXX_ENABLE_STATIC=ON
-DLIBCXXABI_ENABLE_STATIC=ON)
-DLIBCXXABI_ENABLE_STATIC=ON
-DLLVM_RUNTIME_TARGETS="default;amdgcn-amd-amdhsa"
-DRUNTIMES_amdgcn-amd-amdhsa_FLANG_RT_LIBC_PROVIDER=llvm
-DRUNTIMES_amdgcn-amd-amdhsa_FLANG_RT_LIBCXX_PROVIDER=llvm
-DRUNTIMES_amdgcn-amd-amdhsa_CACHE_FILES="$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/libcxx/cmake/caches/AMDGPU.cmake"
)

# Enable Compiler-rt Sanitizer Build
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/run_genasis_flang_new.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fi
if [[ "$IMPLICIT_GPU_FLANG_RT" -eq "1" ]]; then
FORTRAN_OFFLOAD_LIB=
else
FORTRAN_OFFLOAD_LIB=-lflang_rt.hostdevice
FORTRAN_OFFLOAD_LIB="-fno-gpu-flang-rt -lflang_rt.hostdevice"
fi

export LD_LIBRARY_PATH=$AOMP/lib:$AOMPHIP/lib:$OPENMPI_DIR/lib:$LD_LIBRARY_PATH
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ endif
ifeq ($(IMPLICIT_GPU_FLANG_RT),1)
FLANG_GPU_LINK_FLAGS =
else
FLANG_GPU_LINK_FLAGS = -lflang_rt.hostdevice
FLANG_GPU_LINK_FLAGS = -fno-gpu-flang-rt -lflang_rt.hostdevice
endif

ifeq ($(NOOPT),1)
Expand Down