| author |  David Rubin <david@vortan.dev> 2024-09-12 17:05:48-07:00 |
| committer |  xdBronch <51252236+xdBronch@users.noreply.github.com> 2024-09-12 20:29:10-04:00 |
| log | bc161430b0006386ae19c51cfc574b5d8f8fef6e |
| tree | 0a3c8e19a97a4af2104760ceb385e653787b042e |
| parent | 0329b8387ce53574c42565322c191e7cc30eb3f7 |
riscv: implement `optional_payload_ptr_set`
6 files changed, 32 insertions(+), 9 deletions(-)
src- arch
- riscv64
src/arch/riscv64/CodeGen.zig+31-1
| ... | @@ -3364,8 +3364,38 @@ fn airOptionalPayloadPtr(func: *Func, inst: Air.Inst.Index) !void { | ... | @@ -3364,8 +3364,38 @@ fn airOptionalPayloadPtr(func: *Func, inst: Air.Inst.Index) !void { |
| 3364 | } | 3364 | } |
| 3365 | 3365 | ||
| 3366 | fn airOptionalPayloadPtrSet(func: *Func, inst: Air.Inst.Index) !void { | 3366 | fn airOptionalPayloadPtrSet(func: *Func, inst: Air.Inst.Index) !void { |
| 3367 | const zcu = func.pt.zcu; | ||
| 3368 | |||
| 3367 | const ty_op = func.air.instructions.items(.data)[@intFromEnum(inst)].ty_op; | 3369 | const ty_op = func.air.instructions.items(.data)[@intFromEnum(inst)].ty_op; |
| 3368 | const result: MCValue = if (func.liveness.isUnused(inst)) .unreach else return func.fail("TODO implement .optional_payload_ptr_set for {}", .{func.target.cpu.arch}); | 3370 | const result: MCValue = if (func.liveness.isUnused(inst)) .unreach else result: { |
| 3371 | const dst_ty = func.typeOfIndex(inst); | ||
| 3372 | const src_ty = func.typeOf(ty_op.operand); | ||
| 3373 | const opt_ty = src_ty.childType(zcu); | ||
| 3374 | const src_mcv = try func.resolveInst(ty_op.operand); | ||
| 3375 | |||
| 3376 | if (opt_ty.optionalReprIsPayload(zcu)) { | ||
| 3377 | break :result if (func.reuseOperand(inst, ty_op.operand, 0, src_mcv)) | ||
| 3378 | src_mcv | ||
| 3379 | else | ||
| 3380 | try func.copyToNewRegister(inst, src_mcv); | ||
| 3381 | } | ||
| 3382 | |||
| 3383 | const dst_mcv: MCValue = if (src_mcv.isRegister() and | ||
| 3384 | func.reuseOperand(inst, ty_op.operand, 0, src_mcv)) | ||
| 3385 | src_mcv | ||
| 3386 | else | ||
| 3387 | try func.copyToNewRegister(inst, src_mcv); | ||
| 3388 | |||
| 3389 | const pl_ty = dst_ty.childType(zcu); | ||
| 3390 | const pl_abi_size: i32 = @intCast(pl_ty.abiSize(zcu)); | ||
| 3391 | try func.genSetMem( | ||
| 3392 | .{ .reg = dst_mcv.getReg().? }, | ||
| 3393 | pl_abi_size, | ||
| 3394 | Type.bool, | ||
| 3395 | .{ .immediate = 1 }, | ||
| 3396 | ); | ||
| 3397 | break :result dst_mcv; | ||
| 3398 | }; | ||
| 3369 | return func.finishAir(inst, result, .{ ty_op.operand, .none, .none }); | 3399 | return func.finishAir(inst, result, .{ ty_op.operand, .none, .none }); |
| 3370 | } | 3400 | } |
| 3371 | 3401 |
test/behavior/cast.zig-1
| ... | @@ -1875,7 +1875,6 @@ test "peer type resolution: vector and optional vector" { | ... | @@ -1875,7 +1875,6 @@ test "peer type resolution: vector and optional vector" { |
| 1875 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO | 1875 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO |
| 1876 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 1876 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 1877 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO | 1877 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO |
| 1878 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 1879 | 1878 | ||
| 1880 | var a: ?@Vector(3, u32) = .{ 0, 1, 2 }; | 1879 | var a: ?@Vector(3, u32) = .{ 0, 1, 2 }; |
| 1881 | var b: @Vector(3, u32) = .{ 3, 4, 5 }; | 1880 | var b: @Vector(3, u32) = .{ 3, 4, 5 }; |
test/behavior/decl_literals.zig+1-2
| ... | @@ -33,8 +33,7 @@ test "decl literal with pointer" { | ... | @@ -33,8 +33,7 @@ test "decl literal with pointer" { |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | test "call decl literal with optional" { | 35 | test "call decl literal with optional" { |
| 36 | if (builtin.zig_backend == .stage2_riscv64 or | 36 | if (builtin.zig_backend == .stage2_sparc64 or |
| 37 | builtin.zig_backend == .stage2_sparc64 or | ||
| 38 | builtin.zig_backend == .stage2_arm or | 37 | builtin.zig_backend == .stage2_arm or |
| 39 | builtin.zig_backend == .stage2_aarch64 or | 38 | builtin.zig_backend == .stage2_aarch64 or |
| 40 | builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO | 39 | builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO |
test/behavior/optional.zig-1
| ... | @@ -320,7 +320,6 @@ test "coerce an anon struct literal to optional struct" { | ... | @@ -320,7 +320,6 @@ test "coerce an anon struct literal to optional struct" { |
| 320 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | 320 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 321 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 321 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 322 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | 322 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; |
| 323 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 324 | 323 | ||
| 325 | const S = struct { | 324 | const S = struct { |
| 326 | const Struct = struct { | 325 | const Struct = struct { |
test/behavior/struct.zig-3
| ... | @@ -1165,7 +1165,6 @@ test "anon init through error unions and optionals" { | ... | @@ -1165,7 +1165,6 @@ test "anon init through error unions and optionals" { |
| 1165 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | 1165 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 1166 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 1166 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 1167 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | 1167 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; |
| 1168 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 1169 | 1168 | ||
| 1170 | const S = struct { | 1169 | const S = struct { |
| 1171 | a: u32, | 1170 | a: u32, |
| ... | @@ -1193,7 +1192,6 @@ test "anon init through optional" { | ... | @@ -1193,7 +1192,6 @@ test "anon init through optional" { |
| 1193 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | 1192 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 1194 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 1193 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 1195 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | 1194 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; |
| 1196 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 1197 | 1195 | ||
| 1198 | const S = struct { | 1196 | const S = struct { |
| 1199 | a: u32, | 1197 | a: u32, |
| ... | @@ -1503,7 +1501,6 @@ test "no dependency loop on pointer to optional struct" { | ... | @@ -1503,7 +1501,6 @@ test "no dependency loop on pointer to optional struct" { |
| 1503 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; | 1501 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 1504 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | 1502 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 1505 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | 1503 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; |
| 1506 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 1507 | 1504 | ||
| 1508 | const S = struct { | 1505 | const S = struct { |
| 1509 | const A = struct { b: B }; | 1506 | const A = struct { b: B }; |
test/behavior/union.zig-1
| ... | @@ -1268,7 +1268,6 @@ test "extern union most-aligned field is smaller" { | ... | @@ -1268,7 +1268,6 @@ test "extern union most-aligned field is smaller" { |
| 1268 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO | 1268 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 1269 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO | 1269 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 1270 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | 1270 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; |
| 1271 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | ||
| 1272 | 1271 | ||
| 1273 | const U = extern union { | 1272 | const U = extern union { |
| 1274 | in6: extern struct { | 1273 | in6: extern struct { |