Bump to LLVM 20.1

CMakeLists.txt

@@ -2,7 +2,7 @@ if (NOT DEFINED LLVM_VERSION_MAJOR)
   project(llvm-cbe)
   set (USE_SYSTEM_LLVM 1)
   cmake_minimum_required(VERSION 3.20.0)
-  find_package(LLVM 19.1 REQUIRED CONFIG)
+  find_package(LLVM 20.1 REQUIRED CONFIG)
   message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
   message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
   message(STATUS "LLVM_INCLUDE_DIRS: ${LLVM_INCLUDE_DIRS}")

lib/Target/CBackend/CBackend.cpp

@@ -316,9 +316,6 @@ raw_ostream &CWriter::printTypeString(raw_ostream &Out, Type *Ty,
   case Type::FP128TyID:
     return Out << "f128";
 
-  case Type::X86_MMXTyID:
-    return Out << (isSigned ? "i32y2" : "u32y2");
-
   case Type::FunctionTyID:
     llvm_unreachable(
         "printTypeString should never be called with a function type");
@@ -543,10 +540,6 @@ raw_ostream &CWriter::printSimpleType(raw_ostream &Out, Type *Ty,
   case Type::FP128TyID:
     return Out << "long double";
 
-  case Type::X86_MMXTyID:
-    return Out << (isSigned ? "int32_t" : "uint32_t")
-               << " __attribute__((vector_size(8)))";
-
   default:
     DBG_ERRS("Unknown primitive type: " << *Ty);
     errorWithMessage("unknown primitive type");
@@ -2380,7 +2373,7 @@ void CWriter::generateCompilerSpecificCode(raw_ostream &Out,
 bool CWriter::doInitialization(Module &M) {
   TheModule = &M;
 
-  TD = new DataLayout(&M);
+  TD = new DataLayout(M.getDataLayout());
   IL = new IntrinsicLowering(*TD);
 
   TAsm = new CBEMCAsmInfo();

lib/Target/CBackend/CTargetMachine.h

@@ -33,6 +33,7 @@ class CTargetSubtargetInfo : public TargetSubtargetInfo {
   CTargetSubtargetInfo(const TargetMachine &TM, const Triple &TT, StringRef CPU,
                        StringRef TuneCPU, StringRef FS)
       : TargetSubtargetInfo(TT, CPU, TuneCPU, FS,
+                            ArrayRef<StringRef>(),
                             ArrayRef<SubtargetFeatureKV>(),
                             ArrayRef<SubtargetSubTypeKV>(), nullptr, nullptr,
                             nullptr, nullptr, nullptr, nullptr),
@@ -42,16 +43,19 @@ class CTargetSubtargetInfo : public TargetSubtargetInfo {
   const CTargetLowering Lowering;
 };
 
-class CTargetMachine : public LLVMTargetMachine {
+class CTargetMachine : public TargetMachine {
 public:
   CTargetMachine(const Target &T, const Triple &TT, StringRef CPU, StringRef FS,
                  const TargetOptions &Options, std::optional<Reloc::Model> RM,
                  std::optional<CodeModel::Model> CM, CodeGenOptLevel OL,
                  bool /*JIT*/)
-      : LLVMTargetMachine(T, "", TT, CPU, FS, Options,
-                          RM.value_or(Reloc::Static),
-                          CM.value_or(CodeModel::Small), OL),
-        SubtargetInfo(*this, TT, CPU, "", FS) {}
+      : TargetMachine(T, "", TT, CPU, FS, Options),
+        SubtargetInfo(*this, TT, CPU, "", FS)
+  {
+      this->RM = RM.value_or(Reloc::Static);
+      this->CMModel = CM.value_or(CodeModel::Small);
+      this->OptLevel = OL;
+  }
 
   /// Add passes to the specified pass manager to get the specified file
   /// emitted.  Typically this will involve several steps of code generation.

tools/llvm-cbe/CMakeLists.txt

@@ -35,5 +35,7 @@ if(USE_SYSTEM_LLVM)
     CBackendCodeGen
     CBackendInfo
     )
-  target_link_libraries(llvm-cbe LLVM ${llvm_libs})
+  target_link_libraries(llvm-cbe
+    LLVMXRay;LLVMLibDriver;LLVMDlltoolDriver;LLVMTelemetry;LLVMTextAPIBinaryReader;LLVMCoverage;LLVMLineEditor;LLVMNVPTXCodeGen;LLVMNVPTXDesc;LLVMNVPTXInfo;LLVMRISCVTargetMCA;LLVMRISCVDisassembler;LLVMRISCVAsmParser;LLVMRISCVCodeGen;LLVMRISCVDesc;LLVMRISCVInfo;LLVMWebAssemblyDisassembler;LLVMWebAssemblyAsmParser;LLVMWebAssemblyCodeGen;LLVMWebAssemblyUtils;LLVMWebAssemblyDesc;LLVMWebAssemblyInfo;LLVMBPFDisassembler;LLVMBPFAsmParser;LLVMBPFCodeGen;LLVMBPFDesc;LLVMBPFInfo;LLVMX86TargetMCA;LLVMX86Disassembler;LLVMX86AsmParser;LLVMX86CodeGen;LLVMX86Desc;LLVMX86Info;LLVMARMDisassembler;LLVMARMAsmParser;LLVMARMCodeGen;LLVMARMDesc;LLVMARMUtils;LLVMARMInfo;LLVMAArch64Disassembler;LLVMAArch64AsmParser;LLVMAArch64CodeGen;LLVMAArch64Desc;LLVMAArch64Utils;LLVMAArch64Info;LLVMOrcDebugging;LLVMOrcJIT;LLVMWindowsDriver;LLVMMCJIT;LLVMJITLink;LLVMInterpreter;LLVMExecutionEngine;LLVMRuntimeDyld;LLVMOrcTargetProcess;LLVMOrcShared;LLVMDWP;LLVMOption;LLVMObjectYAML;LLVMObjCopy;LLVMMCA;LLVMMCDisassembler;LLVMLTO;LLVMPasses;LLVMHipStdPar;LLVMCFGuard;LLVMCoroutines;LLVMipo;LLVMVectorize;LLVMSandboxIR;LLVMLinker;LLVMInstrumentation;LLVMFrontendOpenMP;LLVMFrontendOffloading;LLVMFrontendOpenACC;LLVMFrontendHLSL;LLVMFrontendDriver;LLVMFrontendAtomic;LLVMExtensions;LLVMDWARFLinkerParallel;LLVMDWARFLinkerClassic;LLVMDWARFLinker;LLVMGlobalISel;LLVMMIRParser;LLVMAsmPrinter;LLVMSelectionDAG;LLVMCodeGen;LLVMTarget;LLVMObjCARCOpts;LLVMCodeGenTypes;LLVMCGData;LLVMIRPrinter;LLVMInterfaceStub;LLVMFileCheck;LLVMFuzzMutate;LLVMScalarOpts;LLVMInstCombine;LLVMAggressiveInstCombine;LLVMTransformUtils;LLVMBitWriter;LLVMAnalysis;LLVMProfileData;LLVMSymbolize;LLVMObject;LLVMTextAPI;LLVMMCParser;LLVMIRReader;LLVMAsmParser;LLVMMC;LLVMBitReader;LLVMFuzzerCLI;LLVMCore;LLVMRemarks;LLVMBitstreamReader;LLVMBinaryFormat;LLVMTargetParser;LLVMTableGen;LLVMSupport;LLVMDemangle;
+    ${llvm_libs})
 endif()