authorgravatar for david@vortan.devDavid Rubin <david@vortan.dev> 2024-05-25 14:15:21-07:00
committergravatar for david@vortan.devDavid Rubin <david@vortan.dev> 2024-06-13 02:22:06-07:00
logd69c48370a0381c7dce463c68b2097dd8fa67eb7
treea5f2fc954e7bd6b73164c8ef1c8742b5f2827649
parent206e66858c69cd667aad3779837493968bfcd228
signaturelock-open Commit is signed but in an unrecognized format.

riscv: integer + float `@abs`

8 files changed, 112 insertions(+), 11 deletions(-)

src/arch/riscv64/CodeGen.zig+68-3
......@@ -3377,18 +3377,83 @@ fn airAbs(func: *Func, inst: Air.Inst.Index) !void {
33773377 const ty = func.typeOf(ty_op.operand);
33783378 const scalar_ty = ty.scalarType(zcu);
33793379 const operand = try func.resolveInst(ty_op.operand);
3380 _ = operand;
33813380
33823381 switch (scalar_ty.zigTypeTag(zcu)) {
33833382 .Int => if (ty.zigTypeTag(zcu) == .Vector) {
33843383 return func.fail("TODO implement airAbs for {}", .{ty.fmt(zcu)});
33853384 } else {
3386 return func.fail("TODO: implement airAbs for Int", .{});
3385 const return_mcv = try func.copyToNewRegister(inst, operand);
3386 const operand_reg = return_mcv.register;
3387
3388 const temp_reg, const temp_lock = try func.allocReg(.int);
3389 defer func.register_manager.unlockReg(temp_lock);
3390
3391 _ = try func.addInst(.{
3392 .tag = .srai,
3393 .ops = .rri,
3394 .data = .{ .i_type = .{
3395 .rd = temp_reg,
3396 .rs1 = operand_reg,
3397 .imm12 = Immediate.s(63),
3398 } },
3399 });
3400
3401 _ = try func.addInst(.{
3402 .tag = .xor,
3403 .ops = .rrr,
3404 .data = .{ .r_type = .{
3405 .rd = operand_reg,
3406 .rs1 = operand_reg,
3407 .rs2 = temp_reg,
3408 } },
3409 });
3410
3411 _ = try func.addInst(.{
3412 .tag = .sub,
3413 .ops = .rrr,
3414 .data = .{ .r_type = .{
3415 .rd = operand_reg,
3416 .rs1 = operand_reg,
3417 .rs2 = temp_reg,
3418 } },
3419 });
3420
3421 break :result return_mcv;
3422 },
3423 .Float => {
3424 const float_bits = scalar_ty.floatBits(zcu.getTarget());
3425 switch (float_bits) {
3426 16 => return func.fail("TODO: airAbs 16-bit float", .{}),
3427 32 => {},
3428 64 => {},
3429 80 => return func.fail("TODO: airAbs 80-bit float", .{}),
3430 128 => return func.fail("TODO: airAbs 128-bit float", .{}),
3431 else => unreachable,
3432 }
3433
3434 const return_mcv = try func.copyToNewRegister(inst, operand);
3435 const operand_reg = return_mcv.register;
3436
3437 assert(operand_reg.class() == .float);
3438
3439 _ = try func.addInst(.{
3440 .tag = .pseudo,
3441 .ops = .pseudo_fabs,
3442 .data = .{
3443 .fabs = .{
3444 .rd = operand_reg,
3445 .rs = operand_reg,
3446 .bits = float_bits,
3447 },
3448 },
3449 });
3450
3451 break :result return_mcv;
33873452 },
33883453 else => return func.fail("TODO: implement airAbs {}", .{scalar_ty.fmt(zcu)}),
33893454 }
33903455
3391 break :result .{.unreach};
3456 break :result .unreach;
33923457 };
33933458 return func.finishAir(inst, result, .{ ty_op.operand, .none, .none });
33943459}
src/arch/riscv64/Encoding.zig+8
......@@ -130,6 +130,7 @@ pub const Mnemonic = enum {
130130 fles,
131131
132132 fsgnjns,
133 fsgnjxs,
133134
134135 // D extension (64-bit float)
135136 faddd,
......@@ -150,6 +151,7 @@ pub const Mnemonic = enum {
150151 fled,
151152
152153 fsgnjnd,
154 fsgnjxd,
153155
154156 pub fn encoding(mnem: Mnemonic) Enc {
155157 return switch (mnem) {
......@@ -218,6 +220,9 @@ pub const Mnemonic = enum {
218220 .fsgnjns => .{ .opcode = .OP_FP, .data = .{ .fmt = .{ .funct5 = 0b00100, .fmt = .S, .rm = 0b000 } } },
219221 .fsgnjnd => .{ .opcode = .OP_FP, .data = .{ .fmt = .{ .funct5 = 0b00100, .fmt = .D, .rm = 0b000 } } },
220222
223 .fsgnjxs => .{ .opcode = .OP_FP, .data = .{ .fmt = .{ .funct5 = 0b00100, .fmt = .S, .rm = 0b0010} } },
224 .fsgnjxd => .{ .opcode = .OP_FP, .data = .{ .fmt = .{ .funct5 = 0b00100, .fmt = .D, .rm = 0b0010} } },
225
221226
222227 // LOAD
223228
......@@ -392,6 +397,9 @@ pub const InstEnc = enum {
392397
393398 .fsgnjns,
394399 .fsgnjnd,
400
401 .fsgnjxs,
402 .fsgnjxd,
395403 => .R,
396404
397405 .ecall,
src/arch/riscv64/Lower.zig+20
......@@ -208,6 +208,26 @@ pub fn lowerMir(lower: *Lower, index: Mir.Inst.Index) Error!struct {
208208 });
209209 },
210210
211 .pseudo_fabs => {
212 const fabs = inst.data.fabs;
213 assert(fabs.rs.class() == .float and fabs.rd.class() == .float);
214
215 const mnem: Encoding.Mnemonic = switch (fabs.bits) {
216 16 => return lower.fail("TODO: airAbs Float 16", .{}),
217 32 => .fsgnjxs,
218 64 => .fsgnjxd,
219 80 => return lower.fail("TODO: airAbs Float 80", .{}),
220 128 => return lower.fail("TODO: airAbs Float 128", .{}),
221 else => unreachable,
222 };
223
224 try lower.emit(mnem, &.{
225 .{ .reg = fabs.rs },
226 .{ .reg = fabs.rd },
227 .{ .reg = fabs.rd },
228 });
229 },
230
211231 .pseudo_compare => {
212232 const compare = inst.data.compare;
213233 const op = compare.op;
src/arch/riscv64/Mir.zig+13
......@@ -76,6 +76,8 @@ pub const Inst = struct {
7676 fmuls,
7777 fdivs,
7878
79 fabss,
80
7981 fmins,
8082 fmaxs,
8183
......@@ -94,6 +96,8 @@ pub const Inst = struct {
9496 fmuld,
9597 fdivd,
9698
99 fabsd,
100
97101 fmind,
98102 fmaxd,
99103
......@@ -194,6 +198,12 @@ pub const Inst = struct {
194198 rs: Register,
195199 },
196200
201 fabs: struct {
202 rd: Register,
203 rs: Register,
204 bits: u16,
205 },
206
197207 compare: struct {
198208 rd: Register,
199209 rs1: Register,
......@@ -273,6 +283,9 @@ pub const Inst = struct {
273283 /// Jumps. Uses `inst` payload.
274284 pseudo_j,
275285
286 /// Floating point absolute value.
287 pseudo_fabs,
288
276289 /// Dead inst, ignored by the emitter.
277290 pseudo_dead,
278291
test/behavior/abs.zig+3-5
......@@ -6,7 +6,6 @@ test "@abs integers" {
66 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
77 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
88 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
109
1110 try comptime testAbsIntegers();
1211 try testAbsIntegers();
......@@ -93,18 +92,17 @@ test "@abs floats" {
9392 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
9493 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
9594 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
96 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
9795
9896 try comptime testAbsFloats(f16);
99 try testAbsFloats(f16);
97 if (builtin.zig_backend != .stage2_riscv64) try testAbsFloats(f16);
10098 try comptime testAbsFloats(f32);
10199 try testAbsFloats(f32);
102100 try comptime testAbsFloats(f64);
103101 try testAbsFloats(f64);
104102 try comptime testAbsFloats(f80);
105 if (builtin.zig_backend != .stage2_wasm and builtin.zig_backend != .stage2_spirv64) try testAbsFloats(f80);
103 if (builtin.zig_backend != .stage2_wasm and builtin.zig_backend != .stage2_spirv64 and builtin.zig_backend != .stage2_riscv64) try testAbsFloats(f80);
106104 try comptime testAbsFloats(f128);
107 if (builtin.zig_backend != .stage2_wasm and builtin.zig_backend != .stage2_spirv64) try testAbsFloats(f128);
105 if (builtin.zig_backend != .stage2_wasm and builtin.zig_backend != .stage2_spirv64 and builtin.zig_backend != .stage2_riscv64) try testAbsFloats(f128);
108106}
109107
110108fn testAbsFloats(comptime T: type) !void {
test/behavior/cast.zig-1
......@@ -2608,7 +2608,6 @@ test "@as does not corrupt values with incompatible representations" {
26082608 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
26092609 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
26102610 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
2611 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
26122611
26132612 const x: f32 = @as(f16, blk: {
26142613 if (false) {
test/behavior/floatop.zig-1
......@@ -999,7 +999,6 @@ test "@abs f32/f64" {
999999 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
10001000 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
10011001 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1002 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
10031002
10041003 try testFabs(f32);
10051004 try comptime testFabs(f32);
test/behavior/math.zig-1
......@@ -1814,7 +1814,6 @@ test "absFloat" {
18141814 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
18151815 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
18161816 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1817 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
18181817
18191818 try testAbsFloat();
18201819 try comptime testAbsFloat();