[Offload] Fix PowerPC builds that pass -mcpu #138327
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
shiltian
reviewed
May 6, 2025
offload/DeviceRTL/CMakeLists.txt
Outdated
| 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.
shiltian
approved these changes
May 6, 2025
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
Summary: Another hacky fix done until llvm#136729 lands. This time for `-mcpu`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
Another hacky fix done until
#136729 lands. This time for
-mcpu.