Tweaks

Author: MacDue

llvm/lib/Target/AArch64/AArch64PrologueEpilogue.cpp

@@ -1530,24 +1530,24 @@ void AArch64EpilogueEmitter::emitEpilogue() {
         (AFI->isStackRealigned() || MFI.hasVarSizedObjects()) ? AArch64::FP
                                                               : AArch64::SP;
     if (SVECalleeSavesSize && BaseForSVEDealloc == AArch64::FP) {
-      // The offset from the frame-pointer to the start of the ZPR/PPR CSRs.
-      StackOffset FPOffsetZPRCSRs =
+      // The offset from the frame-pointer to the start of the ZPR saves.
+      StackOffset FPOffsetZPR =
           -SVECalleeSavesSize -
           StackOffset::getFixed(AFI->getCalleeSaveBaseToFrameRecordOffset());
-      StackOffset FPOffsetPPRCSRs = FPOffsetZPRCSRs + ZPR.CalleeSavesSize;
 
       // With split SVE, the PPR locals are above the ZPR callee-saves.
       if (ZPR.CalleeSavesSize && SVELayout == SVEStackLayout::Split)
-        FPOffsetZPRCSRs -= PPR.LocalsSize;
+        FPOffsetZPR -= PPR.LocalsSize;
 
-      // The code below will deallocate the stack space space by moving the SP
-      // to the start of the ZPR/PPR callee-save area.
-      moveSPBelowFP(ZPRRange.Begin, FPOffsetZPRCSRs);
+      // Deallocate the stack space space by moving the SP to the start of the
+      // ZPR/PPR callee-save area.
+      moveSPBelowFP(ZPRRange.Begin, FPOffsetZPR);
 
       if (PPR.CalleeSavesSize && SVELayout == SVEStackLayout::Split) {
         // Move to the start of the PPR area (this offset may be zero).
+        StackOffset FPOffsetPPR = -PPR.CalleeSavesSize;
         emitFrameOffset(MBB, ZPRRange.End, DL, AArch64::SP, AArch64::SP,
-                        FPOffsetPPRCSRs - FPOffsetZPRCSRs, TII,
+                        FPOffsetPPR - FPOffsetZPR, TII,
                         MachineInstr::FrameDestroy);
       }
     } else if (BaseForSVEDealloc == AArch64::SP) {

llvm/test/CodeGen/AArch64/split-sve-stack-frame-layout.ll

@@ -1092,5 +1092,3 @@ define void @sve_locals_zpr_ppr_csr_vla(i64 %n, <vscale x 16 x i1> %pred, <vscal
   store volatile <vscale x 16 x i8> %vector, ptr %zpr_local
   ret void
 }
-;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
-; CHECK-FRAMELAYOUT: {{.*}}