From 6ece807bed5191fc11903fce1b77a7bcdd93d518 Mon Sep 17 00:00:00 2001 From: r00ster91 Date: Wed, 7 Dec 2022 18:04:42 +0100 Subject: [PATCH] aarch64: reenable tests that are no longer regressed Closes #12012 Closes #12013 Closes #10627 Closes #12027 --- lib/std/fmt/parse_float.zig | 5 ----- lib/std/math.zig | 20 -------------------- lib/std/simd.zig | 4 ---- test/behavior/atomics.zig | 11 ----------- test/behavior/math.zig | 6 ------ test/behavior/vector.zig | 6 ------ 6 files changed, 52 deletions(-) diff --git a/lib/std/fmt/parse_float.zig b/lib/std/fmt/parse_float.zig index 427ac727c9fb..b84b22272156 100644 --- a/lib/std/fmt/parse_float.zig +++ b/lib/std/fmt/parse_float.zig @@ -70,11 +70,6 @@ test "fmt.parseFloat" { } test "fmt.parseFloat nan and inf" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12027 - return error.SkipZigTest; - } - inline for ([_]type{ f16, f32, f64, f128 }) |T| { const Z = std.meta.Int(.unsigned, @typeInfo(T).Float.bits); diff --git a/lib/std/math.zig b/lib/std/math.zig index fdc82257090e..f9233ac99b84 100644 --- a/lib/std/math.zig +++ b/lib/std/math.zig @@ -528,10 +528,6 @@ pub fn shl(comptime T: type, a: T, shift_amt: anytype) T { } test "shl" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } try testing.expect(shl(u8, 0b11111111, @as(usize, 3)) == 0b11111000); try testing.expect(shl(u8, 0b11111111, @as(usize, 8)) == 0); try testing.expect(shl(u8, 0b11111111, @as(usize, 9)) == 0); @@ -572,10 +568,6 @@ pub fn shr(comptime T: type, a: T, shift_amt: anytype) T { } test "shr" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } try testing.expect(shr(u8, 0b11111111, @as(usize, 3)) == 0b00011111); try testing.expect(shr(u8, 0b11111111, @as(usize, 8)) == 0); try testing.expect(shr(u8, 0b11111111, @as(usize, 9)) == 0); @@ -617,10 +609,6 @@ pub fn rotr(comptime T: type, x: T, r: anytype) T { } test "rotr" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } try testing.expect(rotr(u0, 0b0, @as(usize, 3)) == 0b0); try testing.expect(rotr(u5, 0b00001, @as(usize, 0)) == 0b00001); try testing.expect(rotr(u6, 0b000001, @as(usize, 7)) == 0b100000); @@ -661,10 +649,6 @@ pub fn rotl(comptime T: type, x: T, r: anytype) T { } test "rotl" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } try testing.expect(rotl(u0, 0b0, @as(usize, 3)) == 0b0); try testing.expect(rotl(u5, 0b00001, @as(usize, 0)) == 0b00001); try testing.expect(rotl(u6, 0b000001, @as(usize, 7)) == 0b000010); @@ -1687,10 +1671,6 @@ fn testSign() !void { } test "sign" { - if (builtin.zig_backend == .stage2_llvm) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } try testSign(); comptime try testSign(); } diff --git a/lib/std/simd.zig b/lib/std/simd.zig index 95de3cc11cab..2179cb496e26 100644 --- a/lib/std/simd.zig +++ b/lib/std/simd.zig @@ -191,10 +191,6 @@ pub fn extract( } test "vector patterns" { - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } const base = @Vector(4, u32){ 10, 20, 30, 40 }; const other_base = @Vector(4, u32){ 55, 66, 77, 88 }; diff --git a/test/behavior/atomics.zig b/test/behavior/atomics.zig index 094be62bc714..ff15aa8dc021 100644 --- a/test/behavior/atomics.zig +++ b/test/behavior/atomics.zig @@ -151,11 +151,6 @@ test "cmpxchg on a global variable" { if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // https://github.com/ziglang/zig/issues/10627 - return error.SkipZigTest; - } - _ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic); try expect(a_global_variable == 42); } @@ -218,12 +213,6 @@ test "atomicrmw with floats" { if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO - if ((builtin.zig_backend == .stage2_llvm or builtin.zig_backend == .stage2_c) and - builtin.cpu.arch == .aarch64) - { - // https://github.com/ziglang/zig/issues/10627 - return error.SkipZigTest; - } try testAtomicRmwFloat(); comptime try testAtomicRmwFloat(); } diff --git a/test/behavior/math.zig b/test/behavior/math.zig index e07a252a4e20..2ad73df06076 100644 --- a/test/behavior/math.zig +++ b/test/behavior/math.zig @@ -161,12 +161,6 @@ test "@ctz vectors" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // This regressed with LLVM 14: - // https://github.com/ziglang/zig/issues/12013 - return error.SkipZigTest; - } - try testCtzVectors(); comptime try testCtzVectors(); } diff --git a/test/behavior/vector.zig b/test/behavior/vector.zig index ca38cb7ebcbb..f073a2b4bf12 100644 --- a/test/behavior/vector.zig +++ b/test/behavior/vector.zig @@ -174,12 +174,6 @@ test "tuple to vector" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { - // Regressed with LLVM 14: - // https://github.com/ziglang/zig/issues/12012 - return error.SkipZigTest; - } - const S = struct { fn doTheTest() !void { const Vec3 = @Vector(3, i32);