spirv: implement switch case handling for ranges and enable tests

Author: ivanstepanovftw

src/codegen/spirv.zig

@@ -6267,8 +6267,14 @@ const NavGen = struct {
             var num_conditions: u32 = 0;
             var it = switch_br.iterateCases();
             while (it.next()) |case| {
-                if (case.ranges.len > 0) return self.todo("switch with ranges", .{});
                 num_conditions += @intCast(case.items.len);
+                for (case.ranges) |range| {
+                    const start_val = (try self.air.value(range[0], pt)) orelse unreachable;
+                    const end_val = (try self.air.value(range[1], pt)) orelse unreachable;
+                    const start_u64 = start_val.toUnsignedInt(zcu);
+                    const end_u64 = end_val.toUnsignedInt(zcu);
+                    num_conditions += @intCast(end_u64 - start_u64 + 1);
+                }
             }
             break :blk num_conditions;
         };
@@ -6322,6 +6328,23 @@ const NavGen = struct {
                     self.func.body.writeOperand(spec.LiteralContextDependentNumber, int_lit);
                     self.func.body.writeOperand(IdRef, label);
                 }
+
+                for (case.ranges) |range| {
+                    const start_val = (try self.air.value(range[0], pt)) orelse unreachable;
+                    const end_val = (try self.air.value(range[1], pt)) orelse unreachable;
+                    const start_u64 = start_val.toUnsignedInt(zcu);
+                    const end_u64 = end_val.toUnsignedInt(zcu);
+
+                    for (start_u64..end_u64 + 1) |i| {
+                        const int_lit: spec.LiteralContextDependentNumber = switch (cond_words) {
+                            1 => .{ .uint32 = @intCast(i) },
+                            2 => .{ .uint64 = i },
+                            else => unreachable,
+                        };
+                        self.func.body.writeOperand(spec.LiteralContextDependentNumber, int_lit);
+                        self.func.body.writeOperand(IdRef, label);
+                    }
+                }
             }
         }
 

test/behavior/switch.zig

@@ -9,7 +9,6 @@ const maxInt = std.math.maxInt;
 
 test "switch with numbers" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
 
     try testSwitchWithNumbers(13);
 }
@@ -25,7 +24,6 @@ fn testSwitchWithNumbers(x: u32) !void {
 
 test "switch with all ranges" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
 
     try expect(testSwitchWithAllRanges(50, 3) == 1);
     try expect(testSwitchWithAllRanges(101, 0) == 2);
@@ -46,7 +44,6 @@ test "switch arbitrary int size" {
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; // TODO
 
     if (builtin.zig_backend == .stage2_c and builtin.os.tag == .windows) return error.SkipZigTest; // TODO
@@ -61,6 +58,8 @@ test "switch arbitrary int size" {
     try expect(testSwitchArbInt(i64, maxInt(i64)) == 2);
     try expect(testSwitchArbInt(i64, -1000) == 3);
 
+    if (builtin.zig_backend == .stage2_spirv) return; // TODO composite integers
+
     try expect(testSwitchArbInt(u128, 0) == 0);
     try expect(testSwitchArbInt(u128, 12) == 1);
     try expect(testSwitchArbInt(u128, maxInt(u128)) == 2);
@@ -216,7 +215,6 @@ test "undefined.u0" {
 
 test "switch with disjoint range" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
 
     var q: u8 = 0;
     _ = &q;
@@ -228,8 +226,6 @@ test "switch with disjoint range" {
 }
 
 test "switch variable for range and multiple prongs" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
-
     const S = struct {
         fn doTheTest() !void {
             try doTheSwitch(16);
@@ -321,7 +317,6 @@ fn testSwitchEnumPtrCapture() !void {
 
 test "switch handles all cases of number" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
 
     try testSwitchHandleAllCases();
     try comptime testSwitchHandleAllCases();
@@ -544,7 +539,6 @@ test "switch prongs with error set cases make a new error set type for capture v
 
 test "return result loc and then switch with range implicit casted to error union" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
 
     const S = struct {
         fn doTheTest() !void {
@@ -764,7 +758,6 @@ test "switch capture copies its payload" {
 
 test "capture of integer forwards the switch condition directly" {
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
 
     const S = struct {
         fn foo(x: u8) !void {
@@ -953,7 +946,6 @@ test "peer type resolution on switch captures ignores unused payload bits" {
 test "switch prong captures range" {
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
 
     const S = struct {
         fn a(b: []u3, c: u3) void {
@@ -1016,8 +1008,6 @@ test "block error return trace index is reset between prongs" {
 }
 
 test "labeled switch with break" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; // TODO
-
     var six: u32 = undefined;
     six = 6;