[SOL] Adjustments after LLVM 19 upgrade

Author: LucasSte

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

@@ -122,7 +122,6 @@ jobs:
           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

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;
@@ -115,6 +134,8 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public TargetInfo {
   std::pair<unsigned, unsigned> hardwareInterferenceSizes() const override {
     return std::make_pair(32, 32);
   }
+
+  bool hasBitIntType() const override { return HasSolanaFeature; }
 };
 } // namespace targets
 } // namespace clang

lld/ELF/Arch/BPF.cpp

@@ -37,6 +37,7 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/TargetSelect.h"
 #include "llvm/TargetParser/Host.h"
 #include "llvm/TargetParser/Triple.h"
 #include <cstdlib>
@@ -72,6 +73,17 @@ LLD_HAS_DRIVER(mingw)
 LLD_HAS_DRIVER(macho)
 LLD_HAS_DRIVER(wasm)
 
+// This function is called on startup. We need this for LTO since
+// LTO calls LLVM functions to compile bitcode files to native code.
+// Technically this can be delayed until we read bitcode files, but
+// we don't bother to do lazily because the initialization is fast.
+static void initLLVM() {
+  InitializeAllTargets();
+  InitializeAllTargetMCs();
+  InitializeAllAsmPrinters();
+  InitializeAllAsmParsers();
+}
+
 int lld_main(int argc, char **argv, const llvm::ToolContext &) {
   initLLVM();
   sys::Process::UseANSIEscapeCodes(true);

lld/tools/lld/lld.cpp

@@ -104,6 +104,7 @@ class Triple {
     wasm64,         // WebAssembly with 64-bit pointers
     renderscript32, // 32-bit RenderScript
     renderscript64, // 64-bit RenderScript
+    sbf,
     ve,             // NEC SX-Aurora Vector Engine
     LastArchType = ve
   };
@@ -244,6 +245,7 @@ class Triple {
     ShaderModel, // DirectX ShaderModel
     LiteOS,
     Serenity,
+    SolanaOS,
     Vulkan, // Vulkan SPIR-V
     LastOSType = Vulkan
   };

llvm/include/llvm/TargetParser/Triple.h

@@ -908,13 +908,6 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
   if (T.isOSAIX())
     TLI.setUnavailable(LibFunc_memrchr);
 
-
-  if (T.isBPF() || T.isSBF()) {
-    TLI.setUnavailable(LibFunc_rust_alloc);
-    TLI.setUnavailable(LibFunc_rust_dealloc);
-    TLI.setUnavailable(LibFunc_rust_realloc);
-  }
-
   TLI.addVectorizableFunctionsFromVecLib(ClVectorLibrary, T);
 }
 

llvm/lib/Analysis/TargetLibraryInfo.cpp

@@ -362,6 +362,7 @@ void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T, bool Large) {
     break;
   case Triple::bpfel:
   case Triple::bpfeb:
+  case Triple::sbf:
     FDECFIEncoding = dwarf::DW_EH_PE_sdata8;
     break;
   case Triple::hexagon:

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -98,7 +98,7 @@ BPFTargetLowering::BPFTargetLowering(const TargetMachine &TM,
 
     setOperationAction(ISD::SDIVREM, VT, Expand);
     setOperationAction(ISD::UDIVREM, VT, Expand);
-    if (!STI.hasSdivSmod() && !Subtarget->isSolana()) {
+    if (!STI.hasSdivSmod()) {
       setOperationAction(ISD::SDIV, VT, Custom);
       setOperationAction(ISD::SREM, VT, Custom);
     }
@@ -279,6 +279,10 @@ void BPFTargetLowering::ReplaceNodeResults(
   switch (Opcode) {
   default:
     report_fatal_error("unhandled custom legalization: " + Twine(Opcode));
+  case ISD::ATOMIC_LOAD_ADD:
+  case ISD::ATOMIC_LOAD_AND:
+  case ISD::ATOMIC_LOAD_OR:
+  case ISD::ATOMIC_LOAD_XOR:
   case ISD::ATOMIC_SWAP:
   case ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS:
     if (HasAlu32 || Opcode == ISD::ATOMIC_LOAD_ADD)

llvm/lib/Target/BPF/BPFISelLowering.cpp

@@ -31,8 +31,6 @@ static cl::opt<int>
                        cl::desc("Specify the BPF stack size limit"),
                        cl::init(512));
 
-unsigned BPFRegisterInfo::FrameLength = 512;
-
 BPFRegisterInfo::BPFRegisterInfo()
     : BPFGenRegisterInfo(BPF::R0) {}
 

llvm/lib/Target/BPF/BPFRegisterInfo.cpp

@@ -51,9 +51,7 @@ BPFSubtarget &BPFSubtarget::initializeSubtargetDependencies(StringRef CPU,
   return *this;
 }
 
-void BPFSubtarget::initializeEnvironment(const Triple &TT) {
-  // TODO: jle: remove, sbf is now provided by the SBF backend.
-  IsSolana = false;
+void BPFSubtarget::initializeEnvironment() {
   HasJmpExt = false;
   HasJmp32 = false;
   HasAlu32 = false;
@@ -103,10 +101,6 @@ BPFSubtarget::BPFSubtarget(const Triple &TT, const std::string &CPU,
       FrameLowering(initializeSubtargetDependencies(CPU, FS)),
       TLInfo(TM, *this) {
   IsLittleEndian = TT.isLittleEndian();
-<<<<<<< HEAD
-=======
-  TSInfo.setSolanaFlag(false);
->>>>>>> 3d16ab60503b ([SOL] Initial squash commit for new SBF LLVM back-end and related.)
 
   CallLoweringInfo.reset(new BPFCallLowering(*getTargetLowering()));
   Legalizer.reset(new BPFLegalizerInfo(*this));