authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-04-25 15:41:11-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-08 19:37:28-07:00
log243ae3a6cb56b3da4d84b368f2af3cbb451233b9
tree2d50d4cb6699bc23009382c67c60dbc58e8cfe08
parent70c85b1bf1c07db4420e8431c3322bfeb87688ee

update for LLVM 18 new target data

New OSs: * XROS * Serenity * Vulkan Removed OSs: * Ananas * CloudABI * Minix * Contiki New CPUs: * spirv The removed stuff is removed from LLVM but not Zig.

4 files changed, 57 insertions(+), 27 deletions(-)

lib/std/Target.zig+3-2
......@@ -47,6 +47,7 @@ pub const Os = struct {
4747 tvos,
4848 watchos,
4949 driverkit,
50 xros,
5051 mesa3d,
5152 contiki,
5253 amdpal,
......@@ -56,6 +57,7 @@ pub const Os = struct {
5657 emscripten,
5758 shadermodel,
5859 liteos,
60 serenity,
5961 opencl,
6062 glsl450,
6163 vulkan,
......@@ -1002,6 +1004,7 @@ pub const Cpu = struct {
10021004 hsail64,
10031005 spir,
10041006 spir64,
1007 spirv,
10051008 spirv32,
10061009 spirv64,
10071010 kalimba,
......@@ -1012,8 +1015,6 @@ pub const Cpu = struct {
10121015 renderscript32,
10131016 renderscript64,
10141017 ve,
1015 // Stage1 currently assumes that architectures above this comment
1016 // map one-to-one with the ZigLLVM_ArchType enum.
10171018 spu_2,
10181019
10191020 pub inline fn isX86(arch: Arch) bool {
src/codegen/llvm/bindings.zig+4-4
......@@ -284,8 +284,6 @@ extern fn ZigLLVMWriteArchive(
284284
285285pub const OSType = enum(c_int) {
286286 UnknownOS,
287 Ananas,
288 CloudABI,
289287 Darwin,
290288 DragonFly,
291289 FreeBSD,
......@@ -302,7 +300,6 @@ pub const OSType = enum(c_int) {
302300 Win32,
303301 ZOS,
304302 Haiku,
305 Minix,
306303 RTEMS,
307304 NaCl,
308305 AIX,
......@@ -315,8 +312,8 @@ pub const OSType = enum(c_int) {
315312 TvOS,
316313 WatchOS,
317314 DriverKit,
315 XROS,
318316 Mesa3D,
319 Contiki,
320317 AMDPAL,
321318 HermitCore,
322319 Hurd,
......@@ -324,6 +321,8 @@ pub const OSType = enum(c_int) {
324321 Emscripten,
325322 ShaderModel,
326323 LiteOS,
324 Serenity,
325 Vulkan,
327326};
328327
329328pub const ArchType = enum(c_int) {
......@@ -378,6 +377,7 @@ pub const ArchType = enum(c_int) {
378377 hsail64,
379378 spir,
380379 spir64,
380 spirv,
381381 spirv32,
382382 spirv64,
383383 kalimba,
src/zig_llvm.cpp+30-14
......@@ -110,19 +110,19 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri
110110 bool JIT;
111111 std::optional<CodeModel::Model> CM = unwrap(CodeModel, JIT);
112112
113 CodeGenOpt::Level OL;
113 CodeGenOptLevel OL;
114114 switch (Level) {
115115 case LLVMCodeGenLevelNone:
116 OL = CodeGenOpt::None;
116 OL = CodeGenOptLevel::None;
117117 break;
118118 case LLVMCodeGenLevelLess:
119 OL = CodeGenOpt::Less;
119 OL = CodeGenOptLevel::Less;
120120 break;
121121 case LLVMCodeGenLevelAggressive:
122 OL = CodeGenOpt::Aggressive;
122 OL = CodeGenOptLevel::Aggressive;
123123 break;
124124 default:
125 OL = CodeGenOpt::Default;
125 OL = CodeGenOptLevel::Default;
126126 break;
127127 }
128128
......@@ -336,13 +336,13 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
336336 createTargetTransformInfoWrapperPass(target_machine.getTargetIRAnalysis()));
337337
338338 if (dest_bin && !lto) {
339 if (target_machine.addPassesToEmitFile(codegen_pm, *dest_bin, nullptr, CGFT_ObjectFile)) {
339 if (target_machine.addPassesToEmitFile(codegen_pm, *dest_bin, nullptr, CodeGenFileType::ObjectFile)) {
340340 *error_message = strdup("TargetMachine can't emit an object file");
341341 return true;
342342 }
343343 }
344344 if (dest_asm) {
345 if (target_machine.addPassesToEmitFile(codegen_pm, *dest_asm, nullptr, CGFT_AssemblyFile)) {
345 if (target_machine.addPassesToEmitFile(codegen_pm, *dest_asm, nullptr, CodeGenFileType::AssemblyFile)) {
346346 *error_message = strdup("TargetMachine can't emit an assembly file");
347347 return true;
348348 }
......@@ -534,7 +534,9 @@ bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size
534534 if (err) return true;
535535 new_members.push_back(std::move(*new_member));
536536 }
537 Error err = writeArchive(archive_name, new_members, true, kind, true, false, nullptr);
537 Error err = writeArchive(archive_name, new_members,
538 SymtabWritingMode::NormalSymtab, kind, true, false, nullptr);
539
538540 if (err) return true;
539541 return false;
540542}
......@@ -620,6 +622,7 @@ static_assert((Triple::ArchType)ZigLLVM_hsail == Triple::hsail, "");
620622static_assert((Triple::ArchType)ZigLLVM_hsail64 == Triple::hsail64, "");
621623static_assert((Triple::ArchType)ZigLLVM_spir == Triple::spir, "");
622624static_assert((Triple::ArchType)ZigLLVM_spir64 == Triple::spir64, "");
625static_assert((Triple::ArchType)ZigLLVM_spirv == Triple::spirv, "");
623626static_assert((Triple::ArchType)ZigLLVM_spirv32 == Triple::spirv32, "");
624627static_assert((Triple::ArchType)ZigLLVM_spirv64 == Triple::spirv64, "");
625628static_assert((Triple::ArchType)ZigLLVM_kalimba == Triple::kalimba, "");
......@@ -642,7 +645,6 @@ static_assert((Triple::VendorType)ZigLLVM_ImaginationTechnologies == Triple::Ima
642645static_assert((Triple::VendorType)ZigLLVM_MipsTechnologies == Triple::MipsTechnologies, "");
643646static_assert((Triple::VendorType)ZigLLVM_NVIDIA == Triple::NVIDIA, "");
644647static_assert((Triple::VendorType)ZigLLVM_CSR == Triple::CSR, "");
645static_assert((Triple::VendorType)ZigLLVM_Myriad == Triple::Myriad, "");
646648static_assert((Triple::VendorType)ZigLLVM_AMD == Triple::AMD, "");
647649static_assert((Triple::VendorType)ZigLLVM_Mesa == Triple::Mesa, "");
648650static_assert((Triple::VendorType)ZigLLVM_SUSE == Triple::SUSE, "");
......@@ -650,8 +652,6 @@ static_assert((Triple::VendorType)ZigLLVM_OpenEmbedded == Triple::OpenEmbedded,
650652static_assert((Triple::VendorType)ZigLLVM_LastVendorType == Triple::LastVendorType, "");
651653
652654static_assert((Triple::OSType)ZigLLVM_UnknownOS == Triple::UnknownOS, "");
653static_assert((Triple::OSType)ZigLLVM_Ananas == Triple::Ananas, "");
654static_assert((Triple::OSType)ZigLLVM_CloudABI == Triple::CloudABI, "");
655655static_assert((Triple::OSType)ZigLLVM_Darwin == Triple::Darwin, "");
656656static_assert((Triple::OSType)ZigLLVM_DragonFly == Triple::DragonFly, "");
657657static_assert((Triple::OSType)ZigLLVM_FreeBSD == Triple::FreeBSD, "");
......@@ -670,7 +670,6 @@ static_assert((Triple::OSType)ZigLLVM_UEFI == Triple::UEFI, "");
670670static_assert((Triple::OSType)ZigLLVM_Win32 == Triple::Win32, "");
671671static_assert((Triple::OSType)ZigLLVM_ZOS == Triple::ZOS, "");
672672static_assert((Triple::OSType)ZigLLVM_Haiku == Triple::Haiku, "");
673static_assert((Triple::OSType)ZigLLVM_Minix == Triple::Minix, "");
674673static_assert((Triple::OSType)ZigLLVM_RTEMS == Triple::RTEMS, "");
675674static_assert((Triple::OSType)ZigLLVM_NaCl == Triple::NaCl, "");
676675static_assert((Triple::OSType)ZigLLVM_AIX == Triple::AIX, "");
......@@ -681,8 +680,9 @@ static_assert((Triple::OSType)ZigLLVM_PS4 == Triple::PS4, "");
681680static_assert((Triple::OSType)ZigLLVM_ELFIAMCU == Triple::ELFIAMCU, "");
682681static_assert((Triple::OSType)ZigLLVM_TvOS == Triple::TvOS, "");
683682static_assert((Triple::OSType)ZigLLVM_WatchOS == Triple::WatchOS, "");
683static_assert((Triple::OSType)ZigLLVM_DriverKit == Triple::DriverKit, "");
684static_assert((Triple::OSType)ZigLLVM_XROS == Triple::XROS, "");
684685static_assert((Triple::OSType)ZigLLVM_Mesa3D == Triple::Mesa3D, "");
685static_assert((Triple::OSType)ZigLLVM_Contiki == Triple::Contiki, "");
686686static_assert((Triple::OSType)ZigLLVM_AMDPAL == Triple::AMDPAL, "");
687687static_assert((Triple::OSType)ZigLLVM_HermitCore == Triple::HermitCore, "");
688688static_assert((Triple::OSType)ZigLLVM_Hurd == Triple::Hurd, "");
......@@ -690,6 +690,8 @@ static_assert((Triple::OSType)ZigLLVM_WASI == Triple::WASI, "");
690690static_assert((Triple::OSType)ZigLLVM_Emscripten == Triple::Emscripten, "");
691691static_assert((Triple::OSType)ZigLLVM_ShaderModel == Triple::ShaderModel, "");
692692static_assert((Triple::OSType)ZigLLVM_LiteOS == Triple::LiteOS, "");
693static_assert((Triple::OSType)ZigLLVM_Serenity == Triple::Serenity, "");
694static_assert((Triple::OSType)ZigLLVM_Vulkan == Triple::Vulkan, "");
693695static_assert((Triple::OSType)ZigLLVM_LastOSType == Triple::LastOSType, "");
694696
695697static_assert((Triple::EnvironmentType)ZigLLVM_UnknownEnvironment == Triple::UnknownEnvironment, "");
......@@ -748,12 +750,14 @@ static_assert((CallingConv::ID)ZigLLVM_Fast == llvm::CallingConv::Fast, "");
748750static_assert((CallingConv::ID)ZigLLVM_Cold == llvm::CallingConv::Cold, "");
749751static_assert((CallingConv::ID)ZigLLVM_GHC == llvm::CallingConv::GHC, "");
750752static_assert((CallingConv::ID)ZigLLVM_HiPE == llvm::CallingConv::HiPE, "");
751static_assert((CallingConv::ID)ZigLLVM_WebKit_JS == llvm::CallingConv::WebKit_JS, "");
752753static_assert((CallingConv::ID)ZigLLVM_AnyReg == llvm::CallingConv::AnyReg, "");
753754static_assert((CallingConv::ID)ZigLLVM_PreserveMost == llvm::CallingConv::PreserveMost, "");
754755static_assert((CallingConv::ID)ZigLLVM_PreserveAll == llvm::CallingConv::PreserveAll, "");
755756static_assert((CallingConv::ID)ZigLLVM_Swift == llvm::CallingConv::Swift, "");
756757static_assert((CallingConv::ID)ZigLLVM_CXX_FAST_TLS == llvm::CallingConv::CXX_FAST_TLS, "");
758static_assert((CallingConv::ID)ZigLLVM_Tail == llvm::CallingConv::Tail, "");
759static_assert((CallingConv::ID)ZigLLVM_CFGuard_Check == llvm::CallingConv::CFGuard_Check, "");
760static_assert((CallingConv::ID)ZigLLVM_SwiftTail == llvm::CallingConv::SwiftTail, "");
757761static_assert((CallingConv::ID)ZigLLVM_FirstTargetCC == llvm::CallingConv::FirstTargetCC, "");
758762static_assert((CallingConv::ID)ZigLLVM_X86_StdCall == llvm::CallingConv::X86_StdCall, "");
759763static_assert((CallingConv::ID)ZigLLVM_X86_FastCall == llvm::CallingConv::X86_FastCall, "");
......@@ -787,4 +791,16 @@ static_assert((CallingConv::ID)ZigLLVM_MSP430_BUILTIN == llvm::CallingConv::MSP4
787791static_assert((CallingConv::ID)ZigLLVM_AMDGPU_LS == llvm::CallingConv::AMDGPU_LS, "");
788792static_assert((CallingConv::ID)ZigLLVM_AMDGPU_ES == llvm::CallingConv::AMDGPU_ES, "");
789793static_assert((CallingConv::ID)ZigLLVM_AArch64_VectorCall == llvm::CallingConv::AArch64_VectorCall, "");
794static_assert((CallingConv::ID)ZigLLVM_AArch64_SVE_VectorCall == llvm::CallingConv::AArch64_SVE_VectorCall, "");
795static_assert((CallingConv::ID)ZigLLVM_WASM_EmscriptenInvoke == llvm::CallingConv::WASM_EmscriptenInvoke, "");
796static_assert((CallingConv::ID)ZigLLVM_AMDGPU_Gfx == llvm::CallingConv::AMDGPU_Gfx, "");
797static_assert((CallingConv::ID)ZigLLVM_M68k_INTR == llvm::CallingConv::M68k_INTR, "");
798static_assert((CallingConv::ID)ZigLLVM_AArch64_SME_ABI_Support_Routines_PreserveMost_From_X0 == llvm::CallingConv::AArch64_SME_ABI_Support_Routines_PreserveMost_From_X0, "");
799static_assert((CallingConv::ID)ZigLLVM_AArch64_SME_ABI_Support_Routines_PreserveMost_From_X2 == llvm::CallingConv::AArch64_SME_ABI_Support_Routines_PreserveMost_From_X2, "");
800static_assert((CallingConv::ID)ZigLLVM_AMDGPU_CS_Chain == llvm::CallingConv::AMDGPU_CS_Chain, "");
801static_assert((CallingConv::ID)ZigLLVM_AMDGPU_CS_ChainPreserve == llvm::CallingConv::AMDGPU_CS_ChainPreserve, "");
802static_assert((CallingConv::ID)ZigLLVM_M68k_RTD == llvm::CallingConv::M68k_RTD, "");
803static_assert((CallingConv::ID)ZigLLVM_GRAAL == llvm::CallingConv::GRAAL, "");
804static_assert((CallingConv::ID)ZigLLVM_ARM64EC_Thunk_X64 == llvm::CallingConv::ARM64EC_Thunk_X64, "");
805static_assert((CallingConv::ID)ZigLLVM_ARM64EC_Thunk_Native == llvm::CallingConv::ARM64EC_Thunk_Native, "");
790806static_assert((CallingConv::ID)ZigLLVM_MaxID == llvm::CallingConv::MaxID, "");
src/zig_llvm.h+20-7
......@@ -60,12 +60,14 @@ enum ZigLLVM_CallingConv {
6060 ZigLLVM_Cold = 9,
6161 ZigLLVM_GHC = 10,
6262 ZigLLVM_HiPE = 11,
63 ZigLLVM_WebKit_JS = 12,
6463 ZigLLVM_AnyReg = 13,
6564 ZigLLVM_PreserveMost = 14,
6665 ZigLLVM_PreserveAll = 15,
6766 ZigLLVM_Swift = 16,
6867 ZigLLVM_CXX_FAST_TLS = 17,
68 ZigLLVM_Tail = 18,
69 ZigLLVM_CFGuard_Check = 19,
70 ZigLLVM_SwiftTail = 20,
6971 ZigLLVM_FirstTargetCC = 64,
7072 ZigLLVM_X86_StdCall = 64,
7173 ZigLLVM_X86_FastCall = 65,
......@@ -99,6 +101,18 @@ enum ZigLLVM_CallingConv {
99101 ZigLLVM_AMDGPU_LS = 95,
100102 ZigLLVM_AMDGPU_ES = 96,
101103 ZigLLVM_AArch64_VectorCall = 97,
104 ZigLLVM_AArch64_SVE_VectorCall = 98,
105 ZigLLVM_WASM_EmscriptenInvoke = 99,
106 ZigLLVM_AMDGPU_Gfx = 100,
107 ZigLLVM_M68k_INTR = 101,
108 ZigLLVM_AArch64_SME_ABI_Support_Routines_PreserveMost_From_X0 = 102,
109 ZigLLVM_AArch64_SME_ABI_Support_Routines_PreserveMost_From_X2 = 103,
110 ZigLLVM_AMDGPU_CS_Chain = 104,
111 ZigLLVM_AMDGPU_CS_ChainPreserve = 105,
112 ZigLLVM_M68k_RTD = 106,
113 ZigLLVM_GRAAL = 107,
114 ZigLLVM_ARM64EC_Thunk_X64 = 108,
115 ZigLLVM_ARM64EC_Thunk_Native = 109,
102116 ZigLLVM_MaxID = 1023,
103117};
104118
......@@ -164,6 +178,7 @@ enum ZigLLVM_ArchType {
164178 ZigLLVM_hsail64, // AMD HSAIL with 64-bit pointers
165179 ZigLLVM_spir, // SPIR: standard portable IR for OpenCL 32-bit version
166180 ZigLLVM_spir64, // SPIR: standard portable IR for OpenCL 64-bit version
181 ZigLLVM_spirv, // SPIR-V with logical memory layout.
167182 ZigLLVM_spirv32, // SPIR-V with 32-bit pointers
168183 ZigLLVM_spirv64, // SPIR-V with 64-bit pointers
169184 ZigLLVM_kalimba, // Kalimba: generic kalimba
......@@ -189,7 +204,6 @@ enum ZigLLVM_VendorType {
189204 ZigLLVM_MipsTechnologies,
190205 ZigLLVM_NVIDIA,
191206 ZigLLVM_CSR,
192 ZigLLVM_Myriad,
193207 ZigLLVM_AMD,
194208 ZigLLVM_Mesa,
195209 ZigLLVM_SUSE,
......@@ -204,8 +218,6 @@ enum ZigLLVM_VendorType {
204218enum ZigLLVM_OSType {
205219 ZigLLVM_UnknownOS,
206220
207 ZigLLVM_Ananas,
208 ZigLLVM_CloudABI,
209221 ZigLLVM_Darwin,
210222 ZigLLVM_DragonFly,
211223 ZigLLVM_FreeBSD,
......@@ -222,7 +234,6 @@ enum ZigLLVM_OSType {
222234 ZigLLVM_Win32,
223235 ZigLLVM_ZOS,
224236 ZigLLVM_Haiku,
225 ZigLLVM_Minix,
226237 ZigLLVM_RTEMS,
227238 ZigLLVM_NaCl, // Native Client
228239 ZigLLVM_AIX,
......@@ -235,8 +246,8 @@ enum ZigLLVM_OSType {
235246 ZigLLVM_TvOS, // Apple tvOS
236247 ZigLLVM_WatchOS, // Apple watchOS
237248 ZigLLVM_DriverKit, // Apple DriverKit
249 ZigLLVM_XROS, // Apple XROS
238250 ZigLLVM_Mesa3D,
239 ZigLLVM_Contiki,
240251 ZigLLVM_AMDPAL, // AMD PAL Runtime
241252 ZigLLVM_HermitCore, // HermitCore Unikernel/Multikernel
242253 ZigLLVM_Hurd, // GNU/Hurd
......@@ -244,7 +255,9 @@ enum ZigLLVM_OSType {
244255 ZigLLVM_Emscripten,
245256 ZigLLVM_ShaderModel, // DirectX ShaderModel
246257 ZigLLVM_LiteOS,
247 ZigLLVM_LastOSType = ZigLLVM_LiteOS
258 ZigLLVM_Serenity,
259 ZigLLVM_Vulkan, // Vulkan SPIR-V
260 ZigLLVM_LastOSType = ZigLLVM_Vulkan
248261};
249262
250263// Synchronize with target.cpp::abi_list