Second try upgrading to llvm20

.github/workflows/main.yml

@@ -32,19 +32,19 @@ jobs:
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 19 all
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 160
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 160
-          sudo update-alternatives --install /usr/bin/lli lli /usr/bin/lli-19 160
-          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-19 160
+          sudo ./llvm.sh 20 all
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 160
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 160
+          sudo update-alternatives --install /usr/bin/lli lli /usr/bin/lli-20 160
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 160
 
       - name: Setup LLVM and GCC (MacOS)
         if: ${{ runner.os == 'macOS' }}
         run: |
-          brew install llvm@19 gcc@14
-          echo "$(brew --prefix llvm@19)/bin" >> $GITHUB_PATH
-          echo "CC=$(brew --prefix llvm@19)/bin/clang" >> $GITHUB_ENV
-          echo "CXX=$(brew --prefix llvm@19)/bin/clang++" >> $GITHUB_ENV
+          brew install llvm@20 gcc@14
+          echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH
+          echo "CC=$(brew --prefix llvm@20)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@20)/bin/clang++" >> $GITHUB_ENV
           cd /usr/local/bin
           ln -s `which gcc-14` gcc
 
@@ -65,7 +65,7 @@ jobs:
       - name: Build
         run: |
           mkdir build
-          cmake -S . -B build -DLLVM_INCLUDE_TESTS=On -DLLVM_DIR=/usr/lib/llvm-19/cmake
+          cmake -S . -B build -DLLVM_INCLUDE_TESTS=On -DLLVM_DIR=/usr/lib/llvm-20/cmake
           cmake --build build
 
       - name: Test
@@ -84,7 +84,7 @@ jobs:
         uses: actions/checkout@master
         with:
           repository: llvm/llvm-project
-          ref: llvmorg-19.1.1
+          ref: llvmorg-20.1.8
 
       - name: Checkout
         uses: actions/checkout@v5

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

@@ -32,7 +32,7 @@ class CTargetSubtargetInfo : public TargetSubtargetInfo {
 public:
   CTargetSubtargetInfo(const TargetMachine &TM, const Triple &TT, StringRef CPU,
                        StringRef TuneCPU, StringRef FS)
-      : TargetSubtargetInfo(TT, CPU, TuneCPU, FS,
+      : TargetSubtargetInfo(TT, CPU, TuneCPU, FS, ArrayRef<StringRef>(),
                             ArrayRef<SubtargetFeatureKV>(),
                             ArrayRef<SubtargetSubTypeKV>(), nullptr, nullptr,
                             nullptr, nullptr, nullptr, nullptr),
@@ -42,16 +42,18 @@ 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
+    LLVM
+    ${llvm_libs})
 endif()