Skip to content

Commit 0102b38

Browse files
committed
[build] - Support for removing OPENMP_STANDALONE_BUILD logic upstream
Support for openmp and offload debug/perf/asan libraries has moved to build_llvm_runtimes_standalone.sh. This script invokes the cmake in llvm-project/runtimes instead of the openmp or offload directories. Upstream will eventually remove OPENMP_STANDALONE_BUILD. - LLVM_BINARY_DIR introduced to notify the runtimes standalone build where clang is. - USE_LIBOMPTARGET_LIBRARY_DIR=On introduced to keep offload build files out of the install directory.
1 parent 9b7dd73 commit 0102b38

File tree

2 files changed

+536
-5
lines changed

2 files changed

+536
-5
lines changed

bin/build_aomp.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ echo
9898
components="$AOMP_COMPONENT_LIST"
9999

100100
if [ "$AOMP_STANDALONE_BUILD" == 1 ] ; then
101-
components="$components rocprofiler-register rocr openmp offload extras comgr rocminfo rocm_smi_lib amdsmi"
101+
components="$components rocprofiler-register rocr llvm_runtimes_standalone extras comgr rocminfo rocm_smi_lib amdsmi"
102102
_hostarch=$(uname -m)
103103
# The rocclr architecture is very x86 centric so it will not build on ppc64. Without
104104
# rocclr, we have no HIP or OpenCL for ppc64 :-( However, rocr works for ppc64 so AOMP works.
@@ -132,10 +132,7 @@ else
132132
# libdevice, project, comgr, rocminfo, hipamd, rocdbgapi, rocgdb,
133133
# roctracer, rocprofiler, rocm_smi_lib, and amdsmi should be found
134134
# in ROCM in /opt/rocm. The ROCM build only needs these components:
135-
components="extras openmp"
136-
if [ -f "$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/offload/CMakeLists.txt" ]; then
137-
components="$components offload"
138-
fi
135+
components="llvm_runtimes_standalone"
139136
if [ "$AOMP_SKIP_FLANG" == 0 ] ; then
140137
if [ "$SANITIZER" == 1 ] && [ -f "$AOMP/bin/flang-classic" ] ; then
141138
components="$components pgmath flang flang_runtime"

0 commit comments

Comments
 (0)