[SOL] Bump stack frame size

anza-xyz · Aug 19, 2024 · db61ceb · db61ceb
1 parent 37daba6
commit db61ceb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp
@@ -13,6 +13,7 @@
 
 #include "BPFISelLowering.h"
 #include "BPF.h"
+#include "BPFRegisterInfo.h"
 #include "BPFSubtarget.h"
 #include "BPFTargetMachine.h"
 #include "llvm/CodeGen/CallingConvLower.h"
@@ -388,7 +389,7 @@ SDValue BPFTargetLowering::LowerFormalArguments(
 
       // Arguments relative to BPF::R5
       unsigned reg = MF.addLiveIn(BPF::R5, &BPF::GPRRegClass);
-      SDValue Const = DAG.getConstant(2047 - VA.getLocMemOffset(), DL, MVT::i64);
+      SDValue Const = DAG.getConstant(FrameLength - VA.getLocMemOffset(), DL, MVT::i64);
       SDValue SDV = DAG.getCopyFromReg(Chain, DL, reg, getPointerTy(MF.getDataLayout()));
       SDV = DAG.getNode(ISD::SUB, DL, PtrVT, SDV, Const);
       SDV = DAG.getLoad(LocVT, DL, Chain, SDV, MachinePointerInfo(), 0);
@@ -500,7 +501,7 @@ SDValue BPFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       assert(VA.isMemLoc());
 
       EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
-      SDValue Const = DAG.getConstant(2047 - VA.getLocMemOffset(), CLI.DL, MVT::i64);
+      SDValue Const = DAG.getConstant(FrameLength - VA.getLocMemOffset(), CLI.DL, MVT::i64);
       SDValue PtrOff = DAG.getNode(ISD::SUB, CLI.DL, PtrVT, FramePtr, Const);
       Chain = DAG.getStore(Chain, CLI.DL, Arg, PtrOff, MachinePointerInfo());
     }

diff --git a/llvm/lib/Target/BPF/BPFRegisterInfo.cpp b/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
@@ -49,13 +49,11 @@ BitVector BPFRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
 
 static void WarnSize(int Offset, MachineFunction &MF, DebugLoc& DL)
 {
-  if (Offset <= -2048) {
-      const Function &F = MF.getFunction();
-      DiagnosticInfoUnsupported DiagStackSize(F,
-          "Looks like the BPF stack limit of 2048 bytes is exceeded. "
-          "Please move large on stack variables into BPF per-cpu array map.\n",
-          DL);
-      F.getContext().diagnose(DiagStackSize);
+  int MaxOffset = -1 * FrameLength;
+  if (Offset < MaxOffset) {
+      dbgs() << "Error: Function " << MF.getFunction().getName() << " Stack offset of " << Offset
+             << " exceeded max offset of " <<  MaxOffset << " by "
+             << -(Offset - MaxOffset) << " bytes, please minimize large stack variables\n";
   }
 }
 

diff --git a/llvm/lib/Target/BPF/BPFRegisterInfo.h b/llvm/lib/Target/BPF/BPFRegisterInfo.h
@@ -18,6 +18,8 @@
 #define GET_REGINFO_HEADER
 #include "BPFGenRegisterInfo.inc"
 
+static const unsigned FrameLength = 4096;
+
 namespace llvm {
 
 struct BPFRegisterInfo : public BPFGenRegisterInfo {