-
Notifications
You must be signed in to change notification settings - Fork 13.9k
[Coroutines][Swift] Remove replaceSwiftErrorOps while cloning #116292
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Coroutines][Swift] Remove replaceSwiftErrorOps while cloning #116292
Conversation
I am confused by what replaceSwiftErrorOps is supposed to do and it doesn't seem to be well covered by lit-tests. At least in tree. The function appears to primarily operate on the original function, because it processes the SwiftErrorOps in Shape, collected from the unsplit function. However, it is called during cloning process of each resume function and from reading the code it seems to do something strange. After cloning the first resume funnction it may add Load and Store instructions to the original function. These would then appear in any subsequent resume functions that are cloned from the original, but not the one being processed. Instead an alloca will be created in the first resume function. After the first call to replaceSwiftErrorOps the SwiftErrorOps list is cleared so no other resume functions will get the alloca. Following this replaceSwiftErrorOps is called again after splitting but that would do nothing (right?). Removing the call within the Cloner::create() doesn't break any lit-tests. Can this be safely removed? I am looking at this because I am working on splitting. As explained in llvm#116285 I want to CloneAndPrune to create resume functions that only include the code they need and not the entire original function. However, this call causes coro-swifterror.ll to fail by: swifterror argument should come from an alloca or parameter ptr poison tail call void @maybeThrow(ptr swifterror poison) The swifterror argument is not correctly used in a few places in the IR and some how removing the replaceSwiftErrorOps call in Cloner::create() resolves the problem.
@llvm/pr-subscribers-llvm-transforms @llvm/pr-subscribers-coroutines Author: Tyler Nowicki (TylerNowicki) ChangesI am confused by what replaceSwiftErrorOps is supposed to do and it doesn't seem to be well covered by lit-tests. At least in tree. The function appears to primarily operate on the original function, because it processes the SwiftErrorOps in Shape, collected from the unsplit function. However, it is called during cloning process of each resume function and from reading the code it seems to do something strange. After cloning the first resume function it may add Load and Store instructions to the original function. These would then appear in any subsequent resume functions that are cloned from the original, but not the one being processed. Instead, an alloca will be created in the first resume function. After the first call to replaceSwiftErrorOps the SwiftErrorOps list is cleared so no other resume functions will get the alloca. Following this replaceSwiftErrorOps is called again after splitting but that would do nothing (right?). The original commit doesn't seem to shed any light on it [1]. Removing the call within the Cloner::create() doesn't break any lit-tests. Can this be safely removed? I am looking at this because I am working on splitting. As explained in #116285 I want to CloneAndPrune to create resume functions that only include the code they need and not the entire original function. However, this call causes coro-swifterror.ll to fail by: swifterror argument should come from an alloca or parameter ptr poison The swifterror argument is not correctly used in a few places in the IR and removing the call to replaceSwiftErrorOps() in Cloner::create() resolves the problem (the lit-test passes). [1] 2133fee Full diff: https://github.com/llvm/llvm-project/pull/116292.diff 1 Files Affected:
diff --git a/llvm/lib/Transforms/Coroutines/CoroSplit.cpp b/llvm/lib/Transforms/Coroutines/CoroSplit.cpp
index 25a962ddf1b0da..da2c66b1827cc4 100644
--- a/llvm/lib/Transforms/Coroutines/CoroSplit.cpp
+++ b/llvm/lib/Transforms/Coroutines/CoroSplit.cpp
@@ -190,7 +190,6 @@ class CoroCloner {
void replaceRetconOrAsyncSuspendUses();
void replaceCoroSuspends();
void replaceCoroEnds();
- void replaceSwiftErrorOps();
void salvageDebugInfo();
void handleFinalSuspend();
};
@@ -750,10 +749,6 @@ collectDbgVariableIntrinsics(Function &F) {
return {Intrinsics, DbgVariableRecords};
}
-void CoroCloner::replaceSwiftErrorOps() {
- ::replaceSwiftErrorOps(*NewF, Shape, &VMap);
-}
-
void CoroCloner::salvageDebugInfo() {
auto [Worklist, DbgVariableRecords] = collectDbgVariableIntrinsics(*NewF);
SmallDenseMap<Argument *, AllocaInst *, 4> ArgToAllocaMap;
@@ -1204,9 +1199,6 @@ void CoroCloner::create() {
// Handle suspends.
replaceCoroSuspends();
- // Handle swifterror.
- replaceSwiftErrorOps();
-
// Remove coro.end intrinsics.
replaceCoroEnds();
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we need signoff from @rjmccall to continue in this direction.
I can't tell you exactly how this code works, but I can tell you what it's trying to do. There are special rules for Anyway, the problem for coro lowering is that the default treatment of allocas breaks those rules — splitting will try to replace the alloca with an entry in the coro frame, which can lead to trying to pass that as a That said, I don't know why we'd need to do anything after splitting. The simplest approach would be, all in the presplit function:
A much better approach would be, again all in the presplit function:
Neither of these approach requires emitting more instructions after split. |
Thanks for the details! Do you know if it is possible to detect when swift is being used? I am refactoring the cloner to try to isolate the code required for each abi. #116885 I feel it would be best to isolate swift code in a similar fashion by inheriting the base cloner and implementing the changes needed for swift on top. Also, perhaps you noticed the new custom ABI object I introduced earlier [1]? I believe that could be used to pull the swift code out of the LLVM repo entirely (mostly). Instead, the swift compiler would implement the changes it needs right in its own repo. At least it is worth a look to see if that is possible. I am not working on swift but perhaps you know someone who might be interested in looking at that? [1] - https://llvm.org/docs/Coroutines.html#custom-abis-and-plugin-libraries |
I don't think you can reliably detect when Swift is being used. Clang supports the |
Okay, I understand. Considering that swifterror is a generic LLVM IR feature I think it should be discussed in the documentation [1]. I will create a documentation PR with some of the above info on swifterror. I think swifterror is related to the intrinsics coro.alloca.alloc, coro.alloca.get and coro.alloca.free but these are also not described in [1]. Can you comment on their connection? |
See the documentation PR #117183 |
I will close this in favor of #117183 |
I am confused by what replaceSwiftErrorOps is supposed to do and it doesn't seem to be well covered by lit-tests. At least in tree.
The function appears to primarily operate on the original function, because it processes the SwiftErrorOps in Shape, collected from the unsplit function. However, it is called during cloning process of each resume function and from reading the code it seems to do something strange.
After cloning the first resume function it may add Load and Store instructions to the original function. These would then appear in any subsequent resume functions that are cloned from the original, but not the one being processed. Instead, an alloca will be created in the first resume function. After the first call to replaceSwiftErrorOps the SwiftErrorOps list is cleared so no other resume functions will get the alloca. Following this replaceSwiftErrorOps is called again after splitting but that would do nothing (right?). The original commit doesn't seem to shed any light on it [1].
Removing the call within the Cloner::create() doesn't break any lit-tests. Can this be safely removed?
I am looking at this because I am working on splitting. As explained in #116285 I want to CloneAndPrune to create resume functions that only include the code they need and not the entire original function. However, this call causes coro-swifterror.ll to fail by:
swifterror argument should come from an alloca or parameter ptr poison
tail call void @maybeThrow(ptr swifterror poison)
The swifterror argument is not correctly used in a few places in the IR and removing the call to replaceSwiftErrorOps() in Cloner::create() resolves the problem (the lit-test passes).
[1] 2133fee