Skip to content

Commit 89bb833

Browse files
alexrpDivergentClouds
authored andcommitted
test: Re-enable a bunch of behavior tests with LLVM.
Closes ziglang#10627. Closes ziglang#12013. Closes ziglang#18034.
1 parent 965913a commit 89bb833

10 files changed

+2
-78
lines changed

test/behavior/align.zig

-4
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,6 @@ test "comptime alloc alignment" {
582582
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
583583
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
584584
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // flaky
585-
if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch == .x86) {
586-
// https://github.com/ziglang/zig/issues/18034
587-
return error.SkipZigTest;
588-
}
589585

590586
comptime var bytes1 = [_]u8{0};
591587
_ = &bytes1;

test/behavior/atomics.zig

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

155-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
156-
// https://github.com/ziglang/zig/issues/10627
157-
return error.SkipZigTest;
158-
}
159-
160155
_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .acquire, .monotonic);
161156
try expect(a_global_variable == 42);
162157
}
@@ -202,10 +197,6 @@ test "atomicrmw with floats" {
202197
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
203198
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
204199

205-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
206-
// https://github.com/ziglang/zig/issues/10627
207-
return error.SkipZigTest;
208-
}
209200
try testAtomicRmwFloat();
210201
try comptime testAtomicRmwFloat();
211202
}
@@ -306,9 +297,6 @@ test "atomicrmw with 128-bit ints" {
306297

307298
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
308299

309-
// TODO "ld.lld: undefined symbol: __sync_lock_test_and_set_16" on -mcpu x86_64
310-
if (builtin.cpu.arch == .x86_64 and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
311-
312300
try testAtomicRmwInt128(.signed);
313301
try testAtomicRmwInt128(.unsigned);
314302
try comptime testAtomicRmwInt128(.signed);

test/behavior/basic.zig

-4
Original file line numberDiff line numberDiff line change
@@ -1426,10 +1426,6 @@ test "allocation and looping over 3-byte integer" {
14261426
return error.SkipZigTest; // TODO
14271427
}
14281428

1429-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .wasm32) {
1430-
return error.SkipZigTest; // TODO
1431-
}
1432-
14331429
try expect(@sizeOf(u24) == 4);
14341430
try expect(@sizeOf([1]u24) == 4);
14351431
try expect(@alignOf(u24) == 4);

test/behavior/bitcast.zig

-5
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,6 @@ test "comptime @bitCast packed struct to int and back" {
343343
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
344344
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
345345

346-
if (builtin.zig_backend == .stage2_llvm and native_endian == .big) {
347-
// https://github.com/ziglang/zig/issues/13782
348-
return error.SkipZigTest;
349-
}
350-
351346
const S = packed struct {
352347
void: void = {},
353348
uint: u8 = 13,

test/behavior/call.zig

+2-4
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ test "forced tail call" {
275275
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
276276

277277
if (builtin.zig_backend == .stage2_llvm) {
278-
// Only attempt this test on targets we know have tail call support in LLVM.
279-
if (builtin.cpu.arch != .x86_64 and builtin.cpu.arch != .aarch64) {
278+
if (builtin.cpu.arch.isMIPS() or builtin.cpu.arch.isPowerPC() or builtin.cpu.arch.isWasm()) {
280279
return error.SkipZigTest;
281280
}
282281
}
@@ -311,8 +310,7 @@ test "inline call preserves tail call" {
311310
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
312311

313312
if (builtin.zig_backend == .stage2_llvm) {
314-
// Only attempt this test on targets we know have tail call support in LLVM.
315-
if (builtin.cpu.arch != .x86_64 and builtin.cpu.arch != .aarch64) {
313+
if (builtin.cpu.arch.isMIPS() or builtin.cpu.arch.isPowerPC() or builtin.cpu.arch.isWasm()) {
316314
return error.SkipZigTest;
317315
}
318316
}

test/behavior/floatop.zig

-10
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,6 @@ test "@trunc f16" {
13101310
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
13111311
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
13121312

1313-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isMIPS()) {
1314-
// https://github.com/ziglang/zig/issues/16846
1315-
return error.SkipZigTest;
1316-
}
1317-
13181313
try testTrunc(f16);
13191314
try comptime testTrunc(f16);
13201315
}
@@ -1326,11 +1321,6 @@ test "@trunc f32/f64" {
13261321
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
13271322
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
13281323

1329-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isMIPS()) {
1330-
// https://github.com/ziglang/zig/issues/16846
1331-
return error.SkipZigTest;
1332-
}
1333-
13341324
try testTrunc(f32);
13351325
try comptime testTrunc(f32);
13361326
try testTrunc(f64);

test/behavior/math.zig

-16
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,6 @@ test "@ctz vectors" {
194194
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
195195
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
196196

197-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
198-
// This regressed with LLVM 14:
199-
// https://github.com/ziglang/zig/issues/12013
200-
return error.SkipZigTest;
201-
}
202-
203197
try testCtzVectors();
204198
try comptime testCtzVectors();
205199
}
@@ -478,11 +472,6 @@ test "division" {
478472
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
479473
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
480474

481-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isMIPS()) {
482-
// https://github.com/ziglang/zig/issues/16846
483-
return error.SkipZigTest;
484-
}
485-
486475
try testIntDivision();
487476
try comptime testIntDivision();
488477

@@ -721,11 +710,6 @@ test "unsigned 64-bit division" {
721710
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
722711
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
723712

724-
if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isMIPS()) {
725-
// https://github.com/ziglang/zig/issues/16846
726-
return error.SkipZigTest;
727-
}
728-
729713
try test_u64_div();
730714
try comptime test_u64_div();
731715
}

test/behavior/shuffle.zig

-5
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,6 @@ test "@shuffle bool 2" {
170170
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
171171
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
172172

173-
if (builtin.zig_backend == .stage2_llvm) {
174-
// https://github.com/ziglang/zig/issues/3246
175-
return error.SkipZigTest;
176-
}
177-
178173
const S = struct {
179174
fn doTheTest() !void {
180175
var x: @Vector(3, bool) = [3]bool{ false, true, false };

test/behavior/threadlocal.zig

-12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ test "thread local variable" {
66
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
77
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
88
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
9-
if (builtin.zig_backend == .stage2_llvm) switch (builtin.cpu.arch) {
10-
.x86_64, .x86 => {},
11-
else => return error.SkipZigTest,
12-
}; // TODO
139
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1410

1511
if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) {
@@ -28,10 +24,6 @@ test "pointer to thread local array" {
2824
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
2925
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
3026
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
31-
if (builtin.zig_backend == .stage2_llvm) switch (builtin.cpu.arch) {
32-
.x86_64, .x86 => {},
33-
else => return error.SkipZigTest,
34-
}; // TODO
3527
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
3628

3729
const s = "Hello world";
@@ -45,10 +37,6 @@ test "reference a global threadlocal variable" {
4537
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
4638
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
4739
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
48-
if (builtin.zig_backend == .stage2_llvm) switch (builtin.cpu.arch) {
49-
.x86_64, .x86 => {},
50-
else => return error.SkipZigTest,
51-
}; // TODO
5240
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
5341

5442
_ = nrfx_uart_rx(&g_uart0);

test/behavior/vector.zig

-6
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ test "vector division operators" {
557557
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
558558
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
559559
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
560-
if (builtin.zig_backend == .stage2_llvm and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
561560
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
562561
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
563562

@@ -1571,11 +1570,6 @@ test "@reduce on bool vector" {
15711570
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
15721571
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
15731572

1574-
if (comptime builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.endian() == .big) {
1575-
// https://github.com/ziglang/zig/issues/13782
1576-
return error.SkipZigTest;
1577-
}
1578-
15791573
const a = @Vector(2, bool){ true, true };
15801574
const b = @Vector(1, bool){true};
15811575
try std.testing.expect(@reduce(.And, a));

0 commit comments

Comments
 (0)