From 78b8ce5095abf6516dc414b8cf487acedbd0ce99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 28 Nov 2024 21:56:45 +0100 Subject: [PATCH] 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 --- test/llvm_targets.zig | 96 +++++++++++++++++++++---------------------- test/src/Cases.zig | 18 +------- 2 files changed, 49 insertions(+), 65 deletions(-) diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig index ea937de63b..284c1fcd70 100644 --- a/test/llvm_targets.zig +++ b/test/llvm_targets.zig @@ -42,12 +42,12 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .aarch64_be, .os_tag = .netbsd, .abi = .none }, .{ .cpu_arch = .amdgcn, .os_tag = .amdhsa, .abi = .none }, - .{ .cpu_arch = .amdgcn, .os_tag = .amdpal, .abi = .none }, - .{ .cpu_arch = .amdgcn, .os_tag = .mesa3d, .abi = .none }, + // .{ .cpu_arch = .amdgcn, .os_tag = .amdpal, .abi = .none }, + // .{ .cpu_arch = .amdgcn, .os_tag = .mesa3d, .abi = .none }, - .{ .cpu_arch = .arc, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .gnu }, - .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .arc, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .gnu }, + // .{ .cpu_arch = .arc, .os_tag = .linux, .abi = .none }, .{ .cpu_arch = .arm, .os_tag = .freebsd, .abi = .eabi }, .{ .cpu_arch = .arm, .os_tag = .freebsd, .abi = .eabihf }, @@ -69,8 +69,8 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .arm, .os_tag = .openbsd, .abi = .eabihf }, .{ .cpu_arch = .arm, .os_tag = .rtems, .abi = .eabi }, .{ .cpu_arch = .arm, .os_tag = .rtems, .abi = .eabihf }, - .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabi }, - .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabihf }, + // .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabi }, + // .{ .cpu_arch = .arm, .os_tag = .uefi, .abi = .eabihf }, .{ .cpu_arch = .armeb, .os_tag = .freebsd, .abi = .eabi }, .{ .cpu_arch = .armeb, .os_tag = .freebsd, .abi = .eabihf }, @@ -94,37 +94,37 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .bpfel, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabi }, - .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabihf }, - .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabi }, - .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabihf }, - .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabi }, - .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabihf }, + // .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabi }, + // .{ .cpu_arch = .csky, .os_tag = .freestanding, .abi = .eabihf }, + // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabi }, + // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .eabihf }, + // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabi }, + // .{ .cpu_arch = .csky, .os_tag = .linux, .abi = .gnueabihf }, .{ .cpu_arch = .hexagon, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .hexagon, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .lanai, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .lanai, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .loongarch32, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .loongarch32, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .loongarch32, .os_tag = .uefi, .abi = .none }, + // .{ .cpu_arch = .loongarch32, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .loongarch32, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .loongarch32, .os_tag = .uefi, .abi = .none }, .{ .cpu_arch = .loongarch64, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnu }, - .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnuf32 }, + // .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnuf32 }, .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .gnusf }, .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .musl }, .{ .cpu_arch = .loongarch64, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .loongarch64, .os_tag = .uefi, .abi = .none }, + // .{ .cpu_arch = .loongarch64, .os_tag = .uefi, .abi = .none }, - .{ .cpu_arch = .m68k, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .m68k, .os_tag = .haiku, .abi = .none }, - .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .gnu }, - .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .musl }, - .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .m68k, .os_tag = .netbsd, .abi = .none }, - .{ .cpu_arch = .m68k, .os_tag = .rtems, .abi = .none }, + // .{ .cpu_arch = .m68k, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .m68k, .os_tag = .haiku, .abi = .none }, + // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .gnu }, + // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .musl }, + // .{ .cpu_arch = .m68k, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .m68k, .os_tag = .netbsd, .abi = .none }, + // .{ .cpu_arch = .m68k, .os_tag = .rtems, .abi = .none }, .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabi }, .{ .cpu_arch = .mips, .os_tag = .freebsd, .abi = .eabihf }, @@ -178,12 +178,12 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .msp430, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .nvptx, .os_tag = .cuda, .abi = .none }, - .{ .cpu_arch = .nvptx, .os_tag = .nvcl, .abi = .none }, - .{ .cpu_arch = .nvptx64, .os_tag = .cuda, .abi = .none }, - .{ .cpu_arch = .nvptx64, .os_tag = .nvcl, .abi = .none }, + // .{ .cpu_arch = .nvptx, .os_tag = .cuda, .abi = .none }, + // .{ .cpu_arch = .nvptx, .os_tag = .nvcl, .abi = .none }, + // .{ .cpu_arch = .nvptx64, .os_tag = .cuda, .abi = .none }, + // .{ .cpu_arch = .nvptx64, .os_tag = .nvcl, .abi = .none }, - .{ .cpu_arch = .powerpc, .os_tag = .aix, .abi = .eabihf }, + // .{ .cpu_arch = .powerpc, .os_tag = .aix, .abi = .eabihf }, .{ .cpu_arch = .powerpc, .os_tag = .freebsd, .abi = .eabi }, .{ .cpu_arch = .powerpc, .os_tag = .freebsd, .abi = .eabihf }, .{ .cpu_arch = .powerpc, .os_tag = .freestanding, .abi = .eabi }, @@ -206,7 +206,7 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .powerpcle, .os_tag = .freestanding, .abi = .eabi }, .{ .cpu_arch = .powerpcle, .os_tag = .freestanding, .abi = .eabihf }, - .{ .cpu_arch = .powerpc64, .os_tag = .aix, .abi = .none }, + // .{ .cpu_arch = .powerpc64, .os_tag = .aix, .abi = .none }, .{ .cpu_arch = .powerpc64, .os_tag = .freebsd, .abi = .none }, .{ .cpu_arch = .powerpc64, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .powerpc64, .os_tag = .linux, .abi = .gnu }, @@ -226,7 +226,7 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .riscv32, .os_tag = .linux, .abi = .musl }, .{ .cpu_arch = .riscv32, .os_tag = .linux, .abi = .none }, .{ .cpu_arch = .riscv32, .os_tag = .rtems, .abi = .none }, - .{ .cpu_arch = .riscv32, .os_tag = .uefi, .abi = .none }, + // .{ .cpu_arch = .riscv32, .os_tag = .uefi, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .freebsd, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .freestanding, .abi = .none }, @@ -241,20 +241,20 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .riscv64, .os_tag = .openbsd, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .rtems, .abi = .none }, .{ .cpu_arch = .riscv64, .os_tag = .serenity, .abi = .none }, - .{ .cpu_arch = .riscv64, .os_tag = .uefi, .abi = .none }, + // .{ .cpu_arch = .riscv64, .os_tag = .uefi, .abi = .none }, .{ .cpu_arch = .s390x, .os_tag = .freestanding, .abi = .none }, .{ .cpu_arch = .s390x, .os_tag = .linux, .abi = .gnu }, .{ .cpu_arch = .s390x, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .s390x, .os_tag = .zos, .abi = .none }, + // .{ .cpu_arch = .s390x, .os_tag = .zos, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .illumos, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .gnu }, - .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .netbsd, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none }, - .{ .cpu_arch = .sparc, .os_tag = .solaris, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .illumos, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .gnu }, + // .{ .cpu_arch = .sparc, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .netbsd, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .rtems, .abi = .none }, + // .{ .cpu_arch = .sparc, .os_tag = .solaris, .abi = .none }, .{ .cpu_arch = .sparc64, .os_tag = .freebsd, .abi = .none }, .{ .cpu_arch = .sparc64, .os_tag = .freestanding, .abi = .none }, @@ -301,8 +301,8 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabi }, .{ .cpu_arch = .thumbeb, .os_tag = .rtems, .abi = .eabihf }, - .{ .cpu_arch = .ve, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .ve, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .ve, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .ve, .os_tag = .linux, .abi = .none }, .{ .cpu_arch = .wasm32, .os_tag = .emscripten, .abi = .none }, .{ .cpu_arch = .wasm32, .os_tag = .freestanding, .abi = .none }, @@ -374,10 +374,10 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .x86_64, .os_tag = .windows, .abi = .itanium }, .{ .cpu_arch = .x86_64, .os_tag = .windows, .abi = .msvc }, - .{ .cpu_arch = .xcore, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .xcore, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .xtensa, .os_tag = .freestanding, .abi = .none }, - .{ .cpu_arch = .xtensa, .os_tag = .linux, .abi = .none }, + // .{ .cpu_arch = .xtensa, .os_tag = .freestanding, .abi = .none }, + // .{ .cpu_arch = .xtensa, .os_tag = .linux, .abi = .none }, }; pub fn addCases( @@ -394,7 +394,7 @@ pub fn addCases( .xtensa => if (!build_options.llvm_has_xtensa) continue, else => {}, }; - var case = ctx.noEmitUsingLlvmBackend("llvm_targets", b.resolveTargetQuery(target_query)); + var case = ctx.addObjLlvm("llvm_targets", b.resolveTargetQuery(target_query)); case.addCompile(""); } } diff --git a/test/src/Cases.zig b/test/src/Cases.zig index 2a601637e6..208e8a6ce1 100644 --- a/test/src/Cases.zig +++ b/test/src/Cases.zig @@ -204,34 +204,18 @@ pub fn exeFromCompiledC(ctx: *Cases, name: []const u8, target_query: std.Target. return &ctx.cases.items[ctx.cases.items.len - 1]; } -pub fn noEmitUsingLlvmBackend(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case { +pub fn addObjLlvm(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case { ctx.cases.append(Case{ .name = name, .target = target, .updates = std.ArrayList(Update).init(ctx.cases.allocator), .output_mode = .Obj, - .emit_bin = false, .deps = std.ArrayList(DepModule).init(ctx.arena), .backend = .llvm, }) catch @panic("out of memory"); return &ctx.cases.items[ctx.cases.items.len - 1]; } -/// Adds a test case that uses the LLVM backend to emit an executable. -/// Currently this implies linking libc, because only then we can generate a testable executable. -pub fn exeUsingLlvmBackend(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Case { - ctx.cases.append(Case{ - .name = name, - .target = target, - .updates = std.ArrayList(Update).init(ctx.cases.allocator), - .output_mode = .Exe, - .deps = std.ArrayList(DepModule).init(ctx.arena), - .backend = .llvm, - .link_libc = true, - }) catch @panic("out of memory"); - return &ctx.cases.items[ctx.cases.items.len - 1]; -} - pub fn addObj( ctx: *Cases, name: []const u8,