- Temp allocator now supports more than 2 in-flight stacks.

- Printing stacktrace uses its own temp allocator.
- `@pool` no longer takes an argument.
- `Allocator` interface removes `mark` and `reset`.
- DynamicArenaAllocator has changed init function.
- Added `BackedArenaAllocator` which is allocated to a fixed size, then allocates on the backing allocator and supports mark/reset.
This commit is contained in:
Christoffer Lerno
2025-03-18 15:16:22 +01:00
parent 82cc49b388
commit 72608ce01d
27 changed files with 519 additions and 334 deletions

View File

@@ -179,17 +179,20 @@ entry:
%indirectarg10 = alloca %"any[]", align 8
store %"char[]" { ptr @.str, i64 21 }, ptr %foo_tmpl, align 8
call void @llvm.memset.p0.i64(ptr align 8 %ft, i8 0, i64 72, i1 false)
%0 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
%i2nb = icmp eq ptr %0, null
br i1 %i2nb, label %if.then, label %if.exit
%0 = load ptr, ptr @std.core.mem.allocator.current_temp, align 8
%i2b = icmp ne ptr %0, null
br i1 %i2b, label %cond.lhs, label %cond.rhs
if.then: ; preds = %entry
call void @std.core.mem.allocator.init_default_temp_allocators()
br label %if.exit
cond.lhs: ; preds = %entry
br label %cond.phi
if.exit: ; preds = %if.then, %entry
%1 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
%2 = insertvalue %any undef, ptr %1, 0
cond.rhs: ; preds = %entry
%1 = call ptr @std.core.mem.allocator.create_temp_allocator()
br label %cond.phi
cond.phi: ; preds = %cond.rhs, %cond.lhs
%val = phi ptr [ %0, %cond.lhs ], [ %1, %cond.rhs ]
%2 = insertvalue %any undef, ptr %val, 0
%3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.std.core.mem.allocator.TempAllocator" to i64), 1
%lo = load ptr, ptr %foo_tmpl, align 8
%ptradd = getelementptr inbounds i8, ptr %foo_tmpl, i64 8
@@ -201,11 +204,11 @@ if.exit: ; preds = %if.then, %entry
%5 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
br i1 %5, label %after_check, label %assign_optional
assign_optional: ; preds = %if.exit
assign_optional: ; preds = %cond.phi
store i64 %4, ptr %error_var, align 8
br label %panic_block
after_check: ; preds = %if.exit
after_check: ; preds = %cond.phi
br label %noerr_block
panic_block: ; preds = %assign_optional

View File

@@ -17,8 +17,7 @@ fn void main()
/* #expect: test.ll
entry:
%current = alloca ptr, align 8
%mark = alloca i64, align 8
%state = alloca ptr, align 8
%s = alloca %"char[]", align 8
%varargslots = alloca [1 x %any], align 16
%taddr = alloca i32, align 4
@@ -29,94 +28,80 @@ entry:
%error_var = alloca i64, align 8
%x2 = alloca %"char[]", align 8
%retparam = alloca i64, align 8
%error_var5 = alloca i64, align 8
%error_var11 = alloca i64, align 8
%1 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
%i2nb = icmp eq ptr %1, null
br i1 %i2nb, label %if.then, label %if.exit
if.then: ; preds = %entry
call void @std.core.mem.allocator.init_default_temp_allocators()
br label %if.exit
if.exit: ; preds = %if.then, %entry
%2 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
store ptr %2, ptr %current, align 8
%3 = load ptr, ptr %current, align 8
%ptradd = getelementptr inbounds i8, ptr %3, i64 24
%4 = load i64, ptr %ptradd, align 8
store i64 %4, ptr %mark, align 8
%error_var4 = alloca i64, align 8
%error_var10 = alloca i64, align 8
%1 = call ptr @std.core.mem.allocator.push_pool() #3
store ptr %1, ptr %state, align 8
store i32 %0, ptr %taddr, align 4
%5 = insertvalue %any undef, ptr %taddr, 0
%6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.int" to i64), 1
store %any %6, ptr %varargslots, align 16
%7 = call { ptr, i64 } @std.core.string.tformat(ptr @.str, i64 2, ptr %varargslots, i64 1)
store { ptr, i64 } %7, ptr %result, align 8
%2 = insertvalue %any undef, ptr %taddr, 0
%3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
store %any %3, ptr %varargslots, align 16
%4 = call { ptr, i64 } @std.core.string.tformat(ptr @.str, i64 2, ptr %varargslots, i64 1)
store { ptr, i64 } %4, ptr %result, align 8
call void @llvm.memcpy.p0.p0.i32(ptr align 8 %s, ptr align 8 %result, i32 16, i1 false)
call void @llvm.memcpy.p0.p0.i32(ptr align 8 %x, ptr align 8 %s, i32 16, i1 false)
%8 = call ptr @std.io.stdout()
%5 = call ptr @std.io.stdout()
call void @llvm.memcpy.p0.p0.i32(ptr align 8 %x1, ptr align 8 %x, i32 16, i1 false)
call void @llvm.memcpy.p0.p0.i32(ptr align 8 %x2, ptr align 8 %x1, i32 16, i1 false)
%lo = load ptr, ptr %x2, align 8
%ptradd4 = getelementptr inbounds i8, ptr %x2, i64 8
%hi = load i64, ptr %ptradd4, align 8
%9 = call i64 @std.io.File.write(ptr %retparam, ptr %8, ptr %lo, i64 %hi)
%not_err = icmp eq i64 %9, 0
%10 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
br i1 %10, label %after_check, label %assign_optional
%ptradd = getelementptr inbounds i8, ptr %x2, i64 8
%hi = load i64, ptr %ptradd, align 8
%6 = call i64 @std.io.File.write(ptr %retparam, ptr %5, ptr %lo, i64 %hi)
%not_err = icmp eq i64 %6, 0
%7 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
br i1 %7, label %after_check, label %assign_optional
assign_optional: ; preds = %if.exit
store i64 %9, ptr %error_var, align 8
assign_optional: ; preds = %entry
store i64 %6, ptr %error_var, align 8
br label %guard_block
after_check: ; preds = %if.exit
after_check: ; preds = %entry
br label %noerr_block
guard_block: ; preds = %assign_optional
br label %voiderr
noerr_block: ; preds = %after_check
%11 = load i64, ptr %retparam, align 8
store i64 %11, ptr %len, align 8
%12 = call i64 @std.io.File.write_byte(ptr %8, i8 zeroext 10)
%not_err6 = icmp eq i64 %12, 0
%13 = call i1 @llvm.expect.i1(i1 %not_err6, i1 true)
br i1 %13, label %after_check8, label %assign_optional7
%8 = load i64, ptr %retparam, align 8
store i64 %8, ptr %len, align 8
%9 = call i64 @std.io.File.write_byte(ptr %5, i8 zeroext 10)
%not_err5 = icmp eq i64 %9, 0
%10 = call i1 @llvm.expect.i1(i1 %not_err5, i1 true)
br i1 %10, label %after_check7, label %assign_optional6
assign_optional7: ; preds = %noerr_block
store i64 %12, ptr %error_var5, align 8
br label %guard_block9
assign_optional6: ; preds = %noerr_block
store i64 %9, ptr %error_var4, align 8
br label %guard_block8
after_check8: ; preds = %noerr_block
br label %noerr_block10
after_check7: ; preds = %noerr_block
br label %noerr_block9
guard_block9: ; preds = %assign_optional7
guard_block8: ; preds = %assign_optional6
br label %voiderr
noerr_block10: ; preds = %after_check8
%14 = call i64 @std.io.File.flush(ptr %8)
%not_err12 = icmp eq i64 %14, 0
%15 = call i1 @llvm.expect.i1(i1 %not_err12, i1 true)
br i1 %15, label %after_check14, label %assign_optional13
noerr_block9: ; preds = %after_check7
%11 = call i64 @std.io.File.flush(ptr %5)
%not_err11 = icmp eq i64 %11, 0
%12 = call i1 @llvm.expect.i1(i1 %not_err11, i1 true)
br i1 %12, label %after_check13, label %assign_optional12
assign_optional13: ; preds = %noerr_block10
store i64 %14, ptr %error_var11, align 8
br label %guard_block15
assign_optional12: ; preds = %noerr_block9
store i64 %11, ptr %error_var10, align 8
br label %guard_block14
after_check14: ; preds = %noerr_block10
br label %noerr_block16
after_check13: ; preds = %noerr_block9
br label %noerr_block15
guard_block15: ; preds = %assign_optional13
guard_block14: ; preds = %assign_optional12
br label %voiderr
noerr_block16: ; preds = %after_check14
%16 = load i64, ptr %len, align 8
%add = add i64 %16, 1
noerr_block15: ; preds = %after_check13
%13 = load i64, ptr %len, align 8
%add = add i64 %13, 1
br label %voiderr
voiderr: ; preds = %noerr_block16, %guard_block15, %guard_block9, %guard_block
%17 = load ptr, ptr %current, align 8
%18 = load i64, ptr %mark, align 8
call void @std.core.mem.allocator.TempAllocator.reset(ptr %17, i64 %18)
voiderr: ; preds = %noerr_block15, %guard_block14, %guard_block8, %guard_block
%14 = load ptr, ptr %state, align 8
call void @std.core.mem.allocator.pop_pool(ptr %14) #3
ret i32 2
}

View File

@@ -123,12 +123,11 @@ entry:
%varargslots57 = alloca [1 x %any], align 16
%result60 = alloca %"double[]", align 8
%retparam61 = alloca i64, align 8
%current = alloca ptr, align 8
%mark = alloca i64, align 8
%state = alloca ptr, align 8
%map3 = alloca %HashMap.0, align 8
%varargslots67 = alloca [1 x %any], align 16
%result70 = alloca %"int[]", align 8
%retparam71 = alloca i64, align 8
%varargslots66 = alloca [1 x %any], align 16
%result69 = alloca %"int[]", align 8
%retparam70 = alloca i64, align 8
call void @llvm.memset.p0.i64(ptr align 8 %map, i8 0, i64 48, i1 false)
%lo = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
@@ -232,38 +231,24 @@ after_check18: ; preds = %entry, %after_check
%48 = insertvalue %any %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
store %any %48, ptr %varargslots57, align 16
%49 = call i64 @std.io.printfn(ptr %retparam61, ptr @.str.12, i64 2, ptr %varargslots57, i64 1)
%50 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
%i2nb = icmp eq ptr %50, null
br i1 %i2nb, label %if.then, label %if.exit
if.then: ; preds = %after_check18
call void @std.core.mem.allocator.init_default_temp_allocators()
br label %if.exit
if.exit: ; preds = %if.then, %after_check18
%51 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
store ptr %51, ptr %current, align 8
%52 = load ptr, ptr %current, align 8
%ptradd64 = getelementptr inbounds i8, ptr %52, i64 24
%53 = load i64, ptr %ptradd64, align 8
store i64 %53, ptr %mark, align 8
%50 = call ptr @std.core.mem.allocator.push_pool() #4
store ptr %50, ptr %state, align 8
call void @llvm.memset.p0.i64(ptr align 8 %map3, i8 0, i64 48, i1 false)
%lo65 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi66 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%54 = call ptr @"std_collections_map$int$double$.HashMap.init"(ptr %map3, i64 %lo65, ptr %hi66, i32 16, float 7.500000e-01)
%55 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 5, double 3.200000e+00)
%56 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 7, double 5.200000e+00)
%lo68 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi69 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%57 = call { ptr, i64 } @"std_collections_map$int$double$.HashMap.keys"(ptr %map3, i64 %lo68, ptr %hi69)
store { ptr, i64 } %57, ptr %result70, align 8
%58 = insertvalue %any undef, ptr %result70, 0
%59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
store %any %59, ptr %varargslots67, align 16
%60 = call i64 @std.io.printfn(ptr %retparam71, ptr @.str.13, i64 2, ptr %varargslots67, i64 1)
%61 = load ptr, ptr %current, align 8
%62 = load i64, ptr %mark, align 8
call void @std.core.mem.allocator.TempAllocator.reset(ptr %61, i64 %62)
%lo64 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi65 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%51 = call ptr @"std_collections_map$int$double$.HashMap.init"(ptr %map3, i64 %lo64, ptr %hi65, i32 16, float 7.500000e-01)
%52 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 5, double 3.200000e+00)
%53 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 7, double 5.200000e+00)
%lo67 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi68 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%54 = call { ptr, i64 } @"std_collections_map$int$double$.HashMap.keys"(ptr %map3, i64 %lo67, ptr %hi68)
store { ptr, i64 } %54, ptr %result69, align 8
%55 = insertvalue %any undef, ptr %result69, 0
%56 = insertvalue %any %55, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
store %any %56, ptr %varargslots66, align 16
%57 = call i64 @std.io.printfn(ptr %retparam70, ptr @.str.13, i64 2, ptr %varargslots66, i64 1)
%58 = load ptr, ptr %state, align 8
call void @std.core.mem.allocator.pop_pool(ptr %58) #4
ret void
}

View File

@@ -123,12 +123,11 @@ entry:
%varargslots57 = alloca [1 x %any], align 16
%result60 = alloca %"double[]", align 8
%retparam61 = alloca i64, align 8
%current = alloca ptr, align 8
%mark = alloca i64, align 8
%state = alloca ptr, align 8
%map3 = alloca %HashMap.0, align 8
%varargslots67 = alloca [1 x %any], align 16
%result70 = alloca %"int[]", align 8
%retparam71 = alloca i64, align 8
%varargslots66 = alloca [1 x %any], align 16
%result69 = alloca %"int[]", align 8
%retparam70 = alloca i64, align 8
call void @llvm.memset.p0.i64(ptr align 8 %map, i8 0, i64 48, i1 false)
%lo = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
@@ -232,37 +231,23 @@ after_check18: ; preds = %entry, %after_check
%48 = insertvalue %any %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
store %any %48, ptr %varargslots57, align 16
%49 = call i64 @std.io.printfn(ptr %retparam61, ptr @.str.12, i64 2, ptr %varargslots57, i64 1)
%50 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
%i2nb = icmp eq ptr %50, null
br i1 %i2nb, label %if.then, label %if.exit
if.then: ; preds = %after_check18
call void @std.core.mem.allocator.init_default_temp_allocators()
br label %if.exit
if.exit: ; preds = %if.then, %after_check18
%51 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
store ptr %51, ptr %current, align 8
%52 = load ptr, ptr %current, align 8
%ptradd64 = getelementptr inbounds i8, ptr %52, i64 24
%53 = load i64, ptr %ptradd64, align 8
store i64 %53, ptr %mark, align 8
%50 = call ptr @std.core.mem.allocator.push_pool() #4
store ptr %50, ptr %state, align 8
call void @llvm.memset.p0.i64(ptr align 8 %map3, i8 0, i64 48, i1 false)
%lo65 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi66 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%54 = call ptr @"std_collections_map$int$double$.HashMap.init"(ptr %map3, i64 %lo65, ptr %hi66, i32 16, float 7.500000e-01)
%55 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 5, double 3.200000e+00)
%56 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 7, double 5.200000e+00)
%lo68 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi69 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%57 = call { ptr, i64 } @"std_collections_map$int$double$.HashMap.keys"(ptr %map3, i64 %lo68, ptr %hi69)
store { ptr, i64 } %57, ptr %result70, align 8
%58 = insertvalue %any undef, ptr %result70, 0
%59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
store %any %59, ptr %varargslots67, align 16
%60 = call i64 @std.io.printfn(ptr %retparam71, ptr @.str.13, i64 2, ptr %varargslots67, i64 1)
%61 = load ptr, ptr %current, align 8
%62 = load i64, ptr %mark, align 8
call void @std.core.mem.allocator.TempAllocator.reset(ptr %61, i64 %62)
%lo64 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi65 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%51 = call ptr @"std_collections_map$int$double$.HashMap.init"(ptr %map3, i64 %lo64, ptr %hi65, i32 16, float 7.500000e-01)
%52 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 5, double 3.200000e+00)
%53 = call i8 @"std_collections_map$int$double$.HashMap.set"(ptr %map3, i32 7, double 5.200000e+00)
%lo67 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
%hi68 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
%54 = call { ptr, i64 } @"std_collections_map$int$double$.HashMap.keys"(ptr %map3, i64 %lo67, ptr %hi68)
store { ptr, i64 } %54, ptr %result69, align 8
%55 = insertvalue %any undef, ptr %result69, 0
%56 = insertvalue %any %55, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
store %any %56, ptr %varargslots66, align 16
%57 = call i64 @std.io.printfn(ptr %retparam70, ptr @.str.13, i64 2, ptr %varargslots66, i64 1)
%58 = load ptr, ptr %state, align 8
call void @std.core.mem.allocator.pop_pool(ptr %58) #4
ret void
}

View File

@@ -4,7 +4,7 @@ fn String add(String s, Allocator a, int x)
{
if (x < 0) return s.copy(a);
String tmp;
@pool(a)
@pool()
{
tmp = "foo".tconcat(s);
tmp = add(tmp, a, x - 1);
@@ -16,7 +16,7 @@ fn String add(String s, Allocator a, int x)
fn String breakit(String s, Allocator a)
{
@pool(a)
@pool()
{
return inner2("foo".concat(tmem(), s), a);
};
@@ -24,7 +24,7 @@ fn String breakit(String s, Allocator a)
fn String inner2(String s, Allocator a)
{
@pool(a)
@pool()
{
ulong* z1 = mem::talloc(ulong);
*z1 = 0xAAAA_AAAA_AAAA_AAAA;
@@ -37,7 +37,7 @@ fn String inner2(String s, Allocator a)
fn String inner3(String s, Allocator a)
{
@pool(a)
@pool()
{
ulong* z1 = mem::talloc(ulong);
*z1 = 0xAAAA_AAAA_AAAA_AAAA;
@@ -50,7 +50,7 @@ fn String inner3(String s, Allocator a)
fn String inner4(String s, Allocator a)
{
@pool(a)
@pool()
{
String y = s.concat(tmem(), "xy**********").copy(a);
return y;