[Flang][Runtime] Improve runtime implementation of the RENAME intrinsic #99445
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
The RENAME implementation in the Fortran runtime had a few glitches that had to be addressed: - Wrong usage of RTDECL (fixed) - Issue fatal error when trying to use RENAME on a target device (fixed)
llvmbot
added
flang:runtime
flang
|
@llvm/pr-subscribers-flang-runtime Author: Michael Klemm (mjklemm) ChangesThe RENAME implementation in the Fortran runtime had a few glitches that had to be addressed:
Full diff: https://github.com/llvm/llvm-project/pull/99445.diff 1 Files Affected:
diff --git a/flang/runtime/misc-intrinsic.cpp b/flang/runtime/misc-intrinsic.cpp
index 2f7fcd2e2341f..36264eca99d70 100644
--- a/flang/runtime/misc-intrinsic.cpp
+++ b/flang/runtime/misc-intrinsic.cpp
@@ -56,10 +56,10 @@ static RT_API_ATTRS void TransferImpl(Descriptor &result,
extern "C" {
RT_EXT_API_GROUP_BEGIN
-void RTDECL(Rename)(const Descriptor &path1, const Descriptor &path2,
+void RTDEF(Rename)(const Descriptor &path1, const Descriptor &path2,
const Descriptor *status, const char *sourceFile, int line) {
Terminator terminator{sourceFile, line};
-
+#if !defined(RT_DEVICE_COMPILATION)
char *pathSrc{EnsureNullTerminated(
path1.OffsetElement(), path1.ElementBytes(), terminator)};
char *pathDst{EnsureNullTerminated(
@@ -84,6 +84,9 @@ void RTDECL(Rename)(const Descriptor &path1, const Descriptor &path2,
if (pathDst != path2.OffsetElement()) {
FreeMemory(pathDst);
}
+#else // !defined(RT_DEVICE_COMPILATION)
+ terminator.Crash("RENAME intrinsic is only supported on host devices");
+#endif // !defined(RT_DEVICE_COMPILATION)
}
void RTDEF(Transfer)(Descriptor &result, const Descriptor &source,
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
tblah
approved these changes
Jul 18, 2024
|
@vzakhari Pointed this out for the original PR for RENAME. I think that it is a valid point for functionality that is (not yet) available for device code. |
vzakhari
approved these changes
Jul 18, 2024
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
…ic (#99445) The RENAME implementation in the Fortran runtime had a few glitches that had to be addressed: - Wrong usage of RTDECL (fixed) - Issue fatal error when trying to use RENAME on a target device (fixed)
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.
The RENAME implementation in the Fortran runtime had a few glitches that had to be addressed: