Commit c3120d5089df155937a2ab78140cbe8c0b215e06 | zig

author	Robin Voetter <robin@voetter.nl> 2023-10-18 16:28:13+02:00
committer	GitHub <noreply@github.com> 2023-10-18 16:28:13+02:00
log	c3120d5089df155937a2ab78140cbe8c0b215e06
tree	fe882b14542253d978db92d765cb6d14a612ecfe
parent	e8f3c4c4b12f59ac6fb1c2045a0635ce8f3d0dac
parent	e5d5c1d423c73c94d6c3e9d26bd904eb3807b489
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #17577 from alichraghi/spirv-1

spirv: switch on bool

4 files changed, 5 insertions(+), 6 deletions(-)

src
- codegen
  - spirv.zig
test
- behavior

src/codegen/spirv.zig+5-3

...	...	@@ -4139,11 +4139,13 @@ const DeclGen = struct {
4139	4139	fn airSwitchBr(self: *DeclGen, inst: Air.Inst.Index) !void {
4140	4140	const mod = self.module;
4141	4141	const pl_op = self.air.instructions.items(.data)[inst].pl_op;
4142		const cond = try self.resolve(pl_op.operand);
4143	4142	const cond_ty = self.typeOf(pl_op.operand);
	4143	const cond = try self.resolve(pl_op.operand);
	4144	const cond_indirect = try self.convertToIndirect(cond_ty, cond);
4144	4145	const switch_br = self.air.extraData(Air.SwitchBr, pl_op.payload);
4145	4146
4146	4147	const cond_words: u32 = switch (cond_ty.zigTypeTag(mod)) {
	4148	.Bool => 1,
4147	4149	.Int => blk: {
4148	4150	const bits = cond_ty.intInfo(mod).bits;
4149	4151	const backing_bits = self.backingIntBits(bits) orelse {
...	...	@@ -4187,7 +4189,7 @@ const DeclGen = struct {
4187	4189
4188	4190	// Emit the instruction before generating the blocks.
4189	4191	try self.func.body.emitRaw(self.spv.gpa, .OpSwitch, 2 + (cond_words + 1) * num_conditions);
4190		self.func.body.writeOperand(IdRef, cond);
	4192	self.func.body.writeOperand(IdRef, cond_indirect);
4191	4193	self.func.body.writeOperand(IdRef, default);
4192	4194
4193	4195	// Emit each of the cases
...	...	@@ -4208,7 +4210,7 @@ const DeclGen = struct {
4208	4210	return self.todo("switch on runtime value???", .{});
4209	4211	};
4210	4212	const int_val = switch (cond_ty.zigTypeTag(mod)) {
4211		.Int => if (cond_ty.isSignedInt(mod)) @as(u64, @bitCast(value.toSignedInt(mod))) else value.toUnsignedInt(mod),
	4213	.Bool, .Int => if (cond_ty.isSignedInt(mod)) @as(u64, @bitCast(value.toSignedInt(mod))) else value.toUnsignedInt(mod),
4212	4214	.Enum => blk: {
4213	4215	// TODO: figure out of cond_ty is correct (something with enum literals)
4214	4216	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();