[SOL] Adjustments after LLVM 19 upgrade

anza-xyz · Feb 27, 2025 · c5bb2cb · c5bb2cb
1 parent ae7341e
commit c5bb2cb
Show file tree

Hide file tree

Showing 40 changed files with 459 additions and 237 deletions.
diff --git a/clang/lib/Basic/Targets/BPF.h b/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;
@@ -117,6 +136,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

diff --git a/lld/ELF/Arch/BPF.cpp b/lld/ELF/Arch/BPF.cpp
diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
@@ -60,8 +60,6 @@ TargetInfo *elf::getTarget() {
     return getARMTargetInfo();
   case EM_AVR:
     return getAVRTargetInfo();
-  case EM_BPF:
-    return getBPFTargetInfo();
   case EM_SBF:
     return getSBFTargetInfo();
   case EM_HEXAGON:

diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.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);

diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
@@ -106,6 +106,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
   };
@@ -199,6 +200,7 @@ class Triple {
     Mesa,
     SUSE,
     Solana,
+    OpenEmbedded,
     LastVendorType = OpenEmbedded
   };
   enum OSType {
@@ -243,6 +245,7 @@ class Triple {
     ShaderModel, // DirectX ShaderModel
     LiteOS,
     Serenity,
+    SolanaOS,
     Vulkan, // Vulkan SPIR-V
     LastOSType = Vulkan
   };

diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp
@@ -888,13 +888,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);
 }
 

diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp
@@ -99,7 +99,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);
     }

diff --git a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
@@ -32,8 +32,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) {}
 

diff --git a/llvm/lib/Target/BPF/BPFSubtarget.cpp b/llvm/lib/Target/BPF/BPFSubtarget.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;
@@ -101,10 +99,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));

diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -52,16 +52,11 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeBPFTarget() {
 }
 
 // DataLayout: little or big endian
-static std::string computeDataLayout(const Triple &TT, StringRef FS) {
-  // TODO: jle: remove 'solana', sbf is now provided by the SBF backend.
-  bool IsSolana = FS.contains("solana");
-  if (TT.getArch() == Triple::bpfeb) {
-    return IsSolana ? "E-m:e-p:64:64-i64:64-n32:64-S128"
-      : "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
-  } else {
-    return IsSolana ? "e-m:e-p:64:64-i64:64-n32:64-S128"
-      : "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
-  }
+static std::string computeDataLayout(const Triple &TT) {
+  if (TT.getArch() == Triple::bpfeb)
+    return "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+  else
+    return "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
 }
 
 static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {

diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp b/llvm/lib/Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
@@ -15,7 +15,6 @@
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCFixupKindInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
-#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/EndianStream.h"
 #include <cassert>
 #include <cstdint>

diff --git a/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp b/llvm/lib/Target/SBF/AsmParser/SBFAsmParser.cpp
@@ -138,9 +138,9 @@ struct SBFOperand : public MCParsedAsmOperand {
   /// getEndLoc - Gets location of the last token of this operand
   SMLoc getEndLoc() const override { return EndLoc; }
 
-  unsigned getReg() const override {
+  MCRegister getReg() const override {
     assert(Kind == Register && "Invalid type access!");
-    return Reg.RegNum;
+    return MCRegister(Reg.RegNum);
   }
 
   const MCExpr *getImm() const {
@@ -167,7 +167,7 @@ struct SBFOperand : public MCParsedAsmOperand {
       break;
     case Register:
       OS << "<register ";
-      OS << RegName(getReg()) << ">";
+      OS << RegName(getReg().id()) << ">";
       break;
     case Token:
       OS << "'" << getToken() << "'";
@@ -187,7 +187,7 @@ struct SBFOperand : public MCParsedAsmOperand {
   // Used by the TableGen Code
   void addRegOperands(MCInst &Inst, unsigned N) const {
     assert(N == 1 && "Invalid number of operands!");
-    Inst.addOperand(MCOperand::createReg(getReg()));
+    Inst.addOperand(MCOperand::createReg(getReg().id()));
   }
 
   void addImmOperands(MCInst &Inst, unsigned N) const {

diff --git a/llvm/lib/Target/SBF/BTFDebug.cpp b/llvm/lib/Target/SBF/BTFDebug.cpp
@@ -17,6 +17,7 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/IR/Module.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCSectionELF.h"
@@ -589,7 +590,7 @@ void BTFDebug::processDeclAnnotations(DINodeArray Annotations,
   for (const Metadata *Annotation : Annotations->operands()) {
     const MDNode *MD = cast<MDNode>(Annotation);
     const MDString *Name = cast<MDString>(MD->getOperand(0));
-    if (!Name->getString().equals("btf_decl_tag"))
+    if (Name->getString() != "btf_decl_tag")
       continue;
 
     const MDString *Value = cast<MDString>(MD->getOperand(1));
@@ -628,7 +629,7 @@ int BTFDebug::genBTFTypeTags(const DIDerivedType *DTy, int BaseTypeId) {
     for (const Metadata *Annotations : Annots->operands()) {
       const MDNode *MD = cast<MDNode>(Annotations);
       const MDString *Name = cast<MDString>(MD->getOperand(0));
-      if (!Name->getString().equals("btf_type_tag"))
+      if (Name->getString() != "btf_type_tag")
         continue;
       MDStrs.push_back(cast<MDString>(MD->getOperand(1)));
     }