From 32283f2ed15f3958acb6f54188a436b04f0b240b Mon Sep 17 00:00:00 2001 From: Jaewoo Kim Date: Mon, 7 Apr 2025 11:03:18 +0000 Subject: [PATCH] Update model solution. - Stop calculating operands for & operators. - Evaluate the lhs of compound operators only once. - Add `side-effect.c` example. --- examples/c/side_effect.c | 13 ++++++++++ examples/ir0/hello_main.ir | 4 +-- examples/ir0/pointer.ir | 50 ++++++++++++----------------------- examples/ir0/side_effect.ir | 35 +++++++++++++++++++++++++ examples/ir0/temp2.ir | 17 ++++++------ examples/ir0/typedef.ir | 13 +++++----- examples/ir1/hello_main.ir | 2 +- examples/ir1/pointer.ir | 50 ++++++++++++----------------------- examples/ir1/side_effect.ir | 29 +++++++++++++++++++++ examples/ir1/temp2.ir | 21 +++++++-------- examples/ir1/typedef.ir | 13 +++++----- examples/ir2/hello_main.ir | 2 +- examples/ir2/pointer.ir | 52 ++++++++++++------------------------- examples/ir2/side_effect.ir | 29 +++++++++++++++++++++ examples/ir2/temp2.ir | 15 +++++------ examples/ir2/typedef.ir | 11 ++++---- examples/ir3/hello_main.ir | 2 +- examples/ir3/pointer.ir | 29 ++++++++------------- examples/ir3/side_effect.ir | 29 +++++++++++++++++++++ examples/ir4/hello_main.ir | 2 +- examples/ir4/pointer.ir | 29 ++++++++------------- examples/ir4/side_effect.ir | 29 +++++++++++++++++++++ examples/opt/hello_main.ir | 2 +- examples/opt/pointer.ir | 26 ++++++++----------- examples/opt/side_effect.ir | 29 +++++++++++++++++++++ tests/test_examples.rs | 8 +++++- 26 files changed, 331 insertions(+), 210 deletions(-) create mode 100644 examples/c/side_effect.c create mode 100644 examples/ir0/side_effect.ir create mode 100644 examples/ir1/side_effect.ir create mode 100644 examples/ir2/side_effect.ir create mode 100644 examples/ir3/side_effect.ir create mode 100644 examples/ir4/side_effect.ir create mode 100644 examples/opt/side_effect.ir diff --git a/examples/c/side_effect.c b/examples/c/side_effect.c new file mode 100644 index 0000000..23904aa --- /dev/null +++ b/examples/c/side_effect.c @@ -0,0 +1,13 @@ +int g = 0; + +int* foo() { + g += 10; + return &g; +} + +int main() { + // `foo()` should be called once. + *&*foo() += 1; + + return g; +} diff --git a/examples/ir0/hello_main.ir b/examples/ir0/hello_main.ir index 566a6b9..70851f9 100644 --- a/examples/ir0/hello_main.ir +++ b/examples/ir0/hello_main.ir @@ -2,12 +2,12 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: ret 1:i32 block b1: - ret 1:i32 + ret 0:i32 } diff --git a/examples/ir0/pointer.ir b/examples/ir0/pointer.ir index 4ad0cf7..73ec337 100644 --- a/examples/ir0/pointer.ir +++ b/examples/ir0/pointer.ir @@ -26,43 +26,25 @@ init: block b0: %b0:i0:unit = store 1:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* - %b0:i2:unit = store %l0:i32* %l1:i32** + %b0:i1:unit = store %l0:i32* %l1:i32** + %b0:i2:unit = store %l1:i32** %l2:i32*** %b0:i3:i32* = load %l1:i32** - %b0:i4:i32* = load %l1:i32** - %b0:i5:i32* = load %l1:i32** - %b0:i6:unit = store %l1:i32** %l2:i32*** - %b0:i7:i32* = load %l1:i32** - %b0:i8:i32* = load %l1:i32** - %b0:i9:unit = store %b0:i8:i32* %l3:i32** - %b0:i10:i32** = load %l2:i32*** - %b0:i11:i32* = load %b0:i10:i32** + %b0:i4:unit = store %b0:i3:i32* %l3:i32** + %b0:i5:i32** = load %l2:i32*** + %b0:i6:i32* = load %b0:i5:i32** + %b0:i7:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i6:i32*) + %b0:i8:i32 = load %b0:i7:i32* + %b0:i9:i32 = add %b0:i8:i32 1:i32 + %b0:i10:unit = store %b0:i9:i32 %b0:i7:i32* + %b0:i11:i32* = load %l3:i32** %b0:i12:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i11:i32*) %b0:i13:i32 = load %b0:i12:i32* - %b0:i14:i32** = load %l2:i32*** - %b0:i15:i32* = load %b0:i14:i32** - %b0:i16:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i15:i32*) - %b0:i17:i32** = load %l2:i32*** - %b0:i18:i32* = load %b0:i17:i32** - %b0:i19:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i18:i32*) - %b0:i20:i32 = load %b0:i19:i32* - %b0:i21:i32** = load %l2:i32*** - %b0:i22:i32* = load %b0:i21:i32** - %b0:i23:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i22:i32*) - %b0:i24:i32 = load %b0:i23:i32* - %b0:i25:i32 = add %b0:i24:i32 1:i32 - %b0:i26:unit = store %b0:i25:i32 %b0:i16:i32* - %b0:i27:i32* = load %l3:i32** - %b0:i28:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i27:i32*) - %b0:i29:i32* = load %l3:i32** - %b0:i30:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i29:i32*) - %b0:i31:i32 = load %b0:i30:i32* - %b0:i32:i32 = add %b0:i31:i32 1:i32 - %b0:i33:unit = store %b0:i32:i32 %b0:i28:i32* - %b0:i34:i32 = load %l0:i32* - %b0:i35:u1 = cmp eq %b0:i34:i32 3:i32 - %b0:i36:i32 = typecast %b0:i35:u1 to i32 - ret %b0:i36:i32 + %b0:i14:i32 = add %b0:i13:i32 1:i32 + %b0:i15:unit = store %b0:i14:i32 %b0:i12:i32* + %b0:i16:i32 = load %l0:i32* + %b0:i17:u1 = cmp eq %b0:i16:i32 3:i32 + %b0:i18:i32 = typecast %b0:i17:u1 to i32 + ret %b0:i18:i32 block b1: ret 0:i32 diff --git a/examples/ir0/side_effect.ir b/examples/ir0/side_effect.ir new file mode 100644 index 0000000..879db51 --- /dev/null +++ b/examples/ir0/side_effect.ir @@ -0,0 +1,35 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* + +block b1: + ret undef:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 + +block b1: + ret 0:i32 +} diff --git a/examples/ir0/temp2.ir b/examples/ir0/temp2.ir index 7531a7e..3e5b02e 100644 --- a/examples/ir0/temp2.ir +++ b/examples/ir0/temp2.ir @@ -34,15 +34,14 @@ block b0: %b0:i19:i32 = typecast %b0:i18:i8 to i32 %b0:i20:i32 = add %b0:i16:i32 %b0:i19:i32 %b0:i21:unit = store %b0:i20:i32 %l0:i32* - %b0:i22:struct color = load %l1:struct color* - %b0:i23:unit = store %l1:struct color* %l2:struct color** - %b0:i24:i32 = load %l0:i32* - %b0:i25:struct color* = load %l2:struct color** - %b0:i26:i8* = getelementptr %b0:i25:struct color* offset 4:i64 - %b0:i27:i8 = load %b0:i26:i8* - %b0:i28:i32 = typecast %b0:i27:i8 to i32 - %b0:i29:i32 = add %b0:i24:i32 %b0:i28:i32 - %b0:i30:unit = store %b0:i29:i32 %l0:i32* + %b0:i22:unit = store %l1:struct color* %l2:struct color** + %b0:i23:i32 = load %l0:i32* + %b0:i24:struct color* = load %l2:struct color** + %b0:i25:i8* = getelementptr %b0:i24:struct color* offset 4:i64 + %b0:i26:i8 = load %b0:i25:i8* + %b0:i27:i32 = typecast %b0:i26:i8 to i32 + %b0:i28:i32 = add %b0:i23:i32 %b0:i27:i32 + %b0:i29:unit = store %b0:i28:i32 %l0:i32* j b1() block b1: diff --git a/examples/ir0/typedef.ir b/examples/ir0/typedef.ir index ba668eb..5635d6b 100644 --- a/examples/ir0/typedef.ir +++ b/examples/ir0/typedef.ir @@ -8,13 +8,12 @@ init: block b0: %b0:i0:unit = store 0:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* - %b0:i2:unit = store %l0:i32* %l1:i32*const* - %b0:i3:i32* = load %l1:i32*const* - %b0:i4:unit = store 1:i32 %b0:i3:i32* - %b0:i5:i32* = load %l1:i32*const* - %b0:i6:i32 = load %b0:i5:i32* - ret %b0:i6:i32 + %b0:i1:unit = store %l0:i32* %l1:i32*const* + %b0:i2:i32* = load %l1:i32*const* + %b0:i3:unit = store 1:i32 %b0:i2:i32* + %b0:i4:i32* = load %l1:i32*const* + %b0:i5:i32 = load %b0:i4:i32* + ret %b0:i5:i32 block b1: ret 0:i32 diff --git a/examples/ir1/hello_main.ir b/examples/ir1/hello_main.ir index 2585836..9adaea1 100644 --- a/examples/ir1/hello_main.ir +++ b/examples/ir1/hello_main.ir @@ -2,7 +2,7 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: diff --git a/examples/ir1/pointer.ir b/examples/ir1/pointer.ir index d65137d..350a8e2 100644 --- a/examples/ir1/pointer.ir +++ b/examples/ir1/pointer.ir @@ -23,41 +23,23 @@ init: block b0: %b0:i0:unit = store 1:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* - %b0:i2:unit = store %l0:i32* %l1:i32** + %b0:i1:unit = store %l0:i32* %l1:i32** + %b0:i2:unit = store %l1:i32** %l2:i32*** %b0:i3:i32* = load %l1:i32** - %b0:i4:i32* = load %l1:i32** - %b0:i5:i32* = load %l1:i32** - %b0:i6:unit = store %l1:i32** %l2:i32*** - %b0:i7:i32* = load %l1:i32** - %b0:i8:i32* = load %l1:i32** - %b0:i9:unit = store %b0:i8:i32* %l3:i32** - %b0:i10:i32** = load %l2:i32*** - %b0:i11:i32* = load %b0:i10:i32** + %b0:i4:unit = store %b0:i3:i32* %l3:i32** + %b0:i5:i32** = load %l2:i32*** + %b0:i6:i32* = load %b0:i5:i32** + %b0:i7:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i6:i32*) + %b0:i8:i32 = load %b0:i7:i32* + %b0:i9:i32 = add %b0:i8:i32 1:i32 + %b0:i10:unit = store %b0:i9:i32 %b0:i7:i32* + %b0:i11:i32* = load %l3:i32** %b0:i12:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i11:i32*) %b0:i13:i32 = load %b0:i12:i32* - %b0:i14:i32** = load %l2:i32*** - %b0:i15:i32* = load %b0:i14:i32** - %b0:i16:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i15:i32*) - %b0:i17:i32** = load %l2:i32*** - %b0:i18:i32* = load %b0:i17:i32** - %b0:i19:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i18:i32*) - %b0:i20:i32 = load %b0:i19:i32* - %b0:i21:i32** = load %l2:i32*** - %b0:i22:i32* = load %b0:i21:i32** - %b0:i23:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i22:i32*) - %b0:i24:i32 = load %b0:i23:i32* - %b0:i25:i32 = add %b0:i24:i32 1:i32 - %b0:i26:unit = store %b0:i25:i32 %b0:i16:i32* - %b0:i27:i32* = load %l3:i32** - %b0:i28:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i27:i32*) - %b0:i29:i32* = load %l3:i32** - %b0:i30:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i29:i32*) - %b0:i31:i32 = load %b0:i30:i32* - %b0:i32:i32 = add %b0:i31:i32 1:i32 - %b0:i33:unit = store %b0:i32:i32 %b0:i28:i32* - %b0:i34:i32 = load %l0:i32* - %b0:i35:u1 = cmp eq %b0:i34:i32 3:i32 - %b0:i36:i32 = typecast %b0:i35:u1 to i32 - ret %b0:i36:i32 + %b0:i14:i32 = add %b0:i13:i32 1:i32 + %b0:i15:unit = store %b0:i14:i32 %b0:i12:i32* + %b0:i16:i32 = load %l0:i32* + %b0:i17:u1 = cmp eq %b0:i16:i32 3:i32 + %b0:i18:i32 = typecast %b0:i17:u1 to i32 + ret %b0:i18:i32 } diff --git a/examples/ir1/side_effect.ir b/examples/ir1/side_effect.ir new file mode 100644 index 0000000..43137cc --- /dev/null +++ b/examples/ir1/side_effect.ir @@ -0,0 +1,29 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 +} diff --git a/examples/ir1/temp2.ir b/examples/ir1/temp2.ir index e9ad236..ce3689f 100644 --- a/examples/ir1/temp2.ir +++ b/examples/ir1/temp2.ir @@ -34,17 +34,16 @@ block b0: %b0:i19:i32 = typecast %b0:i18:i8 to i32 %b0:i20:i32 = add %b0:i16:i32 %b0:i19:i32 %b0:i21:unit = store %b0:i20:i32 %l0:i32* - %b0:i22:struct color = load %l1:struct color* - %b0:i23:unit = store %l1:struct color* %l2:struct color** - %b0:i24:i32 = load %l0:i32* - %b0:i25:struct color* = load %l2:struct color** - %b0:i26:i8* = getelementptr %b0:i25:struct color* offset 4:i64 - %b0:i27:i8 = load %b0:i26:i8* - %b0:i28:i32 = typecast %b0:i27:i8 to i32 - %b0:i29:i32 = add %b0:i24:i32 %b0:i28:i32 - %b0:i30:unit = store %b0:i29:i32 %l0:i32* - %b0:i31:unit = store 0:i32 %l3:i32* - %b0:i32:unit = store 0:i32 %l4:i32* + %b0:i22:unit = store %l1:struct color* %l2:struct color** + %b0:i23:i32 = load %l0:i32* + %b0:i24:struct color* = load %l2:struct color** + %b0:i25:i8* = getelementptr %b0:i24:struct color* offset 4:i64 + %b0:i26:i8 = load %b0:i25:i8* + %b0:i27:i32 = typecast %b0:i26:i8 to i32 + %b0:i28:i32 = add %b0:i23:i32 %b0:i27:i32 + %b0:i29:unit = store %b0:i28:i32 %l0:i32* + %b0:i30:unit = store 0:i32 %l3:i32* + %b0:i31:unit = store 0:i32 %l4:i32* j b2() block b2: diff --git a/examples/ir1/typedef.ir b/examples/ir1/typedef.ir index dc24425..d9ed17c 100644 --- a/examples/ir1/typedef.ir +++ b/examples/ir1/typedef.ir @@ -8,11 +8,10 @@ init: block b0: %b0:i0:unit = store 0:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* - %b0:i2:unit = store %l0:i32* %l1:i32*const* - %b0:i3:i32* = load %l1:i32*const* - %b0:i4:unit = store 1:i32 %b0:i3:i32* - %b0:i5:i32* = load %l1:i32*const* - %b0:i6:i32 = load %b0:i5:i32* - ret %b0:i6:i32 + %b0:i1:unit = store %l0:i32* %l1:i32*const* + %b0:i2:i32* = load %l1:i32*const* + %b0:i3:unit = store 1:i32 %b0:i2:i32* + %b0:i4:i32* = load %l1:i32*const* + %b0:i5:i32 = load %b0:i4:i32* + ret %b0:i5:i32 } diff --git a/examples/ir2/hello_main.ir b/examples/ir2/hello_main.ir index 2585836..9adaea1 100644 --- a/examples/ir2/hello_main.ir +++ b/examples/ir2/hello_main.ir @@ -2,7 +2,7 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: diff --git a/examples/ir2/pointer.ir b/examples/ir2/pointer.ir index b328e3c..b332f09 100644 --- a/examples/ir2/pointer.ir +++ b/examples/ir2/pointer.ir @@ -23,41 +23,23 @@ init: block b0: %b0:i0:unit = store 1:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* - %b0:i2:unit = store %l0:i32* %l1:i32** + %b0:i1:unit = store %l0:i32* %l1:i32** + %b0:i2:unit = nop %b0:i3:i32* = load %l1:i32** - %b0:i4:i32* = load %l1:i32** - %b0:i5:i32* = load %l1:i32** - %b0:i6:unit = nop - %b0:i7:i32* = load %l1:i32** - %b0:i8:i32* = load %l1:i32** - %b0:i9:unit = nop - %b0:i10:unit = nop - %b0:i11:i32* = load %l1:i32** - %b0:i12:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i11:i32*) + %b0:i4:unit = nop + %b0:i5:unit = nop + %b0:i6:i32* = load %l1:i32** + %b0:i7:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i6:i32*) + %b0:i8:i32 = load %b0:i7:i32* + %b0:i9:i32 = add %b0:i8:i32 1:i32 + %b0:i10:unit = store %b0:i9:i32 %b0:i7:i32* + %b0:i11:unit = nop + %b0:i12:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i3:i32*) %b0:i13:i32 = load %b0:i12:i32* - %b0:i14:unit = nop - %b0:i15:i32* = load %l1:i32** - %b0:i16:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i15:i32*) - %b0:i17:unit = nop - %b0:i18:i32* = load %l1:i32** - %b0:i19:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i18:i32*) - %b0:i20:i32 = load %b0:i19:i32* - %b0:i21:unit = nop - %b0:i22:i32* = load %l1:i32** - %b0:i23:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i22:i32*) - %b0:i24:i32 = load %b0:i23:i32* - %b0:i25:i32 = add %b0:i24:i32 1:i32 - %b0:i26:unit = store %b0:i25:i32 %b0:i16:i32* - %b0:i27:unit = nop - %b0:i28:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i8:i32*) - %b0:i29:unit = nop - %b0:i30:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i8:i32*) - %b0:i31:i32 = load %b0:i30:i32* - %b0:i32:i32 = add %b0:i31:i32 1:i32 - %b0:i33:unit = store %b0:i32:i32 %b0:i28:i32* - %b0:i34:i32 = load %l0:i32* - %b0:i35:u1 = cmp eq %b0:i34:i32 3:i32 - %b0:i36:i32 = typecast %b0:i35:u1 to i32 - ret %b0:i36:i32 + %b0:i14:i32 = add %b0:i13:i32 1:i32 + %b0:i15:unit = store %b0:i14:i32 %b0:i12:i32* + %b0:i16:i32 = load %l0:i32* + %b0:i17:u1 = cmp eq %b0:i16:i32 3:i32 + %b0:i18:i32 = typecast %b0:i17:u1 to i32 + ret %b0:i18:i32 } diff --git a/examples/ir2/side_effect.ir b/examples/ir2/side_effect.ir new file mode 100644 index 0000000..43137cc --- /dev/null +++ b/examples/ir2/side_effect.ir @@ -0,0 +1,29 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 +} diff --git a/examples/ir2/temp2.ir b/examples/ir2/temp2.ir index 450a2cd..e33758d 100644 --- a/examples/ir2/temp2.ir +++ b/examples/ir2/temp2.ir @@ -34,18 +34,17 @@ block b0: %b0:i19:i32 = typecast %b0:i18:i8 to i32 %b0:i20:i32 = add %b0:i9:i32 %b0:i19:i32 %b0:i21:unit = nop - %b0:i22:struct color = load %l1:struct color* + %b0:i22:unit = nop %b0:i23:unit = nop %b0:i24:unit = nop - %b0:i25:unit = nop - %b0:i26:i8* = getelementptr %l1:struct color* offset 4:i64 - %b0:i27:i8 = load %b0:i26:i8* - %b0:i28:i32 = typecast %b0:i27:i8 to i32 - %b0:i29:i32 = add %b0:i20:i32 %b0:i28:i32 + %b0:i25:i8* = getelementptr %l1:struct color* offset 4:i64 + %b0:i26:i8 = load %b0:i25:i8* + %b0:i27:i32 = typecast %b0:i26:i8 to i32 + %b0:i28:i32 = add %b0:i20:i32 %b0:i27:i32 + %b0:i29:unit = nop %b0:i30:unit = nop %b0:i31:unit = nop - %b0:i32:unit = nop - j b2(%b0:i29:i32, 0:i32, undef:u1) + j b2(%b0:i28:i32, 0:i32, undef:u1) block b2: %b2:p0:i32:temp diff --git a/examples/ir2/typedef.ir b/examples/ir2/typedef.ir index 10e406f..8db8a43 100644 --- a/examples/ir2/typedef.ir +++ b/examples/ir2/typedef.ir @@ -8,11 +8,10 @@ init: block b0: %b0:i0:unit = store 0:i32 %l0:i32* - %b0:i1:i32 = load %l0:i32* + %b0:i1:unit = nop %b0:i2:unit = nop - %b0:i3:unit = nop - %b0:i4:unit = store 1:i32 %l0:i32* - %b0:i5:unit = nop - %b0:i6:i32 = load %l0:i32* - ret %b0:i6:i32 + %b0:i3:unit = store 1:i32 %l0:i32* + %b0:i4:unit = nop + %b0:i5:i32 = load %l0:i32* + ret %b0:i5:i32 } diff --git a/examples/ir3/hello_main.ir b/examples/ir3/hello_main.ir index 2585836..9adaea1 100644 --- a/examples/ir3/hello_main.ir +++ b/examples/ir3/hello_main.ir @@ -2,7 +2,7 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: diff --git a/examples/ir3/pointer.ir b/examples/ir3/pointer.ir index 3e9bb88..b9aed3f 100644 --- a/examples/ir3/pointer.ir +++ b/examples/ir3/pointer.ir @@ -23,22 +23,15 @@ block b0: %b0:i2:i32* = load %l1:i32** %b0:i3:i32* = load %l1:i32** %b0:i4:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i3:i32*) - %b0:i5:i32* = load %l1:i32** - %b0:i6:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i5:i32*) - %b0:i7:i32* = load %l1:i32** - %b0:i8:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i7:i32*) - %b0:i9:i32* = load %l1:i32** - %b0:i10:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i9:i32*) - %b0:i11:i32 = load %b0:i10:i32* - %b0:i12:i32 = add %b0:i11:i32 1:i32 - %b0:i13:unit = store %b0:i12:i32 %b0:i6:i32* - %b0:i14:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) - %b0:i15:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) - %b0:i16:i32 = load %b0:i15:i32* - %b0:i17:i32 = add %b0:i16:i32 1:i32 - %b0:i18:unit = store %b0:i17:i32 %b0:i14:i32* - %b0:i19:i32 = load %l0:i32* - %b0:i20:u1 = cmp eq %b0:i19:i32 3:i32 - %b0:i21:i32 = typecast %b0:i20:u1 to i32 - ret %b0:i21:i32 + %b0:i5:i32 = load %b0:i4:i32* + %b0:i6:i32 = add %b0:i5:i32 1:i32 + %b0:i7:unit = store %b0:i6:i32 %b0:i4:i32* + %b0:i8:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) + %b0:i9:i32 = load %b0:i8:i32* + %b0:i10:i32 = add %b0:i9:i32 1:i32 + %b0:i11:unit = store %b0:i10:i32 %b0:i8:i32* + %b0:i12:i32 = load %l0:i32* + %b0:i13:u1 = cmp eq %b0:i12:i32 3:i32 + %b0:i14:i32 = typecast %b0:i13:u1 to i32 + ret %b0:i14:i32 } diff --git a/examples/ir3/side_effect.ir b/examples/ir3/side_effect.ir new file mode 100644 index 0000000..43137cc --- /dev/null +++ b/examples/ir3/side_effect.ir @@ -0,0 +1,29 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 +} diff --git a/examples/ir4/hello_main.ir b/examples/ir4/hello_main.ir index 2585836..9adaea1 100644 --- a/examples/ir4/hello_main.ir +++ b/examples/ir4/hello_main.ir @@ -2,7 +2,7 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: diff --git a/examples/ir4/pointer.ir b/examples/ir4/pointer.ir index 3e9bb88..b9aed3f 100644 --- a/examples/ir4/pointer.ir +++ b/examples/ir4/pointer.ir @@ -23,22 +23,15 @@ block b0: %b0:i2:i32* = load %l1:i32** %b0:i3:i32* = load %l1:i32** %b0:i4:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i3:i32*) - %b0:i5:i32* = load %l1:i32** - %b0:i6:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i5:i32*) - %b0:i7:i32* = load %l1:i32** - %b0:i8:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i7:i32*) - %b0:i9:i32* = load %l1:i32** - %b0:i10:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i9:i32*) - %b0:i11:i32 = load %b0:i10:i32* - %b0:i12:i32 = add %b0:i11:i32 1:i32 - %b0:i13:unit = store %b0:i12:i32 %b0:i6:i32* - %b0:i14:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) - %b0:i15:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) - %b0:i16:i32 = load %b0:i15:i32* - %b0:i17:i32 = add %b0:i16:i32 1:i32 - %b0:i18:unit = store %b0:i17:i32 %b0:i14:i32* - %b0:i19:i32 = load %l0:i32* - %b0:i20:u1 = cmp eq %b0:i19:i32 3:i32 - %b0:i21:i32 = typecast %b0:i20:u1 to i32 - ret %b0:i21:i32 + %b0:i5:i32 = load %b0:i4:i32* + %b0:i6:i32 = add %b0:i5:i32 1:i32 + %b0:i7:unit = store %b0:i6:i32 %b0:i4:i32* + %b0:i8:i32* = call @foo:[ret:i32* params:(i32*)]*(%b0:i2:i32*) + %b0:i9:i32 = load %b0:i8:i32* + %b0:i10:i32 = add %b0:i9:i32 1:i32 + %b0:i11:unit = store %b0:i10:i32 %b0:i8:i32* + %b0:i12:i32 = load %l0:i32* + %b0:i13:u1 = cmp eq %b0:i12:i32 3:i32 + %b0:i14:i32 = typecast %b0:i13:u1 to i32 + ret %b0:i14:i32 } diff --git a/examples/ir4/side_effect.ir b/examples/ir4/side_effect.ir new file mode 100644 index 0000000..43137cc --- /dev/null +++ b/examples/ir4/side_effect.ir @@ -0,0 +1,29 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 +} diff --git a/examples/opt/hello_main.ir b/examples/opt/hello_main.ir index 2585836..9adaea1 100644 --- a/examples/opt/hello_main.ir +++ b/examples/opt/hello_main.ir @@ -2,7 +2,7 @@ fun i32 @main () { init: bid: b0 - allocations: + allocations: block b0: diff --git a/examples/opt/pointer.ir b/examples/opt/pointer.ir index 3860639..15816a9 100644 --- a/examples/opt/pointer.ir +++ b/examples/opt/pointer.ir @@ -19,19 +19,15 @@ init: block b0: %b0:i0:unit = store 1:i32 %l0:i32* %b0:i1:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i2:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i3:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i4:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i5:i32 = load %b0:i4:i32* - %b0:i6:i32 = add %b0:i5:i32 1:i32 - %b0:i7:unit = store %b0:i6:i32 %b0:i2:i32* - %b0:i8:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i9:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) - %b0:i10:i32 = load %b0:i9:i32* - %b0:i11:i32 = add %b0:i10:i32 1:i32 - %b0:i12:unit = store %b0:i11:i32 %b0:i8:i32* - %b0:i13:i32 = load %l0:i32* - %b0:i14:u1 = cmp eq %b0:i13:i32 3:i32 - %b0:i15:i32 = typecast %b0:i14:u1 to i32 - ret %b0:i15:i32 + %b0:i2:i32 = load %b0:i1:i32* + %b0:i3:i32 = add %b0:i2:i32 1:i32 + %b0:i4:unit = store %b0:i3:i32 %b0:i1:i32* + %b0:i5:i32* = call @foo:[ret:i32* params:(i32*)]*(%l0:i32*) + %b0:i6:i32 = load %b0:i5:i32* + %b0:i7:i32 = add %b0:i6:i32 1:i32 + %b0:i8:unit = store %b0:i7:i32 %b0:i5:i32* + %b0:i9:i32 = load %l0:i32* + %b0:i10:u1 = cmp eq %b0:i9:i32 3:i32 + %b0:i11:i32 = typecast %b0:i10:u1 to i32 + ret %b0:i11:i32 } diff --git a/examples/opt/side_effect.ir b/examples/opt/side_effect.ir new file mode 100644 index 0000000..43137cc --- /dev/null +++ b/examples/opt/side_effect.ir @@ -0,0 +1,29 @@ +var i32 @g = 0 + +fun i32* @foo () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32 = load @g:i32* + %b0:i1:i32 = add %b0:i0:i32 10:i32 + %b0:i2:unit = store %b0:i1:i32 @g:i32* + ret @g:i32* +} + +fun i32 @main () { +init: + bid: b0 + allocations: + + +block b0: + %b0:i0:i32* = call @foo:[ret:i32* params:()]*() + %b0:i1:i32 = load %b0:i0:i32* + %b0:i2:i32 = add %b0:i1:i32 1:i32 + %b0:i3:unit = store %b0:i2:i32 %b0:i0:i32* + %b0:i4:i32 = load @g:i32* + ret %b0:i4:i32 +} diff --git a/tests/test_examples.rs b/tests/test_examples.rs index 057fc2f..92cc485 100644 --- a/tests/test_examples.rs +++ b/tests/test_examples.rs @@ -60,6 +60,9 @@ const IRGEN_SMALL_TEST_IGNORE_LIST: [&str; 12] = [ "examples/c/temp2.c", ]; +// TODO: Enable this test next semester. +const IRGEN_FULL_TEST_IGNORE_LIST: [&str; 1] = ["examples/c/side-effect.c"]; + const ASMGEN_TEST_DIR_LIST: [&str; 5] = [ "examples/ir0", "examples/ir1", @@ -101,7 +104,10 @@ fn test_examples_irgen_small() { test_irgen(Path::new(&format!("examples/c/{HELLO_MAIN}.c"))); test_dir(Path::new("examples/c"), OsStr::new("c"), |path| { let path_str = &path.to_str().expect("`path` must be transformed to `&str`"); - if !IRGEN_SMALL_TEST_IGNORE_LIST.contains(path_str) && !path_str.contains(HELLO_MAIN) { + if !IRGEN_SMALL_TEST_IGNORE_LIST.contains(path_str) + && !IRGEN_FULL_TEST_IGNORE_LIST.contains(path_str) + && !path_str.contains(HELLO_MAIN) + { println!("[testing irgen for {path:?}]"); test_irgen(path); }