admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asyncio: merge promise and coro frame allocation

Browse Source
This commit is contained in:
Li Jie
2024-08-06 14:40:38 +08:00
parent 578bc165c4
commit 7b2747ce0c
4 changed files with 91 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
cl/_testdata/async/out.ll
View File

@@ -7,22 +7,23 @@ source_filename = "async"
define ptr @async.GenInts() presplitcoroutine { define ptr @async.GenInts() presplitcoroutine {
entry: entry:
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 16)
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null) %id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null)
%frame.size = call i64 @llvm.coro.size.i64()
%alloc.size = add i64 16, %frame.size
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %alloc.size)
%need.dyn.alloc = call i1 @llvm.coro.alloc(token %id) %need.dyn.alloc = call i1 @llvm.coro.alloc(token %id)
br i1 %need.dyn.alloc, label %alloc, label %_llgo_5 br i1 %need.dyn.alloc, label %alloc, label %_llgo_5
alloc: ; preds = %entry alloc: ; preds = %entry
%frame.size = call i64 @llvm.coro.size.i64() %0 = getelementptr ptr, ptr %promise, i64 16
%frame = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %frame.size)
br label %_llgo_5 br label %_llgo_5
clean: ; preds = %_llgo_8, %_llgo_7, %_llgo_6, %_llgo_5 clean: ; preds = %_llgo_8, %_llgo_7, %_llgo_6, %_llgo_5
%0 = call ptr @llvm.coro.free(token %id, ptr %hdl) %1 = call ptr @llvm.coro.free(token %id, ptr %hdl)
br label %suspend br label %suspend
suspend: ; preds = %_llgo_8, %_llgo_7, %_llgo_6, %_llgo_5, %clean suspend: ; preds = %_llgo_8, %_llgo_7, %_llgo_6, %_llgo_5, %clean
%1 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none) %2 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none)
ret ptr %promise ret ptr %promise
trap: ; preds = %_llgo_8 trap: ; preds = %_llgo_8
@@ -30,35 +31,35 @@ trap: ; preds = %_llgo_8
unreachable unreachable
_llgo_5: ; preds = %alloc, %entry _llgo_5: ; preds = %alloc, %entry
%frame1 = phi ptr [ null, %entry ], [ %frame, %alloc ] %frame = phi ptr [ null, %entry ], [ %0, %alloc ]
%hdl = call ptr @llvm.coro.begin(token %id, ptr %frame1) %hdl = call ptr @llvm.coro.begin(token %id, ptr %frame)
store ptr %hdl, ptr %promise, align 8 store ptr %hdl, ptr %promise, align 8
call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 1) call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 1)
%2 = call i8 @llvm.coro.suspend(token %id, i1 false) %3 = call i8 @llvm.coro.suspend(token %id, i1 false)
switch i8 %2, label %suspend [ switch i8 %3, label %suspend [
i8 0, label %_llgo_6 i8 0, label %_llgo_6
i8 1, label %clean i8 1, label %clean
] ]
_llgo_6: ; preds = %_llgo_5 _llgo_6: ; preds = %_llgo_5
call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 2) call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 2)
%3 = call i8 @llvm.coro.suspend(token %id, i1 false) %4 = call i8 @llvm.coro.suspend(token %id, i1 false)
switch i8 %3, label %suspend [ switch i8 %4, label %suspend [
i8 0, label %_llgo_7 i8 0, label %_llgo_7
i8 1, label %clean i8 1, label %clean
] ]
_llgo_7: ; preds = %_llgo_6 _llgo_7: ; preds = %_llgo_6
call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 3) call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 3)
%4 = call i8 @llvm.coro.suspend(token %id, i1 false) %5 = call i8 @llvm.coro.suspend(token %id, i1 false)
switch i8 %4, label %suspend [ switch i8 %5, label %suspend [
i8 0, label %_llgo_8 i8 0, label %_llgo_8
i8 1, label %clean i8 1, label %clean
] ]
_llgo_8: ; preds = %_llgo_7 _llgo_8: ; preds = %_llgo_7
%5 = call i8 @llvm.coro.suspend(token %id, i1 true) %6 = call i8 @llvm.coro.suspend(token %id, i1 true)
switch i8 %5, label %suspend [ switch i8 %6, label %suspend [
i8 0, label %trap i8 0, label %trap
i8 1, label %clean i8 1, label %clean
] ]
@@ -86,22 +87,23 @@ _llgo_3: ; preds = %_llgo_1, %_llgo_0
define ptr @async.WrapGenInts() presplitcoroutine { define ptr @async.WrapGenInts() presplitcoroutine {
entry: entry:
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 16)
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null) %id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null)
%frame.size = call i64 @llvm.coro.size.i64()
%alloc.size = add i64 16, %frame.size
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %alloc.size)
%need.dyn.alloc = call i1 @llvm.coro.alloc(token %id) %need.dyn.alloc = call i1 @llvm.coro.alloc(token %id)
br i1 %need.dyn.alloc, label %alloc, label %_llgo_5 br i1 %need.dyn.alloc, label %alloc, label %_llgo_5
alloc: ; preds = %entry alloc: ; preds = %entry
%frame.size = call i64 @llvm.coro.size.i64() %0 = getelementptr ptr, ptr %promise, i64 16
%frame = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %frame.size)
br label %_llgo_5 br label %_llgo_5
clean: ; preds = %_llgo_5 clean: ; preds = %_llgo_5
%0 = call ptr @llvm.coro.free(token %id, ptr %hdl) %1 = call ptr @llvm.coro.free(token %id, ptr %hdl)
br label %suspend br label %suspend
suspend: ; preds = %_llgo_5, %clean suspend: ; preds = %_llgo_5, %clean
%1 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none) %2 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none)
ret ptr %promise ret ptr %promise
trap: ; preds = %_llgo_5 trap: ; preds = %_llgo_5
@@ -109,12 +111,12 @@ trap: ; preds = %_llgo_5
unreachable unreachable
_llgo_5: ; preds = %alloc, %entry _llgo_5: ; preds = %alloc, %entry
%frame1 = phi ptr [ null, %entry ], [ %frame, %alloc ] %frame = phi ptr [ null, %entry ], [ %0, %alloc ]
%hdl = call ptr @llvm.coro.begin(token %id, ptr %frame1) %hdl = call ptr @llvm.coro.begin(token %id, ptr %frame)
store ptr %hdl, ptr %promise, align 8 store ptr %hdl, ptr %promise, align 8
%2 = call ptr @async.GenInts() %3 = call ptr @async.GenInts()
%3 = call i8 @llvm.coro.suspend(token %id, i1 true) %4 = call i8 @llvm.coro.suspend(token %id, i1 true)
switch i8 %3, label %suspend [ switch i8 %4, label %suspend [
i8 0, label %trap i8 0, label %trap
i8 1, label %clean i8 1, label %clean
] ]
@@ -133,17 +135,17 @@ _llgo_2: ; preds = %_llgo_1, %_llgo_0
ret void ret void
} }
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: read) ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: read)
declare token @llvm.coro.id(i32, ptr readnone, ptr nocapture readonly, ptr) declare token @llvm.coro.id(i32, ptr readnone, ptr nocapture readonly, ptr)
; Function Attrs: nounwind
declare i1 @llvm.coro.alloc(token)
; Function Attrs: nounwind memory(none) ; Function Attrs: nounwind memory(none)
declare i64 @llvm.coro.size.i64() declare i64 @llvm.coro.size.i64()
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
; Function Attrs: nounwind
declare i1 @llvm.coro.alloc(token)
; Function Attrs: nounwind ; Function Attrs: nounwind
declare ptr @llvm.coro.begin(token, ptr writeonly) declare ptr @llvm.coro.begin(token, ptr writeonly)

37
cl/compile_test.go
View File

@@ -142,22 +142,23 @@ source_filename = "foo"
define ptr @foo.GenInts() presplitcoroutine { define ptr @foo.GenInts() presplitcoroutine {
entry: entry:
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 16)
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null) %id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null)
%frame.size = call i64 @llvm.coro.size.i64()
%alloc.size = add i64 16, %frame.size
%promise = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %alloc.size)
%need.dyn.alloc = call i1 @llvm.coro.alloc(token %id) %need.dyn.alloc = call i1 @llvm.coro.alloc(token %id)
br i1 %need.dyn.alloc, label %alloc, label %_llgo_5 br i1 %need.dyn.alloc, label %alloc, label %_llgo_5
alloc: ; preds = %entry alloc: ; preds = %entry
%frame.size = call i64 @llvm.coro.size.i64() %0 = getelementptr ptr, ptr %promise, i64 16
%frame = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 %frame.size)
br label %_llgo_5 br label %_llgo_5
clean: ; preds = %_llgo_7, %_llgo_6, %_llgo_5 clean: ; preds = %_llgo_7, %_llgo_6, %_llgo_5
%0 = call ptr @llvm.coro.free(token %id, ptr %hdl) %1 = call ptr @llvm.coro.free(token %id, ptr %hdl)
br label %suspend br label %suspend
suspend: ; preds = %_llgo_7, %_llgo_6, %_llgo_5, %clean suspend: ; preds = %_llgo_7, %_llgo_6, %_llgo_5, %clean
%1 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none) %2 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none)
ret ptr %promise ret ptr %promise
trap: ; preds = %_llgo_7 trap: ; preds = %_llgo_7
@@ -165,27 +166,27 @@ trap: ; preds = %_llgo_7
unreachable unreachable
_llgo_5: ; preds = %alloc, %entry _llgo_5: ; preds = %alloc, %entry
%frame1 = phi ptr [ null, %entry ], [ %frame, %alloc ] %frame = phi ptr [ null, %entry ], [ %0, %alloc ]
%hdl = call ptr @llvm.coro.begin(token %id, ptr %frame1) %hdl = call ptr @llvm.coro.begin(token %id, ptr %frame)
store ptr %hdl, ptr %promise, align 8 store ptr %hdl, ptr %promise, align 8
call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 1) call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 1)
%2 = call i8 @llvm.coro.suspend(token %id, i1 false) %3 = call i8 @llvm.coro.suspend(token %id, i1 false)
switch i8 %2, label %suspend [ switch i8 %3, label %suspend [
i8 0, label %_llgo_6 i8 0, label %_llgo_6
i8 1, label %clean i8 1, label %clean
] ]
_llgo_6: ; preds = %_llgo_5 _llgo_6: ; preds = %_llgo_5
call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 2) call void @"github.com/goplus/llgo/x/async.(*Promise).setValue[int]"(ptr %promise, i64 2)
%3 = call i8 @llvm.coro.suspend(token %id, i1 false) %4 = call i8 @llvm.coro.suspend(token %id, i1 false)
switch i8 %3, label %suspend [ switch i8 %4, label %suspend [
i8 0, label %_llgo_7 i8 0, label %_llgo_7
i8 1, label %clean i8 1, label %clean
] ]
_llgo_7: ; preds = %_llgo_6 _llgo_7: ; preds = %_llgo_6
%4 = call i8 @llvm.coro.suspend(token %id, i1 true) %5 = call i8 @llvm.coro.suspend(token %id, i1 true)
switch i8 %4, label %suspend [ switch i8 %5, label %suspend [
i8 0, label %trap i8 0, label %trap
i8 1, label %clean i8 1, label %clean
] ]
@@ -204,17 +205,17 @@ _llgo_2: ; preds = %_llgo_1, %_llgo_0
ret void ret void
} }
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: read) ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: read)
declare token @llvm.coro.id(i32, ptr readnone, ptr nocapture readonly, ptr) declare token @llvm.coro.id(i32, ptr readnone, ptr nocapture readonly, ptr)
; Function Attrs: nounwind
declare i1 @llvm.coro.alloc(token)
; Function Attrs: nounwind memory(none) ; Function Attrs: nounwind memory(none)
declare i64 @llvm.coro.size.i64() declare i64 @llvm.coro.size.i64()
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
; Function Attrs: nounwind
declare i1 @llvm.coro.alloc(token)
; Function Attrs: nounwind ; Function Attrs: nounwind
declare ptr @llvm.coro.begin(token, ptr writeonly) declare ptr @llvm.coro.begin(token, ptr writeonly)

20
ssa/coro.go
View File

@@ -383,9 +383,14 @@ func (b Builder) EndAsync() {
} }
/* /*
pesudo code:
retPtr := malloc(sizeof(Promise)) retPtr := malloc(sizeof(Promise))
id := @llvm.coro.id(0, null, null, null) id := @llvm.coro.id(0, null, null, null)
promiseSize := sizeof(Promise[T])
frameSize := @llvm.coro.size.i64() frameSize := @llvm.coro.size.i64()
allocSize := promiseSize + frameSize
promise := malloc(allocSize)
needAlloc := @llvm.coro.alloc(id) needAlloc := @llvm.coro.alloc(id)
; Allocate memory for return type and coroutine frame ; Allocate memory for return type and coroutine frame
frame := null frame := null
@@ -408,20 +413,23 @@ func (b Builder) BeginAsync(fn Function, entryBlk, allocBlk, cleanBlk, suspdBlk,
b.async = true b.async = true
b.SetBlock(entryBlk) b.SetBlock(entryBlk)
promiseSize := b.Const(constant.MakeUint64(b.Prog.SizeOf(promiseTy)), b.Prog.Int64()).SetName("promise.size")
promise := b.AllocZ(promiseSize).SetName("promise")
promise.Type = b.Prog.Pointer(promiseTy)
b.promise = promise
align := b.Const(constant.MakeInt64(0), b.Prog.CInt()).SetName("align") align := b.Const(constant.MakeInt64(0), b.Prog.CInt()).SetName("align")
null := b.Const(nil, b.Prog.CIntPtr()) null := b.Const(nil, b.Prog.CIntPtr())
id := b.CoID(align, null, null, null).SetName("id") id := b.CoID(align, null, null, null).SetName("id")
b.asyncToken = id b.asyncToken = id
promiseSize := b.Const(constant.MakeUint64(b.Prog.SizeOf(promiseTy)), b.Prog.Int64()).SetName("alloc.size")
frameSize := b.CoSizeI64().SetName("frame.size")
allocSize := b.BinOp(token.ADD, promiseSize, frameSize).SetName("alloc.size")
promise := b.AllocZ(allocSize).SetName("promise")
b.promise = promise
promise.Type = b.Prog.Pointer(promiseTy)
needAlloc := b.CoAlloc(id).SetName("need.dyn.alloc") needAlloc := b.CoAlloc(id).SetName("need.dyn.alloc")
b.If(needAlloc, allocBlk, beginBlk) b.If(needAlloc, allocBlk, beginBlk)
b.SetBlock(allocBlk) b.SetBlock(allocBlk)
frameSize := b.CoSizeI64().SetName("frame.size") frame := b.OffsetPtr(promise, promiseSize)
frame := b.AllocZ(frameSize).SetName("frame")
b.Jump(beginBlk) b.Jump(beginBlk)
b.SetBlock(beginBlk) b.SetBlock(beginBlk)
phi := b.Phi(b.Prog.VoidPtr()) phi := b.Phi(b.Prog.VoidPtr())
phi.SetName("frame") phi.SetName("frame")

26
ssa/ssa_test.go
View File

@@ -594,6 +594,32 @@ _llgo_0:
`) `)
} }
func TestPointerOffset(t *testing.T) {
prog := NewProgram(nil)
pkg := prog.NewPackage("bar", "foo/bar")
params := types.NewTuple(
types.NewVar(0, nil, "p", types.NewPointer(types.Typ[types.Int])),
types.NewVar(0, nil, "offset", types.Typ[types.Int]),
)
rets := types.NewTuple(types.NewVar(0, nil, "", types.NewPointer(types.Typ[types.Int])))
sig := types.NewSignatureType(nil, nil, nil, params, rets, false)
fn := pkg.NewFunc("fn", sig, InGo)
b := fn.MakeBody(1)
ptr := fn.Param(0)
offset := fn.Param(1)
result := b.OffsetPtr(ptr, offset)
b.Return(result)
assertPkg(t, pkg, `; ModuleID = 'foo/bar'
source_filename = "foo/bar"
define ptr @fn(ptr %0, i64 %1) {
_llgo_0:
%2 = getelementptr ptr, ptr %0, i64 %1
ret ptr %2
}
`)
}
func TestLLVMTrap(t *testing.T) { func TestLLVMTrap(t *testing.T) {
prog := NewProgram(nil) prog := NewProgram(nil)
pkg := prog.NewPackage("bar", "foo/bar") pkg := prog.NewPackage("bar", "foo/bar")