Commit 6c16465d45527c195302beb1f3a1a6d41cdcdd92 | zig

author	Robin Voetter <robin@voetter.nl> 2023-04-11 22:29:02+02:00
committer	Robin Voetter <robin@voetter.nl> 2023-05-11 20:31:51+02:00
log	6c16465d45527c195302beb1f3a1a6d41cdcdd92
tree	71218d64ba9201bd02479d540ebe5251dbe721d2
parent	83ab1ba8fdb6900e63e1e0aa3a5e1ab966fc2022
signature	Commit is signed but in an unrecognized format.

spirv: lower air optional_payload

Implements lowering the AIR tag optional_payload.

Also fixes an issue with lowering constant ints.

1 files changed, 24 insertions(+), 5 deletions(-)

src
- codegen
  - spirv.zig

src/codegen/spirv.zig+24-5

 @@ -957,11 +957,11 @@ pub const DeclGen = struct {
         switch (ty.zigTypeTag()) {
             .Int => {
-                const int_bits = if (ty.isSignedInt())
+                if (ty.isSignedInt()) {
-                    @bitCast(u64, val.toSignedInt(target))
+                    try self.genConstInt(result_ty_ref, result_id, val.toSignedInt(target));
-                else
+                } else {
-                    val.toUnsignedInt(target);
+                    try self.genConstInt(result_ty_ref, result_id, val.toUnsignedInt(target));
-                try self.genConstInt(result_ty_ref, result_id, int_bits);
+                }
             },
             .Bool => {
                 const operands = .{ .id_result_type = result_ty_id, .id_result = result_id };
 @@ -1717,6 +1717,8 @@ pub const DeclGen = struct {
             .is_null     => try self.airIsNull(inst, .is_null),
             .is_non_null => try self.airIsNull(inst, .is_non_null),
+            .optional_payload => try self.airUnwrapOptional(inst),
             .assembly => try self.airAssembly(inst),
             .call              => try self.airCall(inst, .auto),
 @@ -2694,6 +2696,23 @@ pub const DeclGen = struct {
         };
     }
+    fn airUnwrapOptional(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
+        if (self.liveness.isUnused(inst)) return null;
+        const ty_op = self.air.instructions.items(.data)[inst].ty_op;
+        const operand_id = try self.resolve(ty_op.operand);
+        const optional_ty = self.air.typeOf(ty_op.operand);
+        const payload_ty = self.air.typeOfIndex(inst);
+        if (!payload_ty.hasRuntimeBitsIgnoreComptime()) return null;
+        if (optional_ty.optionalReprIsPayload()) {
+            return operand_id;
+        }
+        return try self.extractField(payload_ty, operand_id, 0);
+    }
     fn airSwitchBr(self: *DeclGen, inst: Air.Inst.Index) !void {
         const target = self.getTarget();
         const pl_op = self.air.instructions.items(.data)[inst].pl_op;