Commit b58d8aa05f01e53003be32f220548cba69cf25dd | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-09-16 21:57:46-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-09-16 21:57:46-07:00
log	b58d8aa05f01e53003be32f220548cba69cf25dd
tree	55f6bbc18b10fc19ccc290935899576e7c4c4dd7
parent	091a98f524b41cac1fb299cdfdf911ae3b31c6ae

stage2: improve LLVM backend for enums

 * support lowering enum types and constants to LLVM IR
 * fix cmp instruction to support enum operands

3 files changed, 59 insertions(+), 32 deletions(-)

src
- codegen
  - llvm.zig
test
- behavior
  - atomics.zig
  - atomics_stage1.zig

src/codegen/llvm.zig+47-16

 @@ -588,6 +588,12 @@ pub const DeclGen = struct {
                 const info = t.intInfo(self.module.getTarget());
                 return self.context.intType(info.bits);
             },
+            .Enum => {
+                var buffer: Type.Payload.Bits = undefined;
+                const int_ty = t.enumTagType(&buffer);
+                const bit_count = int_ty.intInfo(self.module.getTarget()).bits;
+                return self.context.intType(bit_count);
+            },
             .Float => switch (t.floatBits(self.module.getTarget())) {
                 16 => return self.context.halfType(),
                 32 => return self.context.floatType(),
 @@ -686,7 +692,6 @@ pub const DeclGen = struct {
             .BoundFn => @panic("TODO remove BoundFn from the language"),
-            .Enum,
             .Union,
             .Opaque,
             .Frame,
 @@ -723,6 +728,17 @@ pub const DeclGen = struct {
                 }
                 return llvm_int;
             },
+            .Enum => {
+                const llvm_type = try self.llvmType(tv.ty);
+                const uint: u64 = uint: {
+                    if (tv.val.castTag(.enum_field_index)) |payload| {
+                        break :uint payload.data;
+                    }
+                    break :uint tv.val.toUnsignedInt();
+                };
+                const llvm_int = llvm_type.constInt(uint, .False);
+                return llvm_int;
+            },
             .Float => {
                 if (tv.ty.floatBits(self.module.getTarget()) <= 64) {
                     const llvm_ty = try self.llvmType(tv.ty);
 @@ -907,7 +923,18 @@ pub const DeclGen = struct {
             .ComptimeFloat => unreachable,
             .Type => unreachable,
             .EnumLiteral => unreachable,
-            else => return self.todo("implement const of type '{}'", .{tv.ty}),
+            .Void => unreachable,
+            .NoReturn => unreachable,
+            .Undefined => unreachable,
+            .Null => unreachable,
+            .BoundFn => unreachable,
+            .Opaque => unreachable,
+            .Union,
+            .Frame,
+            .AnyFrame,
+            .Vector,
+            => return self.todo("implement const of type '{}'", .{tv.ty}),
         }
     }
 @@ -1195,21 +1222,15 @@ pub const FuncGen = struct {
         const bin_op = self.air.instructions.items(.data)[inst].bin_op;
         const lhs = try self.resolveInst(bin_op.lhs);
         const rhs = try self.resolveInst(bin_op.rhs);
-        const inst_ty = self.air.typeOfIndex(inst);
+        const operand_ty = self.air.typeOf(bin_op.lhs);
-        switch (self.air.typeOf(bin_op.lhs).zigTypeTag()) {
+        const int_ty = switch (operand_ty.zigTypeTag()) {
-            .Int, .Bool, .Pointer, .ErrorSet => {
+            .Enum => blk: {
-                const is_signed = inst_ty.isSignedInt();
+                var buffer: Type.Payload.Bits = undefined;
-                const operation = switch (op) {
+                const int_ty = operand_ty.enumTagType(&buffer);
-                    .eq => .EQ,
+                break :blk int_ty;
-                    .neq => .NE,
-                    .lt => @as(llvm.IntPredicate, if (is_signed) .SLT else .ULT),
-                    .lte => @as(llvm.IntPredicate, if (is_signed) .SLE else .ULE),
-                    .gt => @as(llvm.IntPredicate, if (is_signed) .SGT else .UGT),
-                    .gte => @as(llvm.IntPredicate, if (is_signed) .SGE else .UGE),
-                };
-                return self.builder.buildICmp(operation, lhs, rhs, "");
             },
+            .Int, .Bool, .Pointer, .ErrorSet => operand_ty,
             .Float => {
                 const operation: llvm.RealPredicate = switch (op) {
                     .eq => .OEQ,
 @@ -1222,7 +1243,17 @@ pub const FuncGen = struct {
                 return self.builder.buildFCmp(operation, lhs, rhs, "");
             },
             else => unreachable,
-        }
+        };
+        const is_signed = int_ty.isSignedInt();
+        const operation = switch (op) {
+            .eq => .EQ,
+            .neq => .NE,
+            .lt => @as(llvm.IntPredicate, if (is_signed) .SLT else .ULT),
+            .lte => @as(llvm.IntPredicate, if (is_signed) .SLE else .ULE),
+            .gt => @as(llvm.IntPredicate, if (is_signed) .SGT else .UGT),
+            .gte => @as(llvm.IntPredicate, if (is_signed) .SGE else .UGE),
+        };
+        return self.builder.buildICmp(operation, lhs, rhs, "");
     }
     fn airBlock(self: *FuncGen, inst: Air.Inst.Index) !?*const llvm.Value {

test/behavior/atomics.zig+12

...	@@ -118,3 +118,15 @@ test "cmpxchg on a global variable" {	...	@@ -118,3 +118,15 @@ test "cmpxchg on a global variable" {
118	_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);	118	_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);
119	try expect(a_global_variable == 42);	119	try expect(a_global_variable == 42);
120	}	120	}
		121
		122	test "atomic load and rmw with enum" {
		123	const Value = enum(u8) { a, b, c };
		124	var x = Value.a;
		125
		126	try expect(@atomicLoad(Value, &x, .SeqCst) != .b);
		127
		128	_ = @atomicRmw(Value, &x, .Xchg, .c, .SeqCst);
		129	try expect(@atomicLoad(Value, &x, .SeqCst) == .c);
		130	try expect(@atomicLoad(Value, &x, .SeqCst) != .a);
		131	try expect(@atomicLoad(Value, &x, .SeqCst) != .b);
		132	}

test/behavior/atomics_stage1.zig-16

...	@@ -3,22 +3,6 @@ const expect = std.testing.expect;	...	@@ -3,22 +3,6 @@ const expect = std.testing.expect;
3	const expectEqual = std.testing.expectEqual;	3	const expectEqual = std.testing.expectEqual;
4	const builtin = @import("builtin");	4	const builtin = @import("builtin");
5		5
6	test "atomic load and rmw with enum" {
7	const Value = enum(u8) {
8	a,
9	b,
10	c,
11	};
12	var x = Value.a;
13
14	try expect(@atomicLoad(Value, &x, .SeqCst) != .b);
15
16	_ = @atomicRmw(Value, &x, .Xchg, .c, .SeqCst);
17	try expect(@atomicLoad(Value, &x, .SeqCst) == .c);
18	try expect(@atomicLoad(Value, &x, .SeqCst) != .a);
19	try expect(@atomicLoad(Value, &x, .SeqCst) != .b);
20	}
21
22	test "atomic store" {	6	test "atomic store" {
23	var x: u32 = 0;	7	var x: u32 = 0;
24	@atomicStore(u32, &x, 1, .SeqCst);	8	@atomicStore(u32, &x, 1, .SeqCst);