Skip to content

Commit 4609d45

Browse files
committed
[build] - only build openmp via standalone runtimes
First we will remove OPENMP_STANDALONE_BUILD from openmp upstream and then move on to offload removal. Once that happens we can add offload to the build_llvm_runtimes_standalone.sh list.
1 parent f47fa45 commit 4609d45

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

bin/build_aomp.sh

Lines changed: 2 additions & 2 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 llvm_runtimes_standalone extras comgr rocminfo rocm_smi_lib amdsmi"
101+
components="$components rocprofiler-register rocr llvm_runtimes_standalone offload 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,7 +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="llvm_runtimes_standalone"
135+
components="llvm_runtimes_standalone offload"
136136
if [ "$AOMP_SKIP_FLANG" == 0 ] ; then
137137
if [ "$SANITIZER" == 1 ] && [ -f "$AOMP/bin/flang-classic" ] ; then
138138
components="$components pgmath flang flang_runtime"

bin/build_llvm_runtimes_standalone.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ COMMON_CMAKE_OPTS=("${AOMP_SET_NINJA_GEN[@]}" -DOPENMP_ENABLE_LIBOMPTARGET=1
7979
-DLLVM_DIR="$LLVM_DIR"
8080
-DLIBOMPTEST_BUILD_STANDALONE=1 -DLIBOMPTARGET_BUILD_DEVICE_FORTRT=On)
8181

82-
LLVM_RUNTIMES="openmp;offload"
82+
LLVM_RUNTIMES="openmp"
8383
if [ "$OPENMP_BUILD_DEVICERTL" -eq 1 ]; then
8484
if [ -f "$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/device/CMakeLists.txt" ]; then
8585
LLVM_RUNTIMES=openmp

0 commit comments

Comments
 (0)