Skip to content

Commit

Permalink
Merge pull request #15748 from alichraghi/ali-spirv
Browse files Browse the repository at this point in the history 
spirv: lower get_union_tag
  • Loading branch information
@Vexu
Vexu authored May 20, 2023
2 parents 56d8a1c + d7ddaf6 commit 413ef3a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
27 changes: 22 additions & 5 deletions src/codegen/spirv.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,21 +1116,20 @@ pub const DeclGen = struct {
return self.todo("packed union types", .{});
}

const tag_ty_ref = try self.resolveType(union_ty.tag_ty, .indirect);
if (layout.payload_size == 0) {
// No payload, so represent this as just the tag type.
return tag_ty_ref;
return try self.resolveType(union_ty.tag_ty, .indirect);
}

var members = std.BoundedArray(SpvType.Payload.Struct.Member, 4){};

const has_tag = layout.tag_size != 0;
const tag_first = layout.tag_align >= layout.payload_align;
const tag_member = .{ .name = "tag", .ty = tag_ty_ref };
const u8_ty_ref = try self.intType(.unsigned, 8); // TODO: What if Int8Type is not enabled?

if (has_tag and tag_first) {
members.appendAssumeCapacity(tag_member);
const tag_ty_ref = try self.resolveType(union_ty.tag_ty, .indirect);
members.appendAssumeCapacity(.{ .name = "tag", .ty = tag_ty_ref });
}

const active_field = maybe_active_field orelse layout.most_aligned_field;
Expand All @@ -1149,7 +1148,8 @@ pub const DeclGen = struct {
}

if (has_tag and !tag_first) {
members.appendAssumeCapacity(tag_member);
const tag_ty_ref = try self.resolveType(union_ty.tag_ty, .indirect);
members.appendAssumeCapacity(.{ .name = "tag", .ty = tag_ty_ref });
}

if (layout.padding != 0) {
Expand Down Expand Up @@ -1735,6 +1735,7 @@ pub const DeclGen = struct {
.slice_elem_val => try self.airSliceElemVal(inst),
.ptr_elem_ptr => try self.airPtrElemPtr(inst),

.get_union_tag => try self.airGetUnionTag(inst),
.struct_field_val => try self.airStructFieldVal(inst),

.struct_field_ptr_index_0 => try self.airStructFieldPtrIndex(inst, 0),
Expand Down Expand Up @@ -2320,6 +2321,22 @@ pub const DeclGen = struct {
return result_id;
}

fn airGetUnionTag(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
const ty_op = self.air.instructions.items(.data)[inst].ty_op;
const un_ty = self.air.typeOf(ty_op.operand);

const target = self.module.getTarget();
const layout = un_ty.unionGetLayout(target);
if (layout.tag_size == 0) return null;

const union_handle = try self.resolve(ty_op.operand);
if (layout.payload_size == 0) return union_handle;

const tag_ty = un_ty.unionTagTypeSafety().?;
const tag_index = @boolToInt(layout.tag_align < layout.payload_align);
return try self.extractField(tag_ty, union_handle, tag_index);
}

fn airStructFieldVal(self: *DeclGen, inst: Air.Inst.Index) !?IdRef {
if (self.liveness.isUnused(inst)) return null;

Expand Down
1 change: 0 additions & 1 deletion test/behavior/enum.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,6 @@ test "enum literal casting to tagged union" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

const Arch = union(enum) {
x86_64,
Expand Down
2 changes: 0 additions & 2 deletions test/behavior/pub_enum.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ const other = @import("pub_enum/other.zig");
const expect = @import("std").testing.expect;

test "pub enum" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

try pubEnumTest(other.APubEnum.Two);
}
fn pubEnumTest(foo: other.APubEnum) !void {
Expand Down
9 changes: 0 additions & 9 deletions test/behavior/union.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ test "comparison between union and enum literal" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

try testComparison();
comptime try testComparison();
Expand All @@ -288,7 +287,6 @@ test "cast union to tag type of union" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

try testCastUnionToTag();
comptime try testCastUnionToTag();
Expand All @@ -309,7 +307,6 @@ test "cast tag type of union to union" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

var x: Value2 = Letter2.B;
try expect(@as(Letter2, x) == Letter2.B);
Expand All @@ -325,7 +322,6 @@ test "implicit cast union to its tag type" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

var x: Value2 = Letter2.B;
try expect(x == Letter2.B);
Expand Down Expand Up @@ -422,7 +418,6 @@ test "tagged union with no payloads" {

test "union with only 1 field casted to its enum type" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

const Literal = union(enum) {
Number: f64,
Expand Down Expand Up @@ -736,7 +731,6 @@ test "@enumToInt works on unions" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
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_spirv64) return error.SkipZigTest;

const Bar = union(enum) {
A: bool,
Expand Down Expand Up @@ -959,7 +953,6 @@ test "function call result coerces from tagged union to the tag" {
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
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_spirv64) return error.SkipZigTest;

const S = struct {
const Arch = union(enum) {
Expand Down Expand Up @@ -1467,8 +1460,6 @@ test "packed union in packed struct" {
}

test "Namespace-like union" {
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

const DepType = enum {
git,
http,
Expand Down

0 comments on commit 413ef3a

Please sign in to comment.