Skip to content

Some QEMU fixes + disable some tests for thumbeb in addition to armeb #22430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 6, 2025
Merged

Some QEMU fixes + disable some tests for thumbeb in addition to armeb #22430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
749e67d
std.zig.system: Reject x32 for QEMU in getExternalExecutor().
alexrp Jan 6, 2025
f54f58b
std.zig.system: Handle thumb/thumbeb for QEMU in getExternalExecutor().
alexrp Jan 6, 2025
52e9fd7
test: Disable vector behavior tests affected by #22060 for thumbeb too.
alexrp Jan 6, 2025
c1ae99e
test: Disable `align(N) on functions` and `@alignCast functions` for …
alexrp Jan 6, 2025
03ac40d
std: Disable some tests affected by #22060 for thumbeb too.
alexrp Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/std/fmt.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,7 +2596,7 @@ test "positional/alignment/width/precision" {
}

test "vector" {
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if (builtin.target.cpu.arch == .riscv64) {
// https://github.com/ziglang/zig/issues/4486
return error.SkipZigTest;
Expand Down
2 changes: 1 addition & 1 deletion lib/std/simd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ pub fn prefixScan(comptime op: std.builtin.ReduceOp, comptime hop: isize, vec: a

test "vector prefix scan" {
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if (builtin.cpu.arch == .aarch64_be and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21893

if (comptime builtin.cpu.arch.isMIPS()) {
Expand Down
9 changes: 6 additions & 3 deletions lib/std/zig/system.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ pub fn getExternalExecutor(
return switch (candidate.cpu.arch) {
.aarch64 => Executor{ .qemu = "qemu-aarch64" },
.aarch64_be => Executor{ .qemu = "qemu-aarch64_be" },
.arm => Executor{ .qemu = "qemu-arm" },
.armeb => Executor{ .qemu = "qemu-armeb" },
.arm, .thumb => Executor{ .qemu = "qemu-arm" },
.armeb, .thumbeb => Executor{ .qemu = "qemu-armeb" },
.hexagon => Executor{ .qemu = "qemu-hexagon" },
.loongarch64 => Executor{ .qemu = "qemu-loongarch64" },
.m68k => Executor{ .qemu = "qemu-m68k" },
Expand Down Expand Up @@ -116,7 +116,10 @@ pub fn getExternalExecutor(
},
.sparc64 => Executor{ .qemu = "qemu-sparc64" },
.x86 => Executor{ .qemu = "qemu-i386" },
.x86_64 => Executor{ .qemu = "qemu-x86_64" },
.x86_64 => switch (candidate.abi) {
.gnux32, .muslx32 => return bad_result,
else => Executor{ .qemu = "qemu-x86_64" },
},
.xtensa => Executor{ .qemu = "qemu-xtensa" },
else => return bad_result,
};
Expand Down
4 changes: 2 additions & 2 deletions test/behavior/align.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ test "@alignCast functions" {

// function alignment is a compile error on wasm32/wasm64
if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest;
if (native_arch == .thumb) return error.SkipZigTest;
if (native_arch == .thumb or native_arch == .thumbeb) return error.SkipZigTest;

try expect(fnExpectsOnly1(simple4) == 0x19);
}
Expand Down Expand Up @@ -512,7 +512,7 @@ test "align(N) on functions" {

// function alignment is a compile error on wasm32/wasm64
if (native_arch == .wasm32 or native_arch == .wasm64) return error.SkipZigTest;
if (native_arch == .thumb) return error.SkipZigTest;
if (native_arch == .thumb or native_arch == .thumbeb) return error.SkipZigTest;

try expect((@intFromPtr(&overaligned_fn) & (0x1000 - 1)) == 0);
}
Expand Down
8 changes: 4 additions & 4 deletions test/behavior/vector.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ test "vector division operators" {
};

try comptime S.doTheTest();
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
try S.doTheTest();
}

Expand Down Expand Up @@ -1100,7 +1100,7 @@ test "@addWithOverflow" {
}
};
try comptime S.doTheTest();
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
try S.doTheTest();
}

Expand Down Expand Up @@ -1134,7 +1134,7 @@ test "@subWithOverflow" {
}
};
try comptime S.doTheTest();
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
try S.doTheTest();
}

Expand All @@ -1158,7 +1158,7 @@ test "@mulWithOverflow" {
}
};
try comptime S.doTheTest();
if (builtin.cpu.arch == .armeb and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
if ((builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/22060
try S.doTheTest();
}

Expand Down
Loading