| author |  Ali Chraghi <alichraghi@proton.me> 2023-10-18 02:30:25+03:30 |
| committer | Ali Chraghi <alichraghi@proton.me> 2023-10-18 02:31:16+03:30 |
| log | e5d5c1d423c73c94d6c3e9d26bd904eb3807b489 |
| tree | 1caa6b04f4b39f01cd9a090ba1f1516016c93873 |
| parent | 364c54460f3e6fb770a19c5572b0951dd903f19d |
spirv: switch on bool
4 files changed, 5 insertions(+), 6 deletions(-)
src- codegen
- test
src/codegen/spirv.zig+5-3
| ... | ... | @@ -4098,11 +4098,13 @@ const DeclGen = struct { |
| 4098 | 4098 | fn airSwitchBr(self: *DeclGen, inst: Air.Inst.Index) !void { |
| 4099 | 4099 | const mod = self.module; |
| 4100 | 4100 | const pl_op = self.air.instructions.items(.data)[inst].pl_op; |
| 4101 | const cond = try self.resolve(pl_op.operand); | |
| 4102 | 4101 | const cond_ty = self.typeOf(pl_op.operand); |
| 4102 | const cond = try self.resolve(pl_op.operand); | |
| 4103 | const cond_indirect = try self.convertToIndirect(cond_ty, cond); | |
| 4103 | 4104 | const switch_br = self.air.extraData(Air.SwitchBr, pl_op.payload); |
| 4104 | 4105 | |
| 4105 | 4106 | const cond_words: u32 = switch (cond_ty.zigTypeTag(mod)) { |
| 4107 | .Bool => 1, | |
| 4106 | 4108 | .Int => blk: { |
| 4107 | 4109 | const bits = cond_ty.intInfo(mod).bits; |
| 4108 | 4110 | const backing_bits = self.backingIntBits(bits) orelse { |
| ... | ... | @@ -4146,7 +4148,7 @@ const DeclGen = struct { |
| 4146 | 4148 | |
| 4147 | 4149 | // Emit the instruction before generating the blocks. |
| 4148 | 4150 | try self.func.body.emitRaw(self.spv.gpa, .OpSwitch, 2 + (cond_words + 1) * num_conditions); |
| 4149 | self.func.body.writeOperand(IdRef, cond); | |
| 4151 | self.func.body.writeOperand(IdRef, cond_indirect); | |
| 4150 | 4152 | self.func.body.writeOperand(IdRef, default); |
| 4151 | 4153 | |
| 4152 | 4154 | // Emit each of the cases |
| ... | ... | @@ -4167,7 +4169,7 @@ const DeclGen = struct { |
| 4167 | 4169 | return self.todo("switch on runtime value???", .{}); |
| 4168 | 4170 | }; |
| 4169 | 4171 | const int_val = switch (cond_ty.zigTypeTag(mod)) { |
| 4170 | .Int => if (cond_ty.isSignedInt(mod)) @as(u64, @bitCast(value.toSignedInt(mod))) else value.toUnsignedInt(mod), | |
| 4172 | .Bool, .Int => if (cond_ty.isSignedInt(mod)) @as(u64, @bitCast(value.toSignedInt(mod))) else value.toUnsignedInt(mod), | |
| 4171 | 4173 | .Enum => blk: { |
| 4172 | 4174 | // TODO: figure out of cond_ty is correct (something with enum literals) |
| 4173 | 4175 | break :blk (try value.intFromEnum(cond_ty, mod)).toUnsignedInt(mod); // TODO: composite integer constants |
test/behavior/basic.zig-1
| ... | ... | @@ -715,7 +715,6 @@ test "result location is optional inside error union" { |
| 715 | 715 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 716 | 716 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 717 | 717 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 718 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 719 | 718 | |
| 720 | 719 | const x = maybe(true) catch unreachable; |
| 721 | 720 | try expect(x.? == 42); |
test/behavior/inline_switch.zig-1
| ... | ... | @@ -72,7 +72,6 @@ test "inline switch unions" { |
| 72 | 72 | test "inline else bool" { |
| 73 | 73 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 74 | 74 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 75 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 76 | 75 | |
| 77 | 76 | var a = true; |
| 78 | 77 | switch (a) { |
test/behavior/switch.zig-1
| ... | ... | @@ -118,7 +118,6 @@ fn trueIfBoolFalseOtherwise(comptime T: type) bool { |
| 118 | 118 | |
| 119 | 119 | test "switching on booleans" { |
| 120 | 120 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 121 | if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; | |
| 122 | 121 | |
| 123 | 122 | try testSwitchOnBools(); |
| 124 | 123 | try comptime testSwitchOnBools(); |