[Offload] Fix PowerPC builds that pass -mcpu #138327
Conversation
Summary: Another hacky fix done until llvm#136729 lands. This time for `-mcpu`.
|
@llvm/pr-subscribers-offload Author: Joseph Huber (jhuber6) ChangesSummary: Full diff: https://github.com/llvm/llvm-project/pull/138327.diff 1 Files Affected:
diff --git a/offload/DeviceRTL/CMakeLists.txt b/offload/DeviceRTL/CMakeLists.txt
index f8a6d8563916a..09710e5e3da43 100644
--- a/offload/DeviceRTL/CMakeLists.txt
+++ b/offload/DeviceRTL/CMakeLists.txt
@@ -132,9 +132,12 @@ function(compileDeviceRTLLibrary target_name target_triple)
BUILD_RPATH ""
INSTALL_RPATH ""
RUNTIME_OUTPUT_NAME libomptarget-${target_name}.bc)
- target_compile_options(libomptarget-${target_name} PRIVATE "--target=${target_triple}" "-fuse-ld=lld" "-march=")
+ target_compile_options(libomptarget-${target_name} PRIVATE
+ "--target=${target_triple}" "-fuse-ld=lld" "-march=" "-mcpu="
+ "-Wno-unused-command-line-argument")
target_link_options(libomptarget-${target_name} PRIVATE "--target=${target_triple}"
- "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=")
+ "-mcpu=power8" "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm"
+ "-fuse-ld=lld" "-march=" "-mcpu=")
install(TARGETS libomptarget-${target_name}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}")
@@ -152,7 +155,8 @@ function(compileDeviceRTLLibrary target_name target_triple)
)
target_link_libraries(omptarget.${target_name} PRIVATE omptarget.${target_name}.all_objs)
target_link_options(omptarget.${target_name} PRIVATE "--target=${target_triple}"
- "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=")
+ "-Wno-unused-command-line-argument""-r" "-nostdlib" "-flto"
+ "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=" "-mcpu=")
install(TARGETS omptarget.${target_name}
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}")
|
|
@tstellar ping |
offload/DeviceRTL/CMakeLists.txt
Outdated
| "-Wno-unused-command-line-argument") | ||
| target_link_options(libomptarget-${target_name} PRIVATE "--target=${target_triple}" | ||
| "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-fuse-ld=lld" "-march=") | ||
| "-mcpu=power8" "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" |
There was a problem hiding this comment.
Why can we hard code power8 here?
There was a problem hiding this comment.
Lol, oops, forgot to delete that to check that it fixed the error Tom reported.
Summary: Another hacky fix done until llvm#136729 lands. This time for `-mcpu`.
|
Another variant of this issue: |
|
Would it make sense to strip all default compilation flags and explicitly specify the desired ones only? |
The proper solution is #136729 but this was delayed endlessly by https://discourse.llvm.org/t/rfc-llvm-policy-for-top-level-directories-and-language-runtimes/86143. Given the PR at #144372 I'm going to assume that the community is more in favor of my approach. |
@jhuber6, I'm going to merge #144372 as soon as CI passes. libcxx tests hang for unknown reason, but unlikely due to changes in the PR. |
5 participants
Summary:
Another hacky fix done until
#136729 lands. This time for
-mcpu.