authorgravatar for alichraghi@proton.meAli Chraghi <alichraghi@proton.me> 2023-05-17 11:24:09+03:30
committergravatar for alichraghi@proton.meAli Chraghi <alichraghi@proton.me> 2023-05-20 18:43:26+03:30
logfedc9a19e7909694fac107c3da245e08616fd6e4
tree57e7bc6dc89a86b2a17d87d8bce5b9a0f99ed42e
parent40e8c2243c139dc499298645a2b387e30ae09cba

spirv: lower get_union_tag

4 files changed, 17 insertions(+), 12 deletions(-)

src/codegen/spirv.zig+17
...@@ -1735,6 +1735,7 @@ pub const DeclGen = struct {...@@ -1735,6 +1735,7 @@ pub const DeclGen = struct {
1735 .slice_elem_val => try self.airSliceElemVal(inst),1735 .slice_elem_val => try self.airSliceElemVal(inst),
1736 .ptr_elem_ptr => try self.airPtrElemPtr(inst),1736 .ptr_elem_ptr => try self.airPtrElemPtr(inst),
17371737
1738 .get_union_tag => try self.airGetUnionTag(inst),
1738 .struct_field_val => try self.airStructFieldVal(inst),1739 .struct_field_val => try self.airStructFieldVal(inst),
17391740
1740 .struct_field_ptr_index_0 => try self.airStructFieldPtrIndex(inst, 0),1741 .struct_field_ptr_index_0 => try self.airStructFieldPtrIndex(inst, 0),
...@@ -2320,6 +2321,22 @@ pub const DeclGen = struct {...@@ -2320,6 +2321,22 @@ pub const DeclGen = struct {
2320 return result_id;2321 return result_id;
2321 }2322 }
23222323
2324 fn airGetUnionTag(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
2325 const ty_op = self.air.instructions.items(.data)[inst].ty_op;
2326 const un_ty = self.air.typeOf(ty_op.operand);
2327
2328 const target = self.module.getTarget();
2329 const layout = un_ty.unionGetLayout(target);
2330 if (layout.tag_size == 0) return null;
2331
2332 const union_handle = try self.resolve(ty_op.operand);
2333 if (layout.payload_size == 0) return union_handle;
2334
2335 const tag_ty = un_ty.unionTagTypeSafety().?;
2336 const tag_index = @boolToInt(layout.tag_align < layout.payload_align);
2337 return try self.extractField(tag_ty, union_handle, tag_index);
2338 }
2339
2323 fn airStructFieldVal(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {2340 fn airStructFieldVal(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
2324 if (self.liveness.isUnused(inst)) return null;2341 if (self.liveness.isUnused(inst)) return null;
23252342
test/behavior/enum.zig-1
...@@ -910,7 +910,6 @@ test "enum literal casting to tagged union" {...@@ -910,7 +910,6 @@ test "enum literal casting to tagged union" {
910 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;910 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
911 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;911 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
912 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO912 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
913 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
914913
915 const Arch = union(enum) {914 const Arch = union(enum) {
916 x86_64,915 x86_64,
test/behavior/pub_enum.zig-2
...@@ -3,8 +3,6 @@ const other = @import("pub_enum/other.zig");...@@ -3,8 +3,6 @@ const other = @import("pub_enum/other.zig");
3const expect = @import("std").testing.expect;3const expect = @import("std").testing.expect;
44
5test "pub enum" {5test "pub enum" {
6 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
7
8 try pubEnumTest(other.APubEnum.Two);6 try pubEnumTest(other.APubEnum.Two);
9}7}
10fn pubEnumTest(foo: other.APubEnum) !void {8fn pubEnumTest(foo: other.APubEnum) !void {
test/behavior/union.zig-9
...@@ -272,7 +272,6 @@ test "comparison between union and enum literal" {...@@ -272,7 +272,6 @@ test "comparison between union and enum literal" {
272 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;272 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
273 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;273 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
274 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO274 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
275 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
276275
277 try testComparison();276 try testComparison();
278 comptime try testComparison();277 comptime try testComparison();
...@@ -288,7 +287,6 @@ test "cast union to tag type of union" {...@@ -288,7 +287,6 @@ test "cast union to tag type of union" {
288 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;287 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
289 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;288 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
290 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO289 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
291 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
292290
293 try testCastUnionToTag();291 try testCastUnionToTag();
294 comptime try testCastUnionToTag();292 comptime try testCastUnionToTag();
...@@ -309,7 +307,6 @@ test "cast tag type of union to union" {...@@ -309,7 +307,6 @@ test "cast tag type of union to union" {
309 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;307 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
310 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;308 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
311 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO309 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
312 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
313310
314 var x: Value2 = Letter2.B;311 var x: Value2 = Letter2.B;
315 try expect(@as(Letter2, x) == Letter2.B);312 try expect(@as(Letter2, x) == Letter2.B);
...@@ -325,7 +322,6 @@ test "implicit cast union to its tag type" {...@@ -325,7 +322,6 @@ test "implicit cast union to its tag type" {
325 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;322 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
326 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;323 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
327 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO324 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
328 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
329325
330 var x: Value2 = Letter2.B;326 var x: Value2 = Letter2.B;
331 try expect(x == Letter2.B);327 try expect(x == Letter2.B);
...@@ -422,7 +418,6 @@ test "tagged union with no payloads" {...@@ -422,7 +418,6 @@ test "tagged union with no payloads" {
422418
423test "union with only 1 field casted to its enum type" {419test "union with only 1 field casted to its enum type" {
424 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO420 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
425 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
426421
427 const Literal = union(enum) {422 const Literal = union(enum) {
428 Number: f64,423 Number: f64,
...@@ -736,7 +731,6 @@ test "@enumToInt works on unions" {...@@ -736,7 +731,6 @@ test "@enumToInt works on unions" {
736 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO731 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
737 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO732 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
738 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO733 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
739 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
740734
741 const Bar = union(enum) {735 const Bar = union(enum) {
742 A: bool,736 A: bool,
...@@ -959,7 +953,6 @@ test "function call result coerces from tagged union to the tag" {...@@ -959,7 +953,6 @@ test "function call result coerces from tagged union to the tag" {
959 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO953 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
960 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO954 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
961 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO955 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
962 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
963956
964 const S = struct {957 const S = struct {
965 const Arch = union(enum) {958 const Arch = union(enum) {
...@@ -1467,8 +1460,6 @@ test "packed union in packed struct" {...@@ -1467,8 +1460,6 @@ test "packed union in packed struct" {
1467}1460}
14681461
1469test "Namespace-like union" {1462test "Namespace-like union" {
1470 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1471
1472 const DepType = enum {1463 const DepType = enum {
1473 git,1464 git,
1474 http,1465 http,