[SOL] Do not add stack pointer adjustment at end (#156)

Author: LucasSte

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

@@ -14,7 +14,7 @@ on:
         required: false
       os_list:
         required: false
-        default: '["ubuntu-22.04", "windows-2019", "macOS-13"]'
+        default: '["ubuntu-22.04", "windows-2022", "macOS-13"]'
       python_version:
         required: false
         type: string

llvm/lib/Target/SBF/SBFFrameLowering.cpp

@@ -19,43 +19,28 @@
 
 using namespace llvm;
 
-namespace {
+bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
 
-void adjustStackPointer(MachineFunction &MF, MachineBasicBlock &MBB,
-                        MachineBasicBlock::iterator &MBBI, bool IsSubtract) {
+void SBFFrameLowering::emitPrologue(MachineFunction &MF,
+                                    MachineBasicBlock &MBB) const {
+  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
+    return;
+  }
+  MachineBasicBlock::iterator MBBI = MBB.begin();
   MachineFrameInfo &MFI = MF.getFrameInfo();
   int NumBytes = (int)MFI.getStackSize();
   if (NumBytes) {
-    DebugLoc Dl;
+    DebugLoc Dl = MBBI->getDebugLoc();
     const SBFInstrInfo &TII =
         *static_cast<const SBFInstrInfo *>(MF.getSubtarget().getInstrInfo());
     BuildMI(MBB, MBBI, Dl, TII.get(SBF::ADD_ri), SBF::R10)
         .addReg(SBF::R10)
-        .addImm(IsSubtract ? -NumBytes : NumBytes);
+        .addImm(-NumBytes);
   }
 }
 
-} // namespace
-
-bool SBFFrameLowering::hasFP(const MachineFunction &MF) const { return true; }
-
-void SBFFrameLowering::emitPrologue(MachineFunction &MF,
-                                    MachineBasicBlock &MBB) const {
-  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
-    return;
-  }
-  MachineBasicBlock::iterator MBBI = MBB.begin();
-  adjustStackPointer(MF, MBB, MBBI, true);
-}
-
 void SBFFrameLowering::emitEpilogue(MachineFunction &MF,
-                                    MachineBasicBlock &MBB) const {
-  if (!MF.getSubtarget<SBFSubtarget>().getHasDynamicFrames()) {
-    return;
-  }
-  MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
-  adjustStackPointer(MF, MBB, MBBI, false);
-}
+                                    MachineBasicBlock &MBB) const {}
 
 void SBFFrameLowering::determineCalleeSaves(MachineFunction &MF,
                                             BitVector &SavedRegs,

llvm/test/CodeGen/SBF/dynamic_stack_frame_add_not_sub.ll

@@ -13,7 +13,7 @@
 define i32 @test_func(ptr noundef %vec, i32 noundef %idx) #0 {
 ; CHECK-LABEL: test_func:
 ; CHECK: add64 r10, -128
-; CHECK: add64 r10, 128
+; CHECK-NOT: add64 r10, 128
 entry:
   %vec.addr = alloca ptr, align 8
   %idx.addr = alloca i512, align 4

llvm/test/CodeGen/SBF/many_args_new_conv.ll

@@ -68,7 +68,7 @@ define i32 @callee_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32 %p
 ; CHECK: ldxdw r2, [r10 + 88]
 ; Loading allocated i32
 ; CHECK: ldxw r0, [r10 + 24]
-; CHECK: add64 r10, 128
+; CHECK-NOT: add64 r10, 128
 
 entry:
   %o = alloca i512
@@ -97,7 +97,7 @@ define i32 @callee_no_alloca(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f, i32
 ; CHECK: ldxdw r1, [r10 + 32]
 ; CHECK: ldxdw r1, [r10 + 24]
 
-; CHECK: add64 r10, 64
+; CHECK-NOT: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c

llvm/test/CodeGen/SBF/stack_args_v2.ll

@@ -24,7 +24,7 @@ define i32 @bar(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) #1 {
 ; CHECK: sub64 r0, r5
 ; CHECK: ldxdw r1, [r10 + 56]
 ; CHECK: add64 r0, r1
-; CHECK: add64 r10, 64
+; CHECK-NOT: add64 r10, 64
 entry:
   %g = add i32 %a, %b
   %h = sub i32 %g, %c