Update toolchain to LLVM 18

.github/workflows/clang-tests.yml

@@ -6,6 +6,7 @@ permissions:
 on:
   workflow_dispatch:
   push:
+    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -14,6 +15,7 @@ on:
       - '.github/workflows/llvm-project-tests.yml'
       - '!llvm/**'
   pull_request:
+    ignore-forks: true
     branches:
       - 'release/**'
     paths:

.github/workflows/lld-tests.yml

@@ -6,6 +6,7 @@ permissions:
 on:
   workflow_dispatch:
   push:
+    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -14,6 +15,7 @@ on:
       - '.github/workflows/llvm-project-tests.yml'
       - '!llvm/**'
   pull_request:
+    ignore-forks: true
     branches:
       - 'release/**'
     paths:

.github/workflows/llvm-project-tests.yml

@@ -65,7 +65,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.os_list) }}
+        os:
+          - ubuntu-latest
+          # Use windows-2019 due to:
+          # https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
+          - windows-2019
+          # We're using a specific version of macOS due to:
+          # https://github.com/actions/virtual-environments/issues/5900
+          - macOS-latest
+        include:
+          - compile_cache: sccache
+
+          - compile_cache: ccache
+            os: macos-latest
     steps:
       - name: Setup Windows
         if: startsWith(matrix.os, 'windows')
@@ -79,7 +91,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ inputs.python_version }}
+          python-version: '3.11'
       - name: Install Ninja
         if: runner.os != 'Linux'
         uses: llvm/actions/install-ninja@main
@@ -89,7 +101,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 250
-      - name: Setup ccache
+      - name: Setup ${{ matrix.compile_cache }}
         uses: hendrikmuhs/ccache-action@v1
         with:
           # A full build of llvm, clang, lld, and lldb takes about 250MB
@@ -101,49 +113,24 @@ jobs:
           # fit under the 10 GB limit.
           # Default to 2G to workaround: https://github.com/hendrikmuhs/ccache-action/issues/174
           max-size: 2G
-          key: ${{ matrix.os }}
-          variant: sccache
+          key: ${{ matrix.compile_cache }}-${{ matrix.os }}
+          variant: ${{ matrix.compile_cache }}
       - name: Build and Test
+        if: "!startsWith(matrix.os, 'windows')"
+        uses: llvm/actions/build-test-llvm-project@main
         env:
           # Workaround for https://github.com/actions/virtual-environments/issues/5900.
           # This should be a no-op for non-mac OSes
           PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
-        shell: bash
-        id: build-llvm
-        run: |
-          if [ "${{ runner.os }}" == "Linux" ]; then
-            builddir="/mnt/build/"
-            mkdir -p $builddir
-            extra_cmake_args="-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang"
-          else
-            builddir="$(pwd)"/build
-          fi
-          if [ "${{ runner.os }}" == "macOS" ]; then
-            # Workaround test failure on some lld tests on MacOS
-            # https://github.com/llvm/llvm-project/issues/81967
-            extra_cmake_args="-DLLVM_DISABLE_ASSEMBLY_FILES=ON"
-          fi
-          echo "llvm-builddir=$builddir" >> "$GITHUB_OUTPUT"
-          cmake -G Ninja \
-                -B "$builddir" \
-                -S llvm \
-                -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DLLVM_ENABLE_ASSERTIONS=ON \
-                -DLLDB_INCLUDE_TESTS=OFF \
-                -DCMAKE_C_COMPILER_LAUNCHER=sccache \
-                -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
-                $extra_cmake_args \
-                ${{ inputs.extra_cmake_args }}
-          ninja -C "$builddir" '${{ inputs.build_target }}'
+        with:
+          cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="BPF;SBF" -DCMAKE_BUILD_TYPE=Release -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.compile_cache }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.compile_cache }}'
+          build_target:  '${{ inputs.build_target }}'
 
       - name: Build and Test libclc
-        if: "!startsWith(matrix.os, 'windows') && contains(inputs.projects, 'libclc')"
-        env:
-          LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
+        if: "!startsWith(matrix.os, 'windows') && !startsWith(matrix.os, 'macOS') && contains(inputs.projects, 'libclc')"
         run: |
           # Make sure all of LLVM libraries that llvm-config needs are built.
-          ninja -C "$LLVM_BUILDDIR"
-          cmake -G Ninja -S libclc -B libclc-build -DLLVM_DIR="$LLVM_BUILDDIR"/lib/cmake/llvm -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
+          ninja -C build
+          cmake -G Ninja -S libclc -B libclc-build -DLLVM_DIR=$(pwd)/build/lib/cmake/llvm -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
           ninja -C libclc-build
           ninja -C libclc-build test

.github/workflows/llvm-tests.yml

@@ -6,15 +6,17 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    branches:
-      - 'release/**'
+    ignore-forks: true
+    #branches:
+    #  - 'release/**'
     paths:
       - 'llvm/**'
       - '.github/workflows/llvm-tests.yml'
       - '.github/workflows/llvm-project-tests.yml'
   pull_request:
-    branches:
-      - 'release/**'
+    ignore-forks: true
+    #branches:
+    #  - 'release/**'
     paths:
       - 'llvm/**'
       - '.github/workflows/llvm-tests.yml'
@@ -27,16 +29,33 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 jobs:
-  check-all:
-    if: github.repository_owner == 'llvm'
-    name: Build and Test
+  check_all:
+    #if: github.repository_owner == 'llvm'
+    name: Test llvm,clang,libclc
     uses: ./.github/workflows/llvm-project-tests.yml
     with:
       build_target: check-all
-      projects: clang;lld;libclc;lldb
+      projects: clang;libclc
+
+  # These need to be separate from the check_all job, becuase there is not enough disk
+  # space to build all these projects on Windows.
+  build_lldb:
+    name: Build lldb
+    uses: ./.github/workflows/llvm-project-tests.yml
+    with:
+      build_target: ''
+      projects: clang;lldb
+
+  check_lld:
+    #if: github.repository_owner == 'llvm'
+    name: Test lld
+    uses: ./.github/workflows/llvm-project-tests.yml
+    with:
+      build_target: check-lld
+      projects: lld
 
   abi-dump-setup:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     runs-on: ubuntu-latest
     outputs:
       BASELINE_REF: ${{ steps.vars.outputs.BASELINE_REF }}
@@ -79,7 +98,7 @@ jobs:
           fi
 
   abi-dump:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     needs: abi-dump-setup
     runs-on: ubuntu-latest
     strategy:
@@ -150,7 +169,7 @@ jobs:
           path: llvm.symbols
 
   abi-compare:
-    if: github.repository_owner == 'llvm'
+    #if: github.repository_owner == 'llvm'
     runs-on: ubuntu-latest
     needs:
       - abi-dump-setup

README.md

@@ -1,3 +1,9 @@
+# The LLVM Compiler Infrastructure modified to support Berkley Packet Filter modules written in Rust
+
+This fork of LLVM is used by [this fork of Rust](https://github.com/anza-xyz/rust)
+
+---
+
 # The LLVM Compiler Infrastructure
 
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/llvm/llvm-project/badge)](https://securityscorecards.dev/viewer/?uri=github.com/llvm/llvm-project)

clang/include/clang/Basic/Attr.td

@@ -438,7 +438,7 @@ def TargetARM : TargetArch<["arm", "thumb", "armeb", "thumbeb"]>;
 def TargetAArch64 : TargetArch<["aarch64", "aarch64_be", "aarch64_32"]>;
 def TargetAnyArm : TargetArch<!listconcat(TargetARM.Arches, TargetAArch64.Arches)>;
 def TargetAVR : TargetArch<["avr"]>;
-def TargetBPF : TargetArch<["bpfel", "bpfeb"]>;
+def TargetBPF : TargetArch<["bpfel", "bpfeb", "sbf"]>;
 def TargetLoongArch : TargetArch<["loongarch32", "loongarch64"]>;
 def TargetMips32 : TargetArch<["mips", "mipsel"]>;
 def TargetAnyMips : TargetArch<["mips", "mipsel", "mips64", "mips64el"]>;

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -798,4 +798,8 @@ def warn_android_unversioned_fallback : Warning<
 
 def err_drv_triple_version_invalid : Error<
   "version '%0' in target triple '%1' is invalid">;
+
+def warn_drv_no_solana_with_bpf : Warning<
+  "'+solana' with bpf target is deprecated; use '-target sbf' instead">;
+
 }

clang/lib/Basic/Targets.cpp

@@ -262,6 +262,8 @@ std::unique_ptr<TargetInfo> AllocateTarget(const llvm::Triple &Triple,
   case llvm::Triple::bpfeb:
   case llvm::Triple::bpfel:
     return std::make_unique<BPFTargetInfo>(Triple, Opts);
+  case llvm::Triple::sbf:
+    return std::make_unique<BPFTargetInfo>(Triple, Opts);
 
   case llvm::Triple::msp430:
     return std::make_unique<MSP430TargetInfo>(Triple, Opts);

clang/lib/Basic/Targets/BPF.cpp

@@ -12,8 +12,10 @@
 
 #include "BPF.h"
 #include "Targets.h"
+#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/MacroBuilder.h"
 #include "clang/Basic/TargetBuiltins.h"
+#include "clang/Driver/DriverDiagnostic.h"
 #include "llvm/ADT/StringRef.h"
 
 using namespace clang;
@@ -60,10 +62,15 @@ void BPFTargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__BPF_FEATURE_GOTOL");
     Builder.defineMacro("__BPF_FEATURE_ST");
   }
+
+  if (HasSolanaFeature) {
+    Builder.defineMacro("__ELF__");
+  }
 }
+
 
 static constexpr llvm::StringLiteral ValidCPUNames[] = {"generic", "v1", "v2",
-                                                        "v3", "v4", "probe"};
+                                                        "v3", "v4", "probe", "sbfv2"};
 
 bool BPFTargetInfo::isValidCPUName(StringRef Name) const {
   return llvm::is_contained(ValidCPUNames, Name);
@@ -80,6 +87,12 @@ ArrayRef<Builtin::Info> BPFTargetInfo::getTargetBuiltins() const {
 
 bool BPFTargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
                                          DiagnosticsEngine &Diags) {
+  // TODO: The SBF back-end now provides the sbf target. Issue deprecation
+  // warning directing use of '-target sbf' instead. Eventually remove the
+  // +solana support from the BPF back-end.
+  if (getTriple().getArch() != llvm::Triple::sbf && HasSolanaFeature)
+    Diags.Report(diag::warn_drv_no_solana_with_bpf);
+
   for (const auto &Feature : Features) {
     if (Feature == "+alu32") {
       HasAlu32 = true;

clang/lib/Basic/Targets/BPF.h

@@ -22,10 +22,11 @@ namespace clang {
 namespace targets {
 
 class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
+  bool HasSolanaFeature = false;
   bool HasAlu32 = false;
 
 public:
-  BPFTargetInfo(const llvm::Triple &Triple, const TargetOptions &)
+  BPFTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : TargetInfo(Triple) {
     LongWidth = LongAlign = PointerWidth = PointerAlign = 64;
     SizeType = UnsignedLong;
@@ -34,10 +35,28 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
     IntMaxType = SignedLong;
     Int64Type = SignedLong;
     RegParmMax = 5;
+    if (Triple.getArch() == llvm::Triple::sbf) {
+      HasSolanaFeature = true;
+    } else {
+      for (auto& it : Opts.FeaturesAsWritten) {
+        if (it == "+solana") {
+          HasSolanaFeature = true;
+          break;
+        }
+      }
+    }
     if (Triple.getArch() == llvm::Triple::bpfeb) {
-      resetDataLayout("E-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      if (HasSolanaFeature) {
+        resetDataLayout("E-m:e-p:64:64-i64:64-n32:64-S128");
+      } else {
+        resetDataLayout("E-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      }
     } else {
-      resetDataLayout("e-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      if (HasSolanaFeature) {
+        resetDataLayout("e-m:e-p:64:64-i64:64-n32:64-S128");
+      } else {
+        resetDataLayout("e-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
+      }
     }
     MaxAtomicPromoteWidth = 64;
     MaxAtomicInlineWidth = 64;
@@ -48,7 +67,8 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
                         MacroBuilder &Builder) const override;
 
   bool hasFeature(StringRef Feature) const override {
-    return Feature == "bpf" || Feature == "alu32" || Feature == "dwarfris";
+    return Feature == "bpf" || Feature == "alu32" || Feature == "dwarfris" ||
+      Feature == "solana";
   }
 
   void setFeatureEnabled(llvm::StringMap<bool> &Features, StringRef Name,
@@ -113,6 +133,8 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
     StringRef CPUName(Name);
     return isValidCPUName(CPUName);
   }
+
+  bool hasBitIntType() const override { return HasSolanaFeature; }
 };
 } // namespace targets
 } // namespace clang

clang/lib/CodeGen/CGBuiltin.cpp

@@ -6019,6 +6019,7 @@ static Value *EmitTargetArchBuiltinExpr(CodeGenFunction *CGF,
     return CGF->EmitAArch64BuiltinExpr(BuiltinID, E, Arch);
   case llvm::Triple::bpfeb:
   case llvm::Triple::bpfel:
+  case llvm::Triple::sbf:
     return CGF->EmitBPFBuiltinExpr(BuiltinID, E);
   case llvm::Triple::x86:
   case llvm::Triple::x86_64:

clang/lib/Driver/CMakeLists.txt

@@ -31,6 +31,7 @@ add_clang_library(clangDriver
   ToolChain.cpp
   ToolChains/Arch/AArch64.cpp
   ToolChains/Arch/ARM.cpp
+  ToolChains/Arch/BPF.cpp
   ToolChains/Arch/CSKY.cpp
   ToolChains/Arch/LoongArch.cpp
   ToolChains/Arch/M68k.cpp