make it build with llvm 22 (#240)

Author: el-ev

.github/workflows/main.yml

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

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 20.1 REQUIRED CONFIG)
+  find_package(LLVM 22.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}")

README.md

@@ -6,7 +6,7 @@ This LLVM C backend has been resurrected by Julia Computing with various improve
 Installation instructions
 =========================
 
-This version of the LLVM C backend works with LLVM 20, for older versions please check the [tags](https://github.com/JuliaHubOSS/llvm-cbe/tags).
+This version of the LLVM C backend works with LLVM 22, for older versions please check the [tags](https://github.com/JuliaHubOSS/llvm-cbe/tags).
 
 Step 1: Installing LLVM
 =======================
@@ -26,10 +26,10 @@ On CentOS, install the llvm-devel package:
 
 On Debian and derivatives, install the llvm-dev package via:
 ```sh
-    ~$ apt install llvm-20-dev clang-20 ninja-build
+    ~$ apt install llvm-22-dev clang-22 ninja-build
 ```
 
-Note: this project uses LLVM 20, so make sure that the package manager is installing it and not some other version. At the time of writing, [`Ubuntu 24.04 LTS` installs version 18](https://launchpad.net/ubuntu/noble/+package/llvm-dev).
+Note: this project uses LLVM 22, so make sure that the package manager is installing it and not some other version. At the time of writing, [`Ubuntu 24.04 LTS` installs version 18](https://launchpad.net/ubuntu/noble/+package/llvm-dev).
 
 Or compile LLVM yourself:
 -----------------------------
@@ -39,7 +39,7 @@ The first step is to compile LLVM on your machine
 (this assumes an in-tree build, but out-of-tree will also work):
 
 ```sh
-     ~$ git clone --single-branch --branch llvmorg-20.1.8 --depth 1 https://github.com/llvm/llvm-project.git
+     ~$ git clone --single-branch --branch llvmorg-22.1.8 --depth 1 https://github.com/llvm/llvm-project.git
      ~$ cd llvm-project
      llvm-project$ mkdir llvm/build
      llvm-project$ cd llvm/build
@@ -77,7 +77,7 @@ If llvm-cbe compiles, you should be able to run it with the following commands.
     llvm-cbe$ cd test/selectionsort
     selectionsort$ ls
     main.c
-    selectionsort$ clang-20 -S -emit-llvm -g main.c
+    selectionsort$ clang-22 -S -emit-llvm -g main.c
     selectionsort$ ls
     main.c main.ll
     selectionsort$ ../../build/tools/llvm-cbe/llvm-cbe main.ll

lib/Target/CBackend/CBackend.cpp

@@ -2664,10 +2664,10 @@ void CWriter::generateHeader(Module &M) {
       Out << " __HIDDEN__";
     }
 
-    unsigned Alignment = I->getAlignment();
-    if (Alignment != 0) {
+    MaybeAlign Alignment = I->getAlign();
+    if (Alignment) {
       headerUseFunctionAlign();
-      Out << " __FUNCTIONALIGN__(" << Alignment << ") ";
+      Out << " __FUNCTIONALIGN__(" << Alignment->value() << ") ";
     }
 
     if (I->hasName() && I->getName()[0] == 1)
@@ -2704,9 +2704,13 @@ void CWriter::generateHeader(Module &M) {
         Out << "__thread ";
 
       Type *ElTy = I->getValueType();
-      unsigned Alignment = I->getAliaseeObject()->getAlignment();
-      bool IsOveraligned =
-          Alignment && Alignment > TD->getABITypeAlign(ElTy).value();
+      GlobalObject *Aliasee = I->getAliaseeObject();
+      MaybeAlign AliaseeAlign = isa<Function>(Aliasee)
+                                    ? cast<Function>(Aliasee)->getAlign()
+                                    : cast<GlobalVariable>(Aliasee)->getAlign();
+      unsigned Alignment = AliaseeAlign ? AliaseeAlign->value() : 0;
+      bool IsOveraligned = !ElTy->isFunctionTy() && Alignment &&
+                           Alignment > TD->getABITypeAlign(ElTy).value();
       if (IsOveraligned) {
         headerUseAligns();
         Out << "__PREFIXALIGN__(" << Alignment << ") ";
@@ -5338,7 +5342,8 @@ void CWriter::visitInlineAsm(CallInst &CI) {
   }
 
   // Fix up the asm string for gcc and emit it.
-  Out << "__asm__ volatile (\"" << gccifyAsm(as->getAsmString()) << "\"\n";
+  Out << "__asm__ volatile (\"" << gccifyAsm(as->getAsmString().str())
+      << "\"\n";
   Out << "        :";
 
   unsigned ValueCount = 0;

lib/Target/CBackend/CTargetMachine.h

@@ -23,7 +23,8 @@ namespace llvm {
 
 class CTargetLowering : public TargetLowering {
 public:
-  explicit CTargetLowering(const TargetMachine &TM) : TargetLowering(TM) {
+  CTargetLowering(const TargetMachine &TM, const TargetSubtargetInfo &STI)
+      : TargetLowering(TM, STI) {
     setMaxAtomicSizeInBitsSupported(0);
   }
 };
@@ -36,8 +37,9 @@ class CTargetSubtargetInfo : public TargetSubtargetInfo {
                             ArrayRef<SubtargetFeatureKV>(),
                             ArrayRef<SubtargetSubTypeKV>(), nullptr, nullptr,
                             nullptr, nullptr, nullptr, nullptr),
-        Lowering(TM) {}
+        Lowering(TM, *this) {}
   bool enableAtomicExpand() const override;
+  const TargetRegisterInfo *getRegisterInfo() const override { return nullptr; }
   const TargetLowering *getTargetLowering() const override;
   const CTargetLowering Lowering;
 };

tools/llvm-cbe/llvm-cbe.cpp

@@ -230,7 +230,7 @@ static int compileModule(char **argv, LLVMContext &Context) {
 
     // If we are supposed to override the target triple, do so now.
     if (!TargetTriple.empty())
-      mod->setTargetTriple(Triple::normalize(TargetTriple));
+      mod->setTargetTriple(Triple(Triple::normalize(TargetTriple)));
     TheTriple = Triple(mod->getTargetTriple());
   } else {
     TheTriple = Triple(Triple::normalize(TargetTriple));
@@ -284,9 +284,10 @@ static int compileModule(char **argv, LLVMContext &Context) {
 
   TargetOptions Options;
   Options.AllowFPOpFusion = codegen::getFuseFPOps();
-  Options.UnsafeFPMath = codegen::getEnableUnsafeFPMath();
   Options.NoInfsFPMath = codegen::getEnableNoInfsFPMath();
   Options.NoNaNsFPMath = codegen::getEnableNoNaNsFPMath();
+  Options.NoSignedZerosFPMath = codegen::getEnableNoSignedZerosFPMath();
+  Options.NoTrappingFPMath = codegen::getEnableNoTrappingFPMath();
   Options.HonorSignDependentRoundingFPMathOption =
       codegen::getEnableHonorSignDependentRoundingFPMath();
   if (codegen::getFloatABIForCalls() != FloatABI::Default)
@@ -296,9 +297,9 @@ static int compileModule(char **argv, LLVMContext &Context) {
 
   // Jackson Korba 9/30/14
   // OwningPtr<targetMachine>
-  std::unique_ptr<TargetMachine> target(TheTarget->createTargetMachine(
-      TheTriple.getTriple(), codegen::getMCPU(), FeaturesStr, Options,
-      llvm::codegen::getRelocModel()));
+  std::unique_ptr<TargetMachine> target(
+      TheTarget->createTargetMachine(TheTriple, codegen::getMCPU(), FeaturesStr,
+                                     Options, llvm::codegen::getRelocModel()));
   assert(target.get() && "Could not allocate target machine!");
   assert(mod && "Should have exited after outputting help!");
   TargetMachine &Target = *target.get();