authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-25 20:56:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-25 20:56:43-07:00
log740a0d8f12a20b8feb2e756929f3063cf8740c65
tree259caaee50c5cde9fd7af85b769bbe90b578a8d9
parent5994a5d18d341f826b12a99c9d800601c69fc186

update zig_llvm.cpp and zig_llvm.h to LLVM 16

4 files changed, 25 insertions(+), 16 deletions(-)

lib/std/target.zig+4
......@@ -479,6 +479,9 @@ pub const Target = struct {
479479 gnuabi64,
480480 gnueabi,
481481 gnueabihf,
482 gnuf32,
483 gnuf64,
484 gnusf,
482485 gnux32,
483486 gnuilp32,
484487 code16,
......@@ -855,6 +858,7 @@ pub const Target = struct {
855858 x86,
856859 x86_64,
857860 xcore,
861 xtensa,
858862 nvptx,
859863 nvptx64,
860864 le32,
src/codegen/llvm/bindings.zig+1
......@@ -1333,6 +1333,7 @@ pub const ArchType = enum(c_int) {
13331333 x86,
13341334 x86_64,
13351335 xcore,
1336 xtensa,
13361337 nvptx,
13371338 nvptx64,
13381339 le32,
src/zig_llvm.cpp+16-16
......@@ -112,7 +112,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri
112112 const char *CPU, const char *Features, LLVMCodeGenOptLevel Level, LLVMRelocMode Reloc,
113113 LLVMCodeModel CodeModel, bool function_sections, ZigLLVMABIType float_abi, const char *abi_name)
114114{
115 Optional<Reloc::Model> RM;
115 std::optional<Reloc::Model> RM;
116116 switch (Reloc){
117117 case LLVMRelocStatic:
118118 RM = Reloc::Static;
......@@ -137,7 +137,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri
137137 }
138138
139139 bool JIT;
140 Optional<CodeModel::Model> CM = unwrap(CodeModel, JIT);
140 std::optional<CodeModel::Model> CM = unwrap(CodeModel, JIT);
141141
142142 CodeGenOpt::Level OL;
143143 switch (Level) {
......@@ -287,11 +287,12 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
287287
288288 // Instrumentations
289289 PassInstrumentationCallbacks instr_callbacks;
290 StandardInstrumentations std_instrumentations(false);
290 StandardInstrumentations std_instrumentations(llvm_module.getContext(), false);
291291 std_instrumentations.registerCallbacks(instr_callbacks);
292292
293 std::optional<PGOOptions> opt_pgo_options = {};
293294 PassBuilder pass_builder(&target_machine, pipeline_opts,
294 None, &instr_callbacks);
295 opt_pgo_options, &instr_callbacks);
295296
296297 LoopAnalysisManager loop_am;
297298 FunctionAnalysisManager function_am;
......@@ -415,14 +416,9 @@ ZIG_EXTERN_C LLVMTypeRef ZigLLVMTokenTypeInContext(LLVMContextRef context_ref) {
415416
416417
417418ZIG_EXTERN_C void ZigLLVMSetOptBisectLimit(LLVMContextRef context_ref, int limit) {
418 // In LLVM15 we just have an OptBisect singleton we can edit.
419 OptBisect& bisect = getOptBisector();
420 bisect.setLimit(limit);
421
422 // In LLVM16 OptBisect will be wrapped in OptPassGate, and will need to be set per context.
423 // static OptBisect _opt_bisector;
424 // _opt_bisector.setLimit(limit);
425 // unwrap(context_ref)->setOptPassGate(_opt_bisector);
419 static OptBisect opt_bisect;
420 opt_bisect.setLimit(limit);
421 unwrap(context_ref)->setOptPassGate(opt_bisect);
426422}
427423
428424LLVMValueRef ZigLLVMAddFunctionInAddressSpace(LLVMModuleRef M, const char *Name, LLVMTypeRef FunctionTy, unsigned AddressSpace) {
......@@ -435,8 +431,8 @@ LLVMValueRef ZigLLVMBuildCall(LLVMBuilderRef B, LLVMTypeRef Ty, LLVMValueRef Fn,
435431 const char *Name)
436432{
437433 FunctionType *FTy = unwrap<FunctionType>(Ty);
438 CallInst *call_inst = unwrap(B)->CreateCall(FTy, unwrap(Fn), makeArrayRef(unwrap(Args),
439 NumArgs), Name);
434 CallInst *call_inst = unwrap(B)->CreateCall(FTy, unwrap(Fn),
435 ArrayRef(unwrap(Args), NumArgs), Name);
440436 call_inst->setCallingConv(static_cast<CallingConv::ID>(CC));
441437 switch (attr) {
442438 case ZigLLVM_CallAttrAuto:
......@@ -579,7 +575,7 @@ ZigLLVMDIType *ZigLLVMCreateDebugPointerType(ZigLLVMDIBuilder *dibuilder, ZigLLV
579575 uint64_t size_in_bits, uint64_t align_in_bits, const char *name)
580576{
581577 DIType *di_type = reinterpret_cast<DIBuilder*>(dibuilder)->createPointerType(
582 reinterpret_cast<DIType*>(pointee_type), size_in_bits, align_in_bits, Optional<unsigned>(), name);
578 reinterpret_cast<DIType*>(pointee_type), size_in_bits, align_in_bits, std::optional<unsigned>(), name);
583579 return reinterpret_cast<ZigLLVMDIType*>(di_type);
584580}
585581
......@@ -625,7 +621,7 @@ ZigLLVMDIEnumerator *ZigLLVMCreateDebugEnumeratorOfArbitraryPrecision(ZigLLVMDIB
625621 const char *name, unsigned NumWords, const uint64_t Words[], unsigned int bits, bool isUnsigned)
626622{
627623 DIEnumerator *di_enumerator = reinterpret_cast<DIBuilder*>(dibuilder)->createEnumerator(name,
628 APSInt(APInt(bits, makeArrayRef(Words, NumWords)), isUnsigned));
624 APSInt(APInt(bits, ArrayRef(Words, NumWords)), isUnsigned));
629625 return reinterpret_cast<ZigLLVMDIEnumerator*>(di_enumerator);
630626}
631627
......@@ -1493,6 +1489,7 @@ static_assert((Triple::ArchType)ZigLLVM_thumbeb == Triple::thumbeb, "");
14931489static_assert((Triple::ArchType)ZigLLVM_x86 == Triple::x86, "");
14941490static_assert((Triple::ArchType)ZigLLVM_x86_64 == Triple::x86_64, "");
14951491static_assert((Triple::ArchType)ZigLLVM_xcore == Triple::xcore, "");
1492static_assert((Triple::ArchType)ZigLLVM_xtensa == Triple::xtensa, "");
14961493static_assert((Triple::ArchType)ZigLLVM_nvptx == Triple::nvptx, "");
14971494static_assert((Triple::ArchType)ZigLLVM_nvptx64 == Triple::nvptx64, "");
14981495static_assert((Triple::ArchType)ZigLLVM_le32 == Triple::le32, "");
......@@ -1578,6 +1575,9 @@ static_assert((Triple::EnvironmentType)ZigLLVM_GNUABIN32 == Triple::GNUABIN32, "
15781575static_assert((Triple::EnvironmentType)ZigLLVM_GNUABI64 == Triple::GNUABI64, "");
15791576static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABI == Triple::GNUEABI, "");
15801577static_assert((Triple::EnvironmentType)ZigLLVM_GNUEABIHF == Triple::GNUEABIHF, "");
1578static_assert((Triple::EnvironmentType)ZigLLVM_GNUF32 == Triple::GNUF32, "");
1579static_assert((Triple::EnvironmentType)ZigLLVM_GNUF64 == Triple::GNUF64, "");
1580static_assert((Triple::EnvironmentType)ZigLLVM_GNUSF == Triple::GNUSF, "");
15811581static_assert((Triple::EnvironmentType)ZigLLVM_GNUX32 == Triple::GNUX32, "");
15821582static_assert((Triple::EnvironmentType)ZigLLVM_GNUILP32 == Triple::GNUILP32, "");
15831583static_assert((Triple::EnvironmentType)ZigLLVM_CODE16 == Triple::CODE16, "");
src/zig_llvm.h+4
......@@ -382,6 +382,7 @@ enum ZigLLVM_ArchType {
382382 ZigLLVM_x86, // X86: i[3-9]86
383383 ZigLLVM_x86_64, // X86-64: amd64, x86_64
384384 ZigLLVM_xcore, // XCore: xcore
385 ZigLLVM_xtensa, // Tensilica: Xtensa
385386 ZigLLVM_nvptx, // NVPTX: 32-bit
386387 ZigLLVM_nvptx64, // NVPTX: 64-bit
387388 ZigLLVM_le32, // le32: generic little-endian 32-bit CPU (PNaCl)
......@@ -482,6 +483,9 @@ enum ZigLLVM_EnvironmentType {
482483 ZigLLVM_GNUABI64,
483484 ZigLLVM_GNUEABI,
484485 ZigLLVM_GNUEABIHF,
486 ZigLLVM_GNUF32,
487 ZigLLVM_GNUF64,
488 ZigLLVM_GNUSF,
485489 ZigLLVM_GNUX32,
486490 ZigLLVM_GNUILP32,
487491 ZigLLVM_CODE16,