authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-02-12 21:12:18+01:00
committergravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2022-02-14 22:09:44+01:00
log783e216e7d49ce30032cd768ca266f5f08773bf4
tree13bc364a2fec50885949698da74ebc83241d21af
parent1c37622659f70115b698b5924472c2268bca63a8
signaturelock-open Commit is signed but in an unrecognized format.

stage2 AArch64: Fix issue in binOp and add regression test

2 files changed, 61 insertions(+), 19 deletions(-)

src/arch/aarch64/CodeGen.zig+17-1
......@@ -981,13 +981,19 @@ fn binOpRegister(
981981 if (lhs_is_register) self.register_manager.freezeRegs(&.{lhs.register});
982982 if (rhs_is_register) self.register_manager.freezeRegs(&.{rhs.register});
983983
984 const branch = &self.branch_stack.items[self.branch_stack.items.len - 1];
985
984986 const lhs_reg = if (lhs_is_register) lhs.register else blk: {
985987 const track_inst: ?Air.Inst.Index = if (maybe_inst) |inst| inst: {
986988 const bin_op = self.air.instructions.items(.data)[inst].bin_op;
987989 break :inst Air.refToIndex(bin_op.lhs).?;
988990 } else null;
991
989992 const reg = try self.register_manager.allocReg(track_inst);
990993 self.register_manager.freezeRegs(&.{reg});
994
995 if (track_inst) |inst| branch.inst_table.putAssumeCapacity(inst, .{ .register = reg });
996
991997 break :blk reg;
992998 };
993999 defer self.register_manager.unfreezeRegs(&.{lhs_reg});
......@@ -997,8 +1003,12 @@ fn binOpRegister(
9971003 const bin_op = self.air.instructions.items(.data)[inst].bin_op;
9981004 break :inst Air.refToIndex(bin_op.rhs).?;
9991005 } else null;
1006
10001007 const reg = try self.register_manager.allocReg(track_inst);
10011008 self.register_manager.freezeRegs(&.{reg});
1009
1010 if (track_inst) |inst| branch.inst_table.putAssumeCapacity(inst, .{ .register = reg });
1011
10021012 break :blk reg;
10031013 };
10041014 defer self.register_manager.unfreezeRegs(&.{rhs_reg});
......@@ -1077,6 +1087,8 @@ fn binOpImmediate(
10771087
10781088 if (lhs_is_register) self.register_manager.freezeRegs(&.{lhs.register});
10791089
1090 const branch = &self.branch_stack.items[self.branch_stack.items.len - 1];
1091
10801092 const lhs_reg = if (lhs_is_register) lhs.register else blk: {
10811093 const track_inst: ?Air.Inst.Index = if (maybe_inst) |inst| inst: {
10821094 const bin_op = self.air.instructions.items(.data)[inst].bin_op;
......@@ -1084,8 +1096,12 @@ fn binOpImmediate(
10841096 if (lhs_and_rhs_swapped) bin_op.rhs else bin_op.lhs,
10851097 ).?;
10861098 } else null;
1099
10871100 const reg = try self.register_manager.allocReg(track_inst);
10881101 self.register_manager.freezeRegs(&.{reg});
1102
1103 if (track_inst) |inst| branch.inst_table.putAssumeCapacity(inst, .{ .register = reg });
1104
10891105 break :blk reg;
10901106 };
10911107 defer self.register_manager.unfreezeRegs(&.{lhs_reg});
......@@ -3141,7 +3157,7 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void
31413157 .tag = .cset,
31423158 .data = .{ .r_cond = .{
31433159 .rd = reg,
3144 .cond = condition,
3160 .cond = condition.negate(),
31453161 } },
31463162 });
31473163 },
test/stage2/aarch64.zig+44-18
......@@ -17,15 +17,8 @@ pub fn addCases(ctx: *TestContext) !void {
1717 var case = ctx.exe("linux_aarch64 hello world", linux_aarch64);
1818 // Regular old hello world
1919 case.addCompareOutput(
20 \\pub export fn _start() noreturn {
20 \\pub fn main() void {
2121 \\ print();
22 \\ exit();
23 \\}
24 \\
25 \\fn doNothing() void {}
26 \\
27 \\fn answer() u64 {
28 \\ return 0x1234abcd1234abcd;
2922 \\}
3023 \\
3124 \\fn print() void {
......@@ -38,16 +31,6 @@ pub fn addCases(ctx: *TestContext) !void {
3831 \\ : "memory", "cc"
3932 \\ );
4033 \\}
41 \\
42 \\fn exit() noreturn {
43 \\ asm volatile ("svc #0"
44 \\ :
45 \\ : [number] "{x8}" (93),
46 \\ [arg1] "{x0}" (0)
47 \\ : "memory", "cc"
48 \\ );
49 \\ unreachable;
50 \\}
5134 ,
5235 "Hello, World!\n",
5336 );
......@@ -129,6 +112,49 @@ pub fn addCases(ctx: *TestContext) !void {
129112 );
130113 }
131114
115 {
116 var case = ctx.exe("large add function", linux_aarch64);
117
118 case.addCompareOutput(
119 \\pub fn main() void {
120 \\ assert(add(3, 4) == 791);
121 \\}
122 \\
123 \\fn add(a: u32, b: u32) u32 {
124 \\ const x: u32 = blk: {
125 \\ const c = a + b; // 7
126 \\ const d = a + c; // 10
127 \\ const e = d + b; // 14
128 \\ const f = d + e; // 24
129 \\ const g = e + f; // 38
130 \\ const h = f + g; // 62
131 \\ const i = g + h; // 100
132 \\ const j = i + d; // 110
133 \\ const k = i + j; // 210
134 \\ const l = k + c; // 217
135 \\ const m = l + d; // 227
136 \\ const n = m + e; // 241
137 \\ const o = n + f; // 265
138 \\ const p = o + g; // 303
139 \\ const q = p + h; // 365
140 \\ const r = q + i; // 465
141 \\ const s = r + j; // 575
142 \\ const t = s + k; // 785
143 \\ break :blk t;
144 \\ };
145 \\ const y = x + a; // 788
146 \\ const z = y + a; // 791
147 \\ return z;
148 \\}
149 \\
150 \\fn assert(ok: bool) void {
151 \\ if (!ok) unreachable;
152 \\}
153 ,
154 "",
155 );
156 }
157
132158 // macOS tests
133159 {
134160 var case = ctx.exe("hello world with updates", macos_aarch64);