Skip to content

Commit

Permalink
Coroutines: Handle non-zero stack address space (#67092)
Browse files Browse the repository at this point in the history
The stack might be in a different address space, in which case, bitcast
does not work. We should use addrspacecast. As we do not support typed
pointer anymore, so we do not need a bitcast here anymore.
  • Loading branch information
ruiling committed Sep 22, 2023
1 parent 80e1732 commit ed9b354
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 2 deletions.
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/Coroutines/CoroFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1766,8 +1766,8 @@ static void insertSpills(const FrameDataInfo &FrameData, coro::Shape &Shape) {
// Note: If we change the strategy dealing with alignment, we need to refine
// this casting.
if (GEP->getType() != Orig->getType())
return Builder.CreateBitCast(GEP, Orig->getType(),
Orig->getName() + Twine(".cast"));
return Builder.CreateAddrSpaceCast(GEP, Orig->getType(),
Orig->getName() + Twine(".cast"));
}
return GEP;
};
Expand Down
57 changes: 57 additions & 0 deletions llvm/test/Transforms/Coroutines/coro-alloca-with-addrspace.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
; RUN: opt < %s -passes='cgscc(coro-split)' -S | FileCheck %s

define ptr @f(i1 %n) presplitcoroutine {
entry:
%x = alloca i64, addrspace(5)
%y = alloca i64, addrspace(5)
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null)
%size = call i32 @llvm.coro.size.i32()
%alloc = call ptr @malloc(i32 %size)
%hdl = call ptr @llvm.coro.begin(token %id, ptr %alloc)
br i1 %n, label %flag_true, label %flag_false

flag_true:
br label %merge

flag_false:
br label %merge

merge:
%alias_phi = phi ptr addrspace(5) [ %x, %flag_true ], [ %y, %flag_false ]
%sp1 = call i8 @llvm.coro.suspend(token none, i1 false)
switch i8 %sp1, label %suspend [i8 0, label %resume
i8 1, label %cleanup]
resume:
call void @print(ptr addrspace(5) %alias_phi)
br label %cleanup

cleanup:
%mem = call ptr @llvm.coro.free(token %id, ptr %hdl)
call void @free(ptr %mem)
br label %suspend

suspend:
call i1 @llvm.coro.end(ptr %hdl, i1 0)
ret ptr %hdl
}

; CHECK-LABEL: @f(
; CHECK: [[X_ADDR:%[0-9]+]] = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 2
; CHECK: %x.reload.addr = addrspacecast ptr [[X_ADDR]] to ptr addrspace(5)
; CHECK: [[Y_ADDR:%[0-9]+]] = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 3
; CHECK: %y.reload.addr = addrspacecast ptr [[Y_ADDR]] to ptr addrspace(5)

declare ptr @llvm.coro.free(token, ptr)
declare i32 @llvm.coro.size.i32()
declare i8 @llvm.coro.suspend(token, i1)
declare void @llvm.coro.resume(ptr)
declare void @llvm.coro.destroy(ptr)

declare token @llvm.coro.id(i32, ptr, ptr, ptr)
declare i1 @llvm.coro.alloc(token)
declare ptr @llvm.coro.begin(token, ptr)
declare i1 @llvm.coro.end(ptr, i1)

declare void @print(ptr)
declare noalias ptr @malloc(i32)
declare void @free(ptr)

0 comments on commit ed9b354

Please sign in to comment.