authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-11-28 21:56:45+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-11-28 22:04:00+01:00
log78b8ce5095abf6516dc414b8cf487acedbd0ce99
tree3d3abfc33595667d5645a9e34ee76c0f3d8fb665
parent0bf054f4c54d23678939828a5b72627ce4d27e94
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

test: Change llvm_targets to actually emit an object for each target.

Without doing this, we don't actually test whether the data layout string we generate matches LLVM's. A number of targets had to be commented out due to this change: * Some are using a non-working experimental LLVM backend (arc, csky, ...). * Some don't have working LLD support (lanai, sparc, ...). * Some don't have working self-hosted linker support (nvptx). * Some are using ABIs that haven't been standardized (loongarch32). Finally, all non-x86 uefi targets are hopelessly broken and can't really be fixed until we change our emit logic to lower *-uefi-* verbatim rather than to *-windows-*. See: https://github.com/ziglang/zig/issues/21630

2 files changed, 49 insertions(+), 65 deletions(-)

test/llvm_targets.zig+48-48
......@@ -42,12 +42,12 @@ const targets = [_]std.Target.Query{
4242 .{ .cpu_arch = .aarch64_be, .os_tag = .netbsd, .abi = .none },
4343
4444 .{ .cpu_arch = .amdgcn, .os_tag = .amdhsa, .abi = .none },
45 .{ .cpu_arch = .amdgcn, .os_tag = .amdpal, .abi = .none },
46 .{ .cpu_arch = .amdgcn, .os_tag = .mesa3d, .abi = .none },
45 // .{ .cpu_arch = .amdgcn, .os_tag = .amdpal, .abi = .none },
46 // .{ .cpu_arch = .amdgcn, .os_tag = .mesa3d, .abi = .none },
4747
48 .{ .cpu_arch = .arc, .os_tag = .freestanding, .abi = .none },
49 .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .gnu },
50 .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .none },
48 // .{ .cpu_arch = .arc, .os_tag = .freestanding, .abi = .none },
49 // .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .gnu },
50 // .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .none },
5151
5252 .{ .cpu_arch = .arm, .os_tag = .freebsd, .abi = .eabi },
5353 .{ .cpu_arch = .arm, .os_tag = .freebsd, .abi = .eabihf },
......@@ -69,8 +69,8 @@ const targets = [_]std.Target.Query{
6969 .{ .cpu_arch = .arm, .os_tag = .openbsd, .abi = .eabihf },
7070 .{ .cpu_arch = .arm, .os_tag = .rtems, .abi = .eabi },
7171 .{ .cpu_arch = .arm, .os_tag = .rtems, .abi = .eabihf },
72 .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabi },
73 .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabihf },
72 // .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabi },
73 // .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabihf },
7474
7575 .{ .cpu_arch = .armeb, .os_tag = .freebsd, .abi = .eabi },
7676 .{ .cpu_arch = .armeb, .os_tag = .freebsd, .abi = .eabihf },
......@@ -94,37 +94,37 @@ const targets = [_]std.Target.Query{
9494
9595 .{ .cpu_arch = .bpfel, .os_tag = .freestanding, .abi = .none },
9696
97 .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabi },
98 .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabihf },
99 .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabi },
100 .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabihf },
101 .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabi },
102 .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabihf },
97 // .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabi },
98 // .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabihf },
99 // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabi },
100 // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabihf },
101 // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabi },
102 // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabihf },
103103
104104 .{ .cpu_arch = .hexagon, .os_tag = .freestanding, .abi = .none },
105105 .{ .cpu_arch = .hexagon, .os_tag = .linux, .abi = .none },
106106
107 .{ .cpu_arch = .lanai, .os_tag = .freestanding, .abi = .none },
107 // .{ .cpu_arch = .lanai, .os_tag = .freestanding, .abi = .none },
108108
109 .{ .cpu_arch = .loongarch32, .os_tag = .freestanding, .abi = .none },
110 .{ .cpu_arch = .loongarch32, .os_tag = .linux, .abi = .none },
111 .{ .cpu_arch = .loongarch32, .os_tag = .uefi, .abi = .none },
109 // .{ .cpu_arch = .loongarch32, .os_tag = .freestanding, .abi = .none },
110 // .{ .cpu_arch = .loongarch32, .os_tag = .linux, .abi = .none },
111 // .{ .cpu_arch = .loongarch32, .os_tag = .uefi, .abi = .none },
112112
113113 .{ .cpu_arch = .loongarch64, .os_tag = .freestanding, .abi = .none },
114114 .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnu },
115 .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnuf32 },
115 // .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnuf32 },
116116 .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnusf },
117117 .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .musl },
118118 .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .none },
119 .{ .cpu_arch = .loongarch64, .os_tag = .uefi, .abi = .none },
119 // .{ .cpu_arch = .loongarch64, .os_tag = .uefi, .abi = .none },
120120
121 .{ .cpu_arch = .m68k, .os_tag = .freestanding, .abi = .none },
122 .{ .cpu_arch = .m68k, .os_tag = .haiku, .abi = .none },
123 .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .gnu },
124 .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .musl },
125 .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .none },
126 .{ .cpu_arch = .m68k, .os_tag = .netbsd, .abi = .none },
127 .{ .cpu_arch = .m68k, .os_tag = .rtems, .abi = .none },
121 // .{ .cpu_arch = .m68k, .os_tag = .freestanding, .abi = .none },
122 // .{ .cpu_arch = .m68k, .os_tag = .haiku, .abi = .none },
123 // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .gnu },
124 // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .musl },
125 // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .none },
126 // .{ .cpu_arch = .m68k, .os_tag = .netbsd, .abi = .none },
127 // .{ .cpu_arch = .m68k, .os_tag = .rtems, .abi = .none },
128128
129129 .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabi },
130130 .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabihf },
......@@ -178,12 +178,12 @@ const targets = [_]std.Target.Query{
178178
179179 .{ .cpu_arch = .msp430, .os_tag = .freestanding, .abi = .none },
180180
181 .{ .cpu_arch = .nvptx, .os_tag = .cuda, .abi = .none },
182 .{ .cpu_arch = .nvptx, .os_tag = .nvcl, .abi = .none },
183 .{ .cpu_arch = .nvptx64, .os_tag = .cuda, .abi = .none },
184 .{ .cpu_arch = .nvptx64, .os_tag = .nvcl, .abi = .none },
181 // .{ .cpu_arch = .nvptx, .os_tag = .cuda, .abi = .none },
182 // .{ .cpu_arch = .nvptx, .os_tag = .nvcl, .abi = .none },
183 // .{ .cpu_arch = .nvptx64, .os_tag = .cuda, .abi = .none },
184 // .{ .cpu_arch = .nvptx64, .os_tag = .nvcl, .abi = .none },
185185
186 .{ .cpu_arch = .powerpc, .os_tag = .aix, .abi = .eabihf },
186 // .{ .cpu_arch = .powerpc, .os_tag = .aix, .abi = .eabihf },
187187 .{ .cpu_arch = .powerpc, .os_tag = .freebsd, .abi = .eabi },
188188 .{ .cpu_arch = .powerpc, .os_tag = .freebsd, .abi = .eabihf },
189189 .{ .cpu_arch = .powerpc, .os_tag = .freestanding, .abi = .eabi },
......@@ -206,7 +206,7 @@ const targets = [_]std.Target.Query{
206206 .{ .cpu_arch = .powerpcle, .os_tag = .freestanding, .abi = .eabi },
207207 .{ .cpu_arch = .powerpcle, .os_tag = .freestanding, .abi = .eabihf },
208208
209 .{ .cpu_arch = .powerpc64, .os_tag = .aix, .abi = .none },
209 // .{ .cpu_arch = .powerpc64, .os_tag = .aix, .abi = .none },
210210 .{ .cpu_arch = .powerpc64, .os_tag = .freebsd, .abi = .none },
211211 .{ .cpu_arch = .powerpc64, .os_tag = .freestanding, .abi = .none },
212212 .{ .cpu_arch = .powerpc64, .os_tag = .linux, .abi = .gnu },
......@@ -226,7 +226,7 @@ const targets = [_]std.Target.Query{
226226 .{ .cpu_arch = .riscv32, .os_tag = .linux, .abi = .musl },
227227 .{ .cpu_arch = .riscv32, .os_tag = .linux, .abi = .none },
228228 .{ .cpu_arch = .riscv32, .os_tag = .rtems, .abi = .none },
229 .{ .cpu_arch = .riscv32, .os_tag = .uefi, .abi = .none },
229 // .{ .cpu_arch = .riscv32, .os_tag = .uefi, .abi = .none },
230230
231231 .{ .cpu_arch = .riscv64, .os_tag = .freebsd, .abi = .none },
232232 .{ .cpu_arch = .riscv64, .os_tag = .freestanding, .abi = .none },
......@@ -241,20 +241,20 @@ const targets = [_]std.Target.Query{
241241 .{ .cpu_arch = .riscv64, .os_tag = .openbsd, .abi = .none },
242242 .{ .cpu_arch = .riscv64, .os_tag = .rtems, .abi = .none },
243243 .{ .cpu_arch = .riscv64, .os_tag = .serenity, .abi = .none },
244 .{ .cpu_arch = .riscv64, .os_tag = .uefi, .abi = .none },
244 // .{ .cpu_arch = .riscv64, .os_tag = .uefi, .abi = .none },
245245
246246 .{ .cpu_arch = .s390x, .os_tag = .freestanding, .abi = .none },
247247 .{ .cpu_arch = .s390x, .os_tag = .linux, .abi = .gnu },
248248 .{ .cpu_arch = .s390x, .os_tag = .linux, .abi = .none },
249 .{ .cpu_arch = .s390x, .os_tag = .zos, .abi = .none },
249 // .{ .cpu_arch = .s390x, .os_tag = .zos, .abi = .none },
250250
251 .{ .cpu_arch = .sparc, .os_tag = .freestanding, .abi = .none },
252 .{ .cpu_arch = .sparc, .os_tag = .illumos, .abi = .none },
253 .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .gnu },
254 .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .none },
255 .{ .cpu_arch = .sparc, .os_tag = .netbsd, .abi = .none },
256 .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none },
257 .{ .cpu_arch = .sparc, .os_tag = .solaris, .abi = .none },
251 // .{ .cpu_arch = .sparc, .os_tag = .freestanding, .abi = .none },
252 // .{ .cpu_arch = .sparc, .os_tag = .illumos, .abi = .none },
253 // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .gnu },
254 // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .none },
255 // .{ .cpu_arch = .sparc, .os_tag = .netbsd, .abi = .none },
256 // .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none },
257 // .{ .cpu_arch = .sparc, .os_tag = .solaris, .abi = .none },
258258
259259 .{ .cpu_arch = .sparc64, .os_tag = .freebsd, .abi = .none },
260260 .{ .cpu_arch = .sparc64, .os_tag = .freestanding, .abi = .none },
......@@ -301,8 +301,8 @@ const targets = [_]std.Target.Query{
301301 .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabi },
302302 .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabihf },
303303
304 .{ .cpu_arch = .ve, .os_tag = .freestanding, .abi = .none },
305 .{ .cpu_arch = .ve, .os_tag = .linux, .abi = .none },
304 // .{ .cpu_arch = .ve, .os_tag = .freestanding, .abi = .none },
305 // .{ .cpu_arch = .ve, .os_tag = .linux, .abi = .none },
306306
307307 .{ .cpu_arch = .wasm32, .os_tag = .emscripten, .abi = .none },
308308 .{ .cpu_arch = .wasm32, .os_tag = .freestanding, .abi = .none },
......@@ -374,10 +374,10 @@ const targets = [_]std.Target.Query{
374374 .{ .cpu_arch = .x86_64, .os_tag = .windows, .abi = .itanium },
375375 .{ .cpu_arch = .x86_64, .os_tag = .windows, .abi = .msvc },
376376
377 .{ .cpu_arch = .xcore, .os_tag = .freestanding, .abi = .none },
377 // .{ .cpu_arch = .xcore, .os_tag = .freestanding, .abi = .none },
378378
379 .{ .cpu_arch = .xtensa, .os_tag = .freestanding, .abi = .none },
380 .{ .cpu_arch = .xtensa, .os_tag = .linux, .abi = .none },
379 // .{ .cpu_arch = .xtensa, .os_tag = .freestanding, .abi = .none },
380 // .{ .cpu_arch = .xtensa, .os_tag = .linux, .abi = .none },
381381};
382382
383383pub fn addCases(
......@@ -394,7 +394,7 @@ pub fn addCases(
394394 .xtensa => if (!build_options.llvm_has_xtensa) continue,
395395 else => {},
396396 };
397 var case = ctx.noEmitUsingLlvmBackend("llvm_targets", b.resolveTargetQuery(target_query));
397 var case = ctx.addObjLlvm("llvm_targets", b.resolveTargetQuery(target_query));
398398 case.addCompile("");
399399 }
400400}
test/src/Cases.zig+1-17
......@@ -204,34 +204,18 @@ pub fn exeFromCompiledC(ctx: *Cases, name: []const u8, target_query: std.Target.
204204 return &ctx.cases.items[ctx.cases.items.len - 1];
205205}
206206
207pub fn noEmitUsingLlvmBackend(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case {
207pub fn addObjLlvm(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case {
208208 ctx.cases.append(Case{
209209 .name = name,
210210 .target = target,
211211 .updates = std.ArrayList(Update).init(ctx.cases.allocator),
212212 .output_mode = .Obj,
213 .emit_bin = false,
214213 .deps = std.ArrayList(DepModule).init(ctx.arena),
215214 .backend = .llvm,
216215 }) catch @panic("out of memory");
217216 return &ctx.cases.items[ctx.cases.items.len - 1];
218217}
219218
220/// Adds a test case that uses the LLVM backend to emit an executable.
221/// Currently this implies linking libc, because only then we can generate a testable executable.
222pub fn exeUsingLlvmBackend(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case {
223 ctx.cases.append(Case{
224 .name = name,
225 .target = target,
226 .updates = std.ArrayList(Update).init(ctx.cases.allocator),
227 .output_mode = .Exe,
228 .deps = std.ArrayList(DepModule).init(ctx.arena),
229 .backend = .llvm,
230 .link_libc = true,
231 }) catch @panic("out of memory");
232 return &ctx.cases.items[ctx.cases.items.len - 1];
233}
234
235219pub fn addObj(
236220 ctx: *Cases,
237221 name: []const u8,