stage2-wasm: fix div and rem

3 files changed, 78 insertions, 186 deletions

diff --git a/test/behavior/int_div.zig b/test/behavior/int_div.zig
deleted file mode 100644
index e9aac82240..0000000000
--- a/test/behavior/int_div.zig
+++ /dev/null
@@ -1,115 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const expect = std.testing.expect;
-
-test "integer division" {
-    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
-
-    try testDivision();
-    try comptime testDivision();
-}
-fn testDivision() !void {
-    try expect(div(u32, 13, 3) == 4);
-    try expect(div(u64, 13, 3) == 4);
-    try expect(div(u8, 13, 3) == 4);
-
-    try expect(divExact(u32, 55, 11) == 5);
-    try expect(divExact(i32, -55, 11) == -5);
-    try expect(divExact(i64, -55, 11) == -5);
-    try expect(divExact(i16, -55, 11) == -5);
-
-    try expect(divFloor(i8, 5, 3) == 1);
-    try expect(divFloor(i16, -5, 3) == -2);
-    try expect(divFloor(i64, -0x80000000, -2) == 0x40000000);
-    try expect(divFloor(i32, 0, -0x80000000) == 0);
-    try expect(divFloor(i64, -0x40000001, 0x40000000) == -2);
-    try expect(divFloor(i32, -0x80000000, 1) == -0x80000000);
-    try expect(divFloor(i32, 10, 12) == 0);
-    try expect(divFloor(i32, -14, 12) == -2);
-    try expect(divFloor(i32, -2, 12) == -1);
-
-    try expect(divTrunc(i32, 5, 3) == 1);
-    try expect(divTrunc(i32, -5, 3) == -1);
-    try expect(divTrunc(i32, 9, -10) == 0);
-    try expect(divTrunc(i32, -9, 10) == 0);
-    try expect(divTrunc(i32, 10, 12) == 0);
-    try expect(divTrunc(i32, -14, 12) == -1);
-    try expect(divTrunc(i32, -2, 12) == 0);
-
-    try expect(mod(u32, 10, 12) == 10);
-    try expect(mod(i32, 10, 12) == 10);
-    try expect(mod(i64, -14, 12) == 10);
-    try expect(mod(i16, -2, 12) == 10);
-    try expect(mod(i8, -2, 12) == 10);
-
-    try expect(rem(i32, 10, 12) == 10);
-    try expect(rem(i32, -14, 12) == -2);
-    try expect(rem(i32, -2, 12) == -2);
-
-    comptime {
-        try expect(
-            1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600,
-        );
-        try expect(
-            @rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600,
-        );
-        try expect(
-            1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2,
-        );
-        try expect(
-            @divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2,
-        );
-        try expect(
-            @divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2,
-        );
-        try expect(
-            @divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2,
-        );
-        try expect(
-            4126227191251978491697987544882340798050766755606969681711 % 10 == 1,
-        );
-    }
-}
-fn div(comptime T: type, a: T, b: T) T {
-    return a / b;
-}
-fn divExact(comptime T: type, a: T, b: T) T {
-    return @divExact(a, b);
-}
-fn divFloor(comptime T: type, a: T, b: T) T {
-    return @divFloor(a, b);
-}
-fn divTrunc(comptime T: type, a: T, b: T) T {
-    return @divTrunc(a, b);
-}
-fn mod(comptime T: type, a: T, b: T) T {
-    return @mod(a, b);
-}
-fn rem(comptime T: type, a: T, b: T) T {
-    return @rem(a, b);
-}
-
-test "large integer division" {
-    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
-
-    {
-        var numerator: u256 = 99999999999999999997315645440;
-        var divisor: u256 = 10000000000000000000000000000;
-        _ = .{ &numerator, &divisor };
-        try expect(numerator / divisor == 9);
-    }
-    {
-        var numerator: u256 = 99999999999999999999000000000000000000000;
-        var divisor: u256 = 10000000000000000000000000000000000000000;
-        _ = .{ &numerator, &divisor };
-        try expect(numerator / divisor == 9);
-    }
-}
diff --git a/test/behavior/math.zig b/test/behavior/math.zig
index fefcf4b0e8..6ff4380a44 100644
--- a/test/behavior/math.zig
+++ b/test/behavior/math.zig
@@ -439,7 +439,7 @@ test "division" {
     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_wasm) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
     if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
 
@@ -448,23 +448,25 @@ test "division" {
         return error.SkipZigTest;
     }
 
-    try testDivision();
-    try comptime testDivision();
+    try testIntDivision();
+    try comptime testIntDivision();
+
+    try testFloatDivision();
+    try comptime testFloatDivision();
 }
 
-fn testDivision() !void {
+fn testIntDivision() !void {
     try expect(div(u32, 13, 3) == 4);
-    try expect(div(f32, 1.0, 2.0) == 0.5);
+    try expect(div(u64, 13, 3) == 4);
+    try expect(div(u8, 13, 3) == 4);
 
     try expect(divExact(u32, 55, 11) == 5);
     try expect(divExact(i32, -55, 11) == -5);
-    try expect(divExact(f32, 55.0, 11.0) == 5.0);
-    try expect(divExact(f32, -55.0, 11.0) == -5.0);
+    try expect(divExact(i64, -55, 11) == -5);
+    try expect(divExact(i16, -55, 11) == -5);
 
     try expect(divFloor(i32, 5, 3) == 1);
     try expect(divFloor(i32, -5, 3) == -2);
-    try expect(divFloor(f32, 5.0, 3.0) == 1.0);
-    try expect(divFloor(f32, -5.0, 3.0) == -2.0);
     try expect(divFloor(i32, -0x80000000, -2) == 0x40000000);
     try expect(divFloor(i32, 0, -0x80000000) == 0);
     try expect(divFloor(i32, -0x40000001, 0x40000000) == -2);
@@ -473,18 +475,15 @@ fn testDivision() !void {
     try expect(divFloor(i32, -14, 12) == -2);
     try expect(divFloor(i32, -2, 12) == -1);
 
+    try expect(divFloor(i8, 5, 3) == 1);
+    try expect(divFloor(i16, -5, 3) == -2);
+    try expect(divFloor(i64, -0x80000000, -2) == 0x40000000);
+    try expect(divFloor(i64, -0x40000001, 0x40000000) == -2);
+
     try expect(divTrunc(i32, 5, 3) == 1);
     try expect(divTrunc(i32, -5, 3) == -1);
     try expect(divTrunc(i32, 9, -10) == 0);
     try expect(divTrunc(i32, -9, 10) == 0);
-    try expect(divTrunc(f32, 5.0, 3.0) == 1.0);
-    try expect(divTrunc(f32, -5.0, 3.0) == -1.0);
-    try expect(divTrunc(f32, 9.0, -10.0) == 0.0);
-    try expect(divTrunc(f32, -9.0, 10.0) == 0.0);
-    try expect(divTrunc(f64, 5.0, 3.0) == 1.0);
-    try expect(divTrunc(f64, -5.0, 3.0) == -1.0);
-    try expect(divTrunc(f64, 9.0, -10.0) == 0.0);
-    try expect(divTrunc(f64, -9.0, 10.0) == 0.0);
     try expect(divTrunc(i32, 10, 12) == 0);
     try expect(divTrunc(i32, -14, 12) == -1);
     try expect(divTrunc(i32, -2, 12) == 0);
@@ -496,6 +495,19 @@ fn testDivision() !void {
     try expect(mod(i32, -14, -12) == -2);
     try expect(mod(i32, -2, -12) == -2);
 
+    try expect(mod(i64, -118, 12) == 2);
+    try expect(mod(u32, 10, 12) == 10);
+    try expect(mod(i64, -14, 12) == 10);
+    try expect(mod(i16, -2, 12) == 10);
+    try expect(mod(i16, -118, 12) == 2);
+    try expect(mod(i8, -2, 12) == 10); // TODO: fails in x86_64
+
+    try expect(rem(i64, -118, 12) == -10);
+    try expect(rem(i32, 10, 12) == 10);
+    try expect(rem(i32, -14, 12) == -2);
+    try expect(rem(i32, -2, 12) == -2);
+    try expect(rem(i16, -118, 12) == -10);
+
     try expect(divTrunc(i20, 20, -5) == -4);
     try expect(divTrunc(i20, -20, -4) == 5);
 
@@ -524,6 +536,52 @@ fn testDivision() !void {
     }
 }
 
+fn testFloatDivision() !void {
+    try expect(div(f32, 1.0, 2.0) == 0.5);
+
+    try expect(divExact(f32, 55.0, 11.0) == 5.0);
+    try expect(divExact(f32, -55.0, 11.0) == -5.0);
+
+    try expect(divFloor(f32, 5.0, 3.0) == 1.0);
+    try expect(divFloor(f32, -5.0, 3.0) == -2.0);
+    try expect(divFloor(f32, 56.0, 9.0) == 6.0);
+    try expect(divFloor(f32, 1053.0, -41.0) == -26.0);
+    try expect(divFloor(f16, -43.0, 12.0) == -4.0);
+    try expect(divFloor(f64, -90.0, -9.0) == 10.0);
+
+    try expect(divTrunc(f32, 5.0, 3.0) == 1.0);
+    try expect(divTrunc(f32, -5.0, 3.0) == -1.0);
+    try expect(divTrunc(f32, 9.0, -10.0) == 0.0);
+    try expect(divTrunc(f32, -9.0, 10.0) == 0.0);
+    try expect(divTrunc(f64, 5.0, 3.0) == 1.0);
+    try expect(divTrunc(f64, -5.0, 3.0) == -1.0);
+    try expect(divTrunc(f64, 9.0, -10.0) == 0.0);
+    try expect(divTrunc(f64, -9.0, 10.0) == 0.0);
+}
+
+test "large integer division" {
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
+
+    {
+        var numerator: u256 = 99999999999999999997315645440;
+        var divisor: u256 = 10000000000000000000000000000;
+        _ = .{ &numerator, &divisor };
+        try expect(numerator / divisor == 9);
+    }
+    {
+        var numerator: u256 = 99999999999999999999000000000000000000000;
+        var divisor: u256 = 10000000000000000000000000000000000000000;
+        _ = .{ &numerator, &divisor };
+        try expect(numerator / divisor == 9);
+    }
+}
+
 test "division half-precision floats" {
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
@@ -564,6 +622,9 @@ fn divTrunc(comptime T: type, a: T, b: T) T {
 fn mod(comptime T: type, a: T, b: T) T {
     return @mod(a, b);
 }
+fn rem(comptime T: type, a: T, b: T) T {
+    return @rem(a, b);
+}
 
 test "unsigned wrapping" {
     if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
diff --git a/test/behavior/stage2_wasm_div.zig b/test/behavior/stage2_wasm_div.zig
deleted file mode 100644
index ed09578fab..0000000000
--- a/test/behavior/stage2_wasm_div.zig
+++ /dev/null
@@ -1,54 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const expect = std.testing.expect;
-
-test "wasm integer division" {
-    // This test is copied from int_div.zig, with additional test cases for @divFloor on floats.
-    // TODO: Remove this test once the division tests in math.zig and int_div.zig pass with the
-    // stage2 wasm backend.
-    if (builtin.zig_backend != .stage2_wasm) return error.SkipZigTest;
-
-    try testDivision();
-    try comptime testDivision();
-}
-fn testDivision() !void {
-    try expect(div(u32, 13, 3) == 4);
-    try expect(div(u64, 13, 3) == 4);
-    try expect(div(u8, 13, 3) == 4);
-
-    try expect(divFloor(i8, 5, 3) == 1);
-    try expect(divFloor(i16, -5, 3) == -2);
-    try expect(divFloor(i64, -0x80000000, -2) == 0x40000000);
-    try expect(divFloor(i32, 0, -0x80000000) == 0);
-    try expect(divFloor(i64, -0x40000001, 0x40000000) == -2);
-    try expect(divFloor(i32, -0x80000000, 1) == -0x80000000);
-    try expect(divFloor(i32, 10, 12) == 0);
-    try expect(divFloor(i32, -14, 12) == -2);
-    try expect(divFloor(i32, -2, 12) == -1);
-    try expect(divFloor(f32, 56.0, 9.0) == 6.0);
-    try expect(divFloor(f32, 1053.0, -41.0) == -26.0);
-    try expect(divFloor(f16, -43.0, 12.0) == -4.0);
-    try expect(divFloor(f64, -90.0, -9.0) == 10.0);
-
-    try expect(mod(u32, 10, 12) == 10);
-    try expect(mod(i32, 10, 12) == 10);
-    try expect(mod(i64, -14, 12) == 10);
-    try expect(mod(i16, -2, 12) == 10);
-    try expect(mod(i8, -2, 12) == 10);
-
-    try expect(rem(i32, 10, 12) == 10);
-    try expect(rem(i32, -14, 12) == -2);
-    try expect(rem(i32, -2, 12) == -2);
-}
-fn div(comptime T: type, a: T, b: T) T {
-    return a / b;
-}
-fn divFloor(comptime T: type, a: T, b: T) T {
-    return @divFloor(a, b);
-}
-fn mod(comptime T: type, a: T, b: T) T {
-    return @mod(a, b);
-}
-fn rem(comptime T: type, a: T, b: T) T {
-    return @rem(a, b);
-}