Skip to content

Commit 2441922

Browse files
committed
aarch64: reenable tests that are no longer regressed
Closes ziglang#12012 Closes ziglang#12013 Closes ziglang#10627 Closes ziglang#12027
1 parent 49daa30 commit 2441922

File tree

6 files changed

+0
-52
lines changed

6 files changed

+0
-52
lines changed

lib/std/fmt/parse_float.zig

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ test "fmt.parseFloat" {
7070
}
7171

7272
test "fmt.parseFloat nan and inf" {
73-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
74-
// https://github.com/ziglang/zig/issues/12027
75-
return error.SkipZigTest;
76-
}
77-
7873
inline for ([_]type{ f16, f32, f64, f128 }) |T| {
7974
const Z = std.meta.Int(.unsigned, @typeInfo(T).Float.bits);
8075

lib/std/math.zig

-20
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,6 @@ pub fn shl(comptime T: type, a: T, shift_amt: anytype) T {
528528
}
529529

530530
test "shl" {
531-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
532-
// https://github.com/ziglang/zig/issues/12012
533-
return error.SkipZigTest;
534-
}
535531
try testing.expect(shl(u8, 0b11111111, @as(usize, 3)) == 0b11111000);
536532
try testing.expect(shl(u8, 0b11111111, @as(usize, 8)) == 0);
537533
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 {
572568
}
573569

574570
test "shr" {
575-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
576-
// https://github.com/ziglang/zig/issues/12012
577-
return error.SkipZigTest;
578-
}
579571
try testing.expect(shr(u8, 0b11111111, @as(usize, 3)) == 0b00011111);
580572
try testing.expect(shr(u8, 0b11111111, @as(usize, 8)) == 0);
581573
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 {
617609
}
618610

619611
test "rotr" {
620-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
621-
// https://github.com/ziglang/zig/issues/12012
622-
return error.SkipZigTest;
623-
}
624612
try testing.expect(rotr(u0, 0b0, @as(usize, 3)) == 0b0);
625613
try testing.expect(rotr(u5, 0b00001, @as(usize, 0)) == 0b00001);
626614
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 {
661649
}
662650

663651
test "rotl" {
664-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
665-
// https://github.com/ziglang/zig/issues/12012
666-
return error.SkipZigTest;
667-
}
668652
try testing.expect(rotl(u0, 0b0, @as(usize, 3)) == 0b0);
669653
try testing.expect(rotl(u5, 0b00001, @as(usize, 0)) == 0b00001);
670654
try testing.expect(rotl(u6, 0b000001, @as(usize, 7)) == 0b000010);
@@ -1687,10 +1671,6 @@ fn testSign() !void {
16871671
}
16881672

16891673
test "sign" {
1690-
if (builtin.zig_backend == .stage2_llvm) {
1691-
// https://github.com/ziglang/zig/issues/12012
1692-
return error.SkipZigTest;
1693-
}
16941674
try testSign();
16951675
comptime try testSign();
16961676
}

lib/std/simd.zig

-4
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,6 @@ pub fn extract(
191191
}
192192

193193
test "vector patterns" {
194-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
195-
// https://github.com/ziglang/zig/issues/12012
196-
return error.SkipZigTest;
197-
}
198194
const base = @Vector(4, u32){ 10, 20, 30, 40 };
199195
const other_base = @Vector(4, u32){ 55, 66, 77, 88 };
200196

test/behavior/atomics.zig

-11
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@ test "cmpxchg on a global variable" {
151151
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
152152
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
153153

154-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
155-
// https://github.com/ziglang/zig/issues/10627
156-
return error.SkipZigTest;
157-
}
158-
159154
_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);
160155
try expect(a_global_variable == 42);
161156
}
@@ -218,12 +213,6 @@ test "atomicrmw with floats" {
218213
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
219214
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
220215

221-
if ((builtin.zig_backend == .stage2_llvm or builtin.zig_backend == .stage2_c) and
222-
builtin.cpu.arch == .aarch64)
223-
{
224-
// https://github.com/ziglang/zig/issues/10627
225-
return error.SkipZigTest;
226-
}
227216
try testAtomicRmwFloat();
228217
comptime try testAtomicRmwFloat();
229218
}

test/behavior/math.zig

-6
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,6 @@ test "@ctz vectors" {
161161
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
162162
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
163163

164-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
165-
// This regressed with LLVM 14:
166-
// https://github.com/ziglang/zig/issues/12013
167-
return error.SkipZigTest;
168-
}
169-
170164
try testCtzVectors();
171165
comptime try testCtzVectors();
172166
}

test/behavior/vector.zig

-6
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,6 @@ test "tuple to vector" {
174174
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
175175
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
176176

177-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
178-
// Regressed with LLVM 14:
179-
// https://github.com/ziglang/zig/issues/12012
180-
return error.SkipZigTest;
181-
}
182-
183177
const S = struct {
184178
fn doTheTest() !void {
185179
const Vec3 = @Vector(3, i32);

0 commit comments

Comments
 (0)