Skip to content

Commit 5ca1753

Browse files
committed
Revert "aarch64: reenable tests that are no longer regressed"
This reverts commit 3370d58. This commit was done with an LLVM build that did not have assertions enabled. There are LLVM assertions being triggered due to this commit. Reopens #10627 Reopens #12013 Reopens #12027
1 parent 3f1cfcb commit 5ca1753

File tree

6 files changed

+48
-0
lines changed

6 files changed

+48
-0
lines changed

lib/std/fmt/parse_float.zig

+5
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ 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+
7378
inline for ([_]type{ f16, f32, f64, f128 }) |T| {
7479
const Z = std.meta.Int(.unsigned, @typeInfo(T).Float.bits);
7580

lib/std/math.zig

+16
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,10 @@ pub fn shl(comptime T: type, a: T, shift_amt: anytype) T {
530530
}
531531

532532
test "shl" {
533+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
534+
// https://github.com/ziglang/zig/issues/12012
535+
return error.SkipZigTest;
536+
}
533537
try testing.expect(shl(u8, 0b11111111, @as(usize, 3)) == 0b11111000);
534538
try testing.expect(shl(u8, 0b11111111, @as(usize, 8)) == 0);
535539
try testing.expect(shl(u8, 0b11111111, @as(usize, 9)) == 0);
@@ -570,6 +574,10 @@ pub fn shr(comptime T: type, a: T, shift_amt: anytype) T {
570574
}
571575

572576
test "shr" {
577+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
578+
// https://github.com/ziglang/zig/issues/12012
579+
return error.SkipZigTest;
580+
}
573581
try testing.expect(shr(u8, 0b11111111, @as(usize, 3)) == 0b00011111);
574582
try testing.expect(shr(u8, 0b11111111, @as(usize, 8)) == 0);
575583
try testing.expect(shr(u8, 0b11111111, @as(usize, 9)) == 0);
@@ -611,6 +619,10 @@ pub fn rotr(comptime T: type, x: T, r: anytype) T {
611619
}
612620

613621
test "rotr" {
622+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
623+
// https://github.com/ziglang/zig/issues/12012
624+
return error.SkipZigTest;
625+
}
614626
try testing.expect(rotr(u0, 0b0, @as(usize, 3)) == 0b0);
615627
try testing.expect(rotr(u5, 0b00001, @as(usize, 0)) == 0b00001);
616628
try testing.expect(rotr(u6, 0b000001, @as(usize, 7)) == 0b100000);
@@ -651,6 +663,10 @@ pub fn rotl(comptime T: type, x: T, r: anytype) T {
651663
}
652664

653665
test "rotl" {
666+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
667+
// https://github.com/ziglang/zig/issues/12012
668+
return error.SkipZigTest;
669+
}
654670
try testing.expect(rotl(u0, 0b0, @as(usize, 3)) == 0b0);
655671
try testing.expect(rotl(u5, 0b00001, @as(usize, 0)) == 0b00001);
656672
try testing.expect(rotl(u6, 0b000001, @as(usize, 7)) == 0b000010);

lib/std/simd.zig

+4
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ 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+
}
194198
const base = @Vector(4, u32){ 10, 20, 30, 40 };
195199
const other_base = @Vector(4, u32){ 55, 66, 77, 88 };
196200

test/behavior/atomics.zig

+11
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ 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+
154159
_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);
155160
try expect(a_global_variable == 42);
156161
}
@@ -213,6 +218,12 @@ test "atomicrmw with floats" {
213218
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
214219
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
215220

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+
}
216227
try testAtomicRmwFloat();
217228
comptime try testAtomicRmwFloat();
218229
}

test/behavior/math.zig

+6
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ test "@ctz vectors" {
166166
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
167167
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
168168

169+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
170+
// This regressed with LLVM 14:
171+
// https://github.com/ziglang/zig/issues/12013
172+
return error.SkipZigTest;
173+
}
174+
169175
try testCtzVectors();
170176
comptime try testCtzVectors();
171177
}

test/behavior/vector.zig

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ test "tuple to vector" {
181181
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
182182
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
183183

184+
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
185+
// Regressed with LLVM 14:
186+
// https://github.com/ziglang/zig/issues/12012
187+
return error.SkipZigTest;
188+
}
189+
184190
const S = struct {
185191
fn doTheTest() !void {
186192
const Vec3 = @Vector(3, i32);

0 commit comments

Comments
 (0)