Merge pull request #17293 from Snektron/spirv-aaaa

spirv: more instructions

Author: Snektron

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-# Autodoc 
+# Autodoc
 /src/Autodoc.zig  @kristoff-it
 /src/autodoc/*    @kristoff-it
 /lib/docs/*       @kristoff-it
@@ -11,3 +11,6 @@
 
 # resinator
 /src/resinator/* @squeek502
+
+# SPIR-V selfhosted backend
+/src/codegen/spirv* @Snektron

lib/std/testing.zig

@@ -21,11 +21,15 @@ pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");
 /// TODO https://github.com/ziglang/zig/issues/5738
 pub var log_level = std.log.Level.warn;
 
-fn print(comptime fmt: []const u8, args: anytype) void {
-    // Disable printing in tests for simple backends.
-    if (builtin.zig_backend == .stage2_spirv64) return;
+// Disable printing in tests for simple backends.
+pub const backend_can_print = builtin.zig_backend != .stage2_spirv64;
 
-    std.debug.print(fmt, args);
+fn print(comptime fmt: []const u8, args: anytype) void {
+    if (@inComptime()) {
+        @compileError(std.fmt.comptimePrint(fmt, args));
+    } else if (backend_can_print) {
+        std.debug.print(fmt, args);
+    }
 }
 
 /// This function is intended to be used only in tests. It prints diagnostics to stderr
@@ -300,6 +304,10 @@ pub fn expectEqualSlices(comptime T: type, expected: []const T, actual: []const
         break :diff_index if (expected.len == actual.len) return else shortest;
     };
 
+    if (!backend_can_print) {
+        return error.TestExpectedEqual;
+    }
+
     print("slices differ. first difference occurs at index {d} (0x{X})\n", .{ diff_index, diff_index });
 
     // TODO: Should this be configurable by the caller?

src/InternPool.zig

@@ -1556,20 +1556,25 @@ pub const Key = union(enum) {
                     // These are strange: we'll sometimes represent them as f128, even if the
                     // underlying type is smaller. f80 is an exception: see float_c_longdouble_f80.
                     const a_val = switch (a_info.storage) {
-                        inline else => |val| @as(f128, @floatCast(val)),
+                        inline else => |val| @as(u128, @bitCast(@as(f128, @floatCast(val)))),
                     };
                     const b_val = switch (b_info.storage) {
-                        inline else => |val| @as(f128, @floatCast(val)),
+                        inline else => |val| @as(u128, @bitCast(@as(f128, @floatCast(val)))),
                     };
                     return a_val == b_val;
                 }
 
                 const StorageTag = @typeInfo(Key.Float.Storage).Union.tag_type.?;
                 assert(@as(StorageTag, a_info.storage) == @as(StorageTag, b_info.storage));
 
-                return switch (a_info.storage) {
-                    inline else => |val, tag| val == @field(b_info.storage, @tagName(tag)),
-                };
+                switch (a_info.storage) {
+                    inline else => |val, tag| {
+                        const Bits = std.meta.Int(.unsigned, @bitSizeOf(@TypeOf(val)));
+                        const a_bits: Bits = @bitCast(val);
+                        const b_bits: Bits = @bitCast(@field(b_info.storage, @tagName(tag)));
+                        return a_bits == b_bits;
+                    },
+                }
             },
 
             .opaque_type => |a_info| {

src/arch/wasm/CodeGen.zig

@@ -6253,8 +6253,10 @@ fn airMulWithOverflow(func: *CodeGen, inst: Air.Inst.Index) InnerError!void {
     func.finishAir(inst, result_ptr, &.{ extra.lhs, extra.rhs });
 }
 
-fn airMaxMin(func: *CodeGen, inst: Air.Inst.Index, op: enum { max, min }) InnerError!void {
+fn airMaxMin(func: *CodeGen, inst: Air.Inst.Index, op: Op) InnerError!void {
+    assert(op == .max or op == .min);
     const mod = func.bin_file.base.options.module.?;
+    const target = mod.getTarget();
     const bin_op = func.air.instructions.items(.data)[inst].bin_op;
 
     const ty = func.typeOfIndex(inst);
@@ -6269,13 +6271,25 @@ fn airMaxMin(func: *CodeGen, inst: Air.Inst.Index, op: enum { max, min }) InnerE
     const lhs = try func.resolveInst(bin_op.lhs);
     const rhs = try func.resolveInst(bin_op.rhs);
 
-    // operands to select from
-    try func.lowerToStack(lhs);
-    try func.lowerToStack(rhs);
-    _ = try func.cmp(lhs, rhs, ty, if (op == .max) .gt else .lt);
+    if (ty.zigTypeTag(mod) == .Float) {
+        var fn_name_buf: [64]u8 = undefined;
+        const float_bits = ty.floatBits(target);
+        const fn_name = std.fmt.bufPrint(&fn_name_buf, "{s}f{s}{s}", .{
+            target_util.libcFloatPrefix(float_bits),
+            @tagName(op),
+            target_util.libcFloatSuffix(float_bits),
+        }) catch unreachable;
+        const result = try func.callIntrinsic(fn_name, &.{ ty.ip_index, ty.ip_index }, ty, &.{ lhs, rhs });
+        try func.lowerToStack(result);
+    } else {
+        // operands to select from
+        try func.lowerToStack(lhs);
+        try func.lowerToStack(rhs);
+        _ = try func.cmp(lhs, rhs, ty, if (op == .max) .gt else .lt);
 
-    // based on the result from comparison, return operand 0 or 1.
-    try func.addTag(.select);
+        // based on the result from comparison, return operand 0 or 1.
+        try func.addTag(.select);
+    }
 
     // store result in local
     const result_ty = if (isByRef(ty, mod)) Type.u32 else ty;

src/codegen/llvm.zig

@@ -3050,6 +3050,7 @@ pub const Object = struct {
         decl_val: InternPool.Index,
         llvm_addr_space: Builder.AddrSpace,
     ) Error!Builder.Variable.Index {
+        // TODO: Add address space to the anon_decl_map
         const gop = try o.anon_decl_map.getOrPut(o.gpa, decl_val);
         if (gop.found_existing) return gop.value_ptr.ptr(&o.builder).kind.variable;
         errdefer assert(o.anon_decl_map.remove(decl_val));