[PGO][Offload] Don't define GPU entrypoint on Darwin #132966
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Ethan Luis McDonough (EthanLuisMcDonough) ChangesThis PR partially reverts 83e180c and instead opts to hide the GPU entry point on Darwin platforms. Marking Full diff: https://github.com/llvm/llvm-project/pull/132966.diff 3 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index e67997314da36..4c88722730598 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1481,15 +1481,11 @@ void Darwin::addProfileRTLibs(const ArgList &Args,
// If we have a symbol export directive and we're linking in the profile
// runtime, automatically export symbols necessary to implement some of the
// runtime's functionality.
- if (hasExportSymbolDirective(Args)) {
- if (ForGCOV) {
- addExportedSymbol(CmdArgs, "___gcov_dump");
- addExportedSymbol(CmdArgs, "___gcov_reset");
- addExportedSymbol(CmdArgs, "_writeout_fn_list");
- addExportedSymbol(CmdArgs, "_reset_fn_list");
- } else {
- addExportedSymbol(CmdArgs, "___llvm_write_custom_profile");
- }
+ if (hasExportSymbolDirective(Args) && ForGCOV) {
+ addExportedSymbol(CmdArgs, "___gcov_dump");
+ addExportedSymbol(CmdArgs, "___gcov_reset");
+ addExportedSymbol(CmdArgs, "_writeout_fn_list");
+ addExportedSymbol(CmdArgs, "_reset_fn_list");
}
// Align __llvm_prf_{cnts,bits,data} sections to the maximum expected page
diff --git a/compiler-rt/lib/profile/InstrProfilingFile.c b/compiler-rt/lib/profile/InstrProfilingFile.c
index 19467429cf4c3..9f75ce5ef97d1 100644
--- a/compiler-rt/lib/profile/InstrProfilingFile.c
+++ b/compiler-rt/lib/profile/InstrProfilingFile.c
@@ -1273,13 +1273,11 @@ COMPILER_RT_VISIBILITY int __llvm_profile_set_file_object(FILE *File,
return 0;
}
-int __llvm_write_custom_profile(const char *Target,
- const __llvm_profile_data *DataBegin,
- const __llvm_profile_data *DataEnd,
- const char *CountersBegin,
- const char *CountersEnd, const char *NamesBegin,
- const char *NamesEnd,
- const uint64_t *VersionOverride) {
+COMPILER_RT_GPU_ENTRYPOINT int __llvm_write_custom_profile(
+ const char *Target, const __llvm_profile_data *DataBegin,
+ const __llvm_profile_data *DataEnd, const char *CountersBegin,
+ const char *CountersEnd, const char *NamesBegin, const char *NamesEnd,
+ const uint64_t *VersionOverride) {
int ReturnValue = 0, FilenameLength, TargetLength;
char *FilenameBuf, *TargetFilename;
const char *Filename;
diff --git a/compiler-rt/lib/profile/InstrProfilingPort.h b/compiler-rt/lib/profile/InstrProfilingPort.h
index 66d697885eaee..ed56beb6577a3 100644
--- a/compiler-rt/lib/profile/InstrProfilingPort.h
+++ b/compiler-rt/lib/profile/InstrProfilingPort.h
@@ -43,8 +43,10 @@
#if defined(__APPLE__)
#define COMPILER_RT_SEG "__DATA,"
+#define COMPILER_RT_GPU_ENTRYPOINT COMPILER_RT_VISIBILITY
#else
#define COMPILER_RT_SEG ""
+#define COMPILER_RT_GPU_ENTRYPOINT
#endif
#ifdef _MSC_VER
|
jhuber6
reviewed
Mar 25, 2025
In 83e180c, I marked |
jhuber6
reviewed
Mar 25, 2025
| const char *CountersEnd, const char *NamesBegin, | ||
| const char *NamesEnd, | ||
| const uint64_t *VersionOverride) { | ||
| COMPILER_RT_GPU_ENTRYPOINT int __llvm_write_custom_profile( |
There was a problem hiding this comment.
Would probably be more straightforward to just ifdef this whole block out on apple.
There was a problem hiding this comment.
Agreed, that's probably easier and less invasive.
jhuber6
reviewed
Mar 26, 2025
| @@ -1273,6 +1273,7 @@ COMPILER_RT_VISIBILITY int __llvm_profile_set_file_object(FILE *File, | |||
| return 0; | |||
| } | |||
|
|
|||
| #ifdef COMPILER_RT_GPU_ENTRYPOINT | |||
There was a problem hiding this comment.
Can't we just use __APPLE__?
There was a problem hiding this comment.
My reasoning was that it would give us more configuration power if we had a macro that was defined only when we want an entry point. This would give us an easy way to disable the entry point on other platforms if needed. I don't expect that to happen, so I guess we can use __APPLE__ for now.
jhuber6
approved these changes
Mar 26, 2025
EthanLuisMcDonough
changed the title
EthanLuisMcDonough
changed the title
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/14938 Here is the relevant piece of the build log for the reference |
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.
This PR partially reverts 83e180c and instead opts to hide the GPU entry point on Darwin platforms. Marking
__llvm_write_custom_profileas used was causing issues on embedded platforms.