authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-05-10 21:19:05+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-05-10 21:19:05+02:00
log1d3b714125e98e4c135dbb9d2718e58984ab92eb
tree1795e57d55532ebc86ae7f022e3298cf015a41d8
parentd31875f7abcad00dc95211e7395d80baa879cb93

x64: implement shl with overflow for non-pow-2

2 files changed, 57 insertions(+), 128 deletions(-)

src/arch/x86_64/CodeGen.zig+17-115
...@@ -621,10 +621,10 @@ fn genBody(self: *Self, body: []const Air.Inst.Index) InnerError!void {...@@ -621,10 +621,10 @@ fn genBody(self: *Self, body: []const Air.Inst.Index) InnerError!void {
621 .trunc_float,621 .trunc_float,
622 => try self.airUnaryMath(inst),622 => try self.airUnaryMath(inst),
623623
624 .add_with_overflow => try self.airAddSubWithOverflow(inst),624 .add_with_overflow => try self.airAddSubShlWithOverflow(inst),
625 .sub_with_overflow => try self.airAddSubWithOverflow(inst),625 .sub_with_overflow => try self.airAddSubShlWithOverflow(inst),
626 .mul_with_overflow => try self.airMulWithOverflow(inst),626 .mul_with_overflow => try self.airMulWithOverflow(inst),
627 .shl_with_overflow => try self.airShlWithOverflow(inst),627 .shl_with_overflow => try self.airAddSubShlWithOverflow(inst),
628628
629 .div_float, .div_trunc, .div_floor, .div_exact => try self.airMulDivBinOp(inst),629 .div_float, .div_trunc, .div_floor, .div_exact => try self.airMulDivBinOp(inst),
630630
...@@ -1305,7 +1305,7 @@ fn airMulSat(self: *Self, inst: Air.Inst.Index) !void {...@@ -1305,7 +1305,7 @@ fn airMulSat(self: *Self, inst: Air.Inst.Index) !void {
1305 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });1305 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });
1306}1306}
13071307
1308fn airAddSubWithOverflow(self: *Self, inst: Air.Inst.Index) !void {1308fn airAddSubShlWithOverflow(self: *Self, inst: Air.Inst.Index) !void {
1309 const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;1309 const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;
1310 const tag = self.air.instructions.items(.tag)[inst];1310 const tag = self.air.instructions.items(.tag)[inst];
1311 const bin_op = self.air.extraData(Air.Bin, ty_pl.payload).data;1311 const bin_op = self.air.extraData(Air.Bin, ty_pl.payload).data;
...@@ -1313,23 +1313,30 @@ fn airAddSubWithOverflow(self: *Self, inst: Air.Inst.Index) !void {...@@ -1313,23 +1313,30 @@ fn airAddSubWithOverflow(self: *Self, inst: Air.Inst.Index) !void {
1313 const ty = self.air.typeOf(bin_op.lhs);1313 const ty = self.air.typeOf(bin_op.lhs);
1314 const abi_size = ty.abiSize(self.target.*);1314 const abi_size = ty.abiSize(self.target.*);
1315 switch (ty.zigTypeTag()) {1315 switch (ty.zigTypeTag()) {
1316 .Vector => return self.fail("TODO implement add_with_overflow for Vector type", .{}),1316 .Vector => return self.fail("TODO implement add/sub/shl with overflow for Vector type", .{}),
1317 .Int => {1317 .Int => {
1318 if (abi_size > 8) {1318 if (abi_size > 8) {
1319 return self.fail("TODO implement add_with_overflow for Ints larger than 64bits", .{});1319 return self.fail("TODO implement add/sub/shl with overflow for Ints larger than 64bits", .{});
1320 }1320 }
13211321
1322 try self.spillCompareFlagsIfOccupied();1322 try self.spillCompareFlagsIfOccupied();
13231323
1324 if (tag == .shl_with_overflow) {
1325 try self.spillRegisters(1, .{.rcx});
1326 }
1327
1324 const lhs = try self.resolveInst(bin_op.lhs);1328 const lhs = try self.resolveInst(bin_op.lhs);
1325 const rhs = try self.resolveInst(bin_op.rhs);1329 const rhs = try self.resolveInst(bin_op.rhs);
13261330
1327 const base_tag: Air.Inst.Tag = switch (tag) {1331 const partial: MCValue = switch (tag) {
1328 .add_with_overflow => .add,1332 .add_with_overflow => try self.genBinOp(.add, null, lhs, rhs, ty, ty),
1329 .sub_with_overflow => .sub,1333 .sub_with_overflow => try self.genBinOp(.sub, null, lhs, rhs, ty, ty),
1334 .shl_with_overflow => blk: {
1335 const shift_ty = self.air.typeOf(bin_op.rhs);
1336 break :blk try self.genShiftBinOp(.shl, null, lhs, rhs, ty, shift_ty);
1337 },
1330 else => unreachable,1338 else => unreachable,
1331 };1339 };
1332 const partial = try self.genBinOp(base_tag, null, lhs, rhs, ty, ty);
13331340
1334 const int_info = ty.intInfo(self.target.*);1341 const int_info = ty.intInfo(self.target.*);
13351342
...@@ -1532,111 +1539,6 @@ fn airMulWithOverflow(self: *Self, inst: Air.Inst.Index) !void {...@@ -1532,111 +1539,6 @@ fn airMulWithOverflow(self: *Self, inst: Air.Inst.Index) !void {
1532 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });1539 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });
1533}1540}
15341541
1535fn airShlWithOverflow(self: *Self, inst: Air.Inst.Index) !void {
1536 const ty_pl = self.air.instructions.items(.data)[inst].ty_pl;
1537 const bin_op = self.air.extraData(Air.Bin, ty_pl.payload).data;
1538
1539 if (self.liveness.isUnused(inst)) {
1540 return self.finishAir(inst, .dead, .{ bin_op.lhs, bin_op.rhs, .none });
1541 }
1542
1543 const lhs_ty = self.air.typeOf(bin_op.lhs);
1544 const abi_size = lhs_ty.abiSize(self.target.*);
1545 const rhs_ty = self.air.typeOf(bin_op.rhs);
1546
1547 const result: MCValue = result: {
1548 switch (lhs_ty.zigTypeTag()) {
1549 .Vector => return self.fail("TODO implement shl_with_overflow for Vector type", .{}),
1550 .Int => {
1551 if (abi_size > 8) {
1552 return self.fail("TODO implement shl_with_overflow for Ints larger than 64bits", .{});
1553 }
1554
1555 const int_info = lhs_ty.intInfo(self.target.*);
1556
1557 if (math.isPowerOfTwo(int_info.bits) and int_info.bits >= 8) {
1558 try self.spillCompareFlagsIfOccupied();
1559 self.compare_flags_inst = inst;
1560
1561 try self.spillRegisters(1, .{.rcx});
1562
1563 const lhs = try self.resolveInst(bin_op.lhs);
1564 const rhs = try self.resolveInst(bin_op.rhs);
1565
1566 const partial = try self.genShiftBinOp(.shl, null, lhs, rhs, lhs_ty, rhs_ty);
1567 break :result switch (int_info.signedness) {
1568 .signed => MCValue{ .register_overflow_signed = partial.register },
1569 .unsigned => MCValue{ .register_overflow_unsigned = partial.register },
1570 };
1571 }
1572
1573 return self.fail("TODO shl_with_overflow non-power-of-two", .{});
1574
1575 // try self.spillCompareFlagsIfOccupied();
1576 // self.compare_flags_inst = null;
1577
1578 // const dst_reg: Register = dst_reg: {
1579 // switch (int_info.signedness) {
1580 // .signed => {
1581 // const lhs = try self.resolveInst(bin_op.lhs);
1582 // const rhs = try self.resolveInst(bin_op.rhs);
1583
1584 // const rhs_lock: ?RegisterLock = switch (rhs) {
1585 // .register => |reg| self.register_manager.lockRegAssumeUnused(reg),
1586 // else => null,
1587 // };
1588 // defer if (rhs_lock) |lock| self.register_manager.unlockReg(lock);
1589
1590 // const dst_reg: Register = blk: {
1591 // if (lhs.isRegister()) break :blk lhs.register;
1592 // break :blk try self.copyToTmpRegister(ty, lhs);
1593 // };
1594 // const dst_reg_lock = self.register_manager.lockRegAssumeUnused(dst_reg);
1595 // defer self.register_manager.unlockReg(dst_reg_lock);
1596
1597 // const rhs_mcv: MCValue = blk: {
1598 // if (rhs.isRegister() or rhs.isMemory()) break :blk rhs;
1599 // break :blk MCValue{ .register = try self.copyToTmpRegister(ty, rhs) };
1600 // };
1601 // const rhs_mcv_lock: ?RegisterLock = switch (rhs_mcv) {
1602 // .register => |reg| self.register_manager.lockReg(reg),
1603 // else => null,
1604 // };
1605 // defer if (rhs_mcv_lock) |lock| self.register_manager.unlockReg(lock);
1606
1607 // try self.genIntMulComplexOpMir(Type.isize, .{ .register = dst_reg }, rhs_mcv);
1608
1609 // break :dst_reg dst_reg;
1610 // },
1611 // .unsigned => {
1612 // try self.spillRegisters(2, .{ .rax, .rdx });
1613
1614 // const lhs = try self.resolveInst(bin_op.lhs);
1615 // const rhs = try self.resolveInst(bin_op.rhs);
1616
1617 // const dst_mcv = try self.genMulDivBinOp(.mul, null, ty, lhs, rhs);
1618 // break :dst_reg dst_mcv.register;
1619 // },
1620 // }
1621 // };
1622
1623 // const tuple_ty = self.air.typeOfIndex(inst);
1624 // const tuple_size = @intCast(u32, tuple_ty.abiSize(self.target.*));
1625 // const tuple_align = tuple_ty.abiAlignment(self.target.*);
1626 // const overflow_bit_offset = @intCast(i32, tuple_ty.structFieldOffset(1, self.target.*));
1627 // const stack_offset = @intCast(i32, try self.allocMem(inst, tuple_size, tuple_align));
1628
1629 // try self.genSetStackTruncatedOverflowCompare(ty, stack_offset, overflow_bit_offset, dst_reg);
1630
1631 // break :result MCValue{ .stack_offset = stack_offset };
1632 },
1633 else => unreachable,
1634 }
1635 };
1636
1637 return self.finishAir(inst, result, .{ bin_op.lhs, bin_op.rhs, .none });
1638}
1639
1640/// Generates signed or unsigned integer multiplication/division.1542/// Generates signed or unsigned integer multiplication/division.
1641/// Clobbers .rax and .rdx registers.1543/// Clobbers .rax and .rdx registers.
1642/// Quotient is saved in .rax and remainder in .rdx.1544/// Quotient is saved in .rax and remainder in .rdx.
test/behavior/math.zig+40-13
...@@ -905,20 +905,47 @@ test "@subWithOverflow" {...@@ -905,20 +905,47 @@ test "@subWithOverflow" {
905905
906test "@shlWithOverflow" {906test "@shlWithOverflow" {
907 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO907 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
908 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
908909
909 var result: u16 = undefined;910 {
910 try expect(@shlWithOverflow(u16, 0b0010111111111111, 3, &result));911 var result: u4 = undefined;
911 try expect(result == 0b0111111111111000);912 var a: u4 = 2;
912 try expect(!@shlWithOverflow(u16, 0b0010111111111111, 2, &result));913 var b: u2 = 1;
913 try expect(result == 0b1011111111111100);914 try expect(!@shlWithOverflow(u4, a, b, &result));
914915 try expect(result == 4);
915 var a: u16 = 0b0000_0000_0000_0011;916
916 var b: u4 = 15;917 b = 3;
917 try expect(@shlWithOverflow(u16, a, b, &result));918 try expect(@shlWithOverflow(u4, a, b, &result));
918 try expect(result == 0b1000_0000_0000_0000);919 try expect(result == 0);
919 b = 14;920 }
920 try expect(!@shlWithOverflow(u16, a, b, &result));921
921 try expect(result == 0b1100_0000_0000_0000);922 {
923 var result: i9 = undefined;
924 var a: i9 = 127;
925 var b: u4 = 1;
926 try expect(!@shlWithOverflow(i9, a, b, &result));
927 try expect(result == 254);
928
929 b = 2;
930 try expect(@shlWithOverflow(i9, a, b, &result));
931 try expect(result == -4);
932 }
933
934 {
935 var result: u16 = undefined;
936 try expect(@shlWithOverflow(u16, 0b0010111111111111, 3, &result));
937 try expect(result == 0b0111111111111000);
938 try expect(!@shlWithOverflow(u16, 0b0010111111111111, 2, &result));
939 try expect(result == 0b1011111111111100);
940
941 var a: u16 = 0b0000_0000_0000_0011;
942 var b: u4 = 15;
943 try expect(@shlWithOverflow(u16, a, b, &result));
944 try expect(result == 0b1000_0000_0000_0000);
945 b = 14;
946 try expect(!@shlWithOverflow(u16, a, b, &result));
947 try expect(result == 0b1100_0000_0000_0000);
948 }
922}949}
923950
924test "overflow arithmetic with u0 values" {951test "overflow arithmetic with u0 values" {