[PATCH] D86099: [AArch64][SVE] Fix calculation restore point for SVE callee saves.
Sander de Smalen via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 26 02:07:08 PDT 2020
This revision was automatically updated to reflect the committed changes.
sdesmalen marked 3 inline comments as done.
Closed by commit rG5f47d4456d19: [AArch64][SVE] Fix calculation restore point for SVE callee saves. (authored by sdesmalen).
Changed prior to commit:
https://reviews.llvm.org/D86099?vs=286104&id=287877#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86099/new/
https://reviews.llvm.org/D86099
Files:
llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
llvm/test/CodeGen/AArch64/framelayout-sve-calleesaves-fix.mir
Index: llvm/test/CodeGen/AArch64/framelayout-sve-calleesaves-fix.mir
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/AArch64/framelayout-sve-calleesaves-fix.mir
@@ -0,0 +1,36 @@
+# NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+# RUN: llc -mattr=+sve -mtriple=aarch64-none-linux-gnu -start-before=prologepilog %s -o - | FileCheck %s
+
+--- |
+ define aarch64_sve_vector_pcs void @fix_restorepoint_p4() { entry: unreachable }
+ ; CHECK-LABEL: fix_restorepoint_p4:
+ ; CHECK: // %bb.0: // %entry
+ ; CHECK-NEXT: str x29, [sp, #-16]! // 8-byte Folded Spill
+ ; CHECK-NEXT: addvl sp, sp, #-2
+ ; CHECK-NEXT: str p4, [sp, #7, mul vl] // 2-byte Folded Spill
+ ; CHECK-NEXT: str z8, [sp, #1, mul vl] // 16-byte Folded Spill
+ ; CHECK-NEXT: addvl sp, sp, #-1
+ ; CHECK-NEXT: .cfi_escape 0x0f, 0x0c, 0x8f, 0x00, 0x11, 0x10, 0x22, 0x11, 0x18, 0x92, 0x2e, 0x00, 0x1e, 0x22 // sp + 16 + 24 * VG
+ ; CHECK-NEXT: .cfi_escape 0x10, 0x48, 0x0a, 0x11, 0x70, 0x22, 0x11, 0x78, 0x92, 0x2e, 0x00, 0x1e, 0x22 // $d8 @ cfa - 16 - 8 * VG
+ ; CHECK-NEXT: .cfi_offset w29, -16
+ ; CHECK-NEXT: // implicit-def: $z8
+ ; CHECK-NEXT: // implicit-def: $p4
+ ; CHECK-NEXT: addvl sp, sp, #1
+ ; CHECK-NEXT: ldr p4, [sp, #7, mul vl] // 2-byte Folded Reload
+ ; CHECK-NEXT: ldr z8, [sp, #1, mul vl] // 16-byte Folded Reload
+ ; CHECK-NEXT: addvl sp, sp, #2
+ ; CHECK-NEXT: ldr x29, [sp], #16 // 8-byte Folded Reload
+ ; CHECK-NEXT: ret
+...
+name: fix_restorepoint_p4
+stack:
+ - { id: 0, stack-id: sve-vec, size: 16, alignment: 16 }
+body: |
+ bb.0.entry:
+ $z8 = IMPLICIT_DEF
+ $p4 = IMPLICIT_DEF
+ B %bb.1
+
+ bb.1.entry:
+ RET_ReallyLR
+---
Index: llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
===================================================================
--- llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
+++ llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -1694,11 +1694,10 @@
StackOffset DeallocateBefore = {}, DeallocateAfter = SVEStackSize;
MachineBasicBlock::iterator RestoreBegin = LastPopI, RestoreEnd = LastPopI;
if (int64_t CalleeSavedSize = AFI->getSVECalleeSavedStackSize()) {
- RestoreBegin = std::prev(RestoreEnd);;
- while (IsSVECalleeSave(RestoreBegin) &&
- RestoreBegin != MBB.begin())
+ RestoreBegin = std::prev(RestoreEnd);
+ while (RestoreBegin != MBB.begin() &&
+ IsSVECalleeSave(std::prev(RestoreBegin)))
--RestoreBegin;
- ++RestoreBegin;
assert(IsSVECalleeSave(RestoreBegin) &&
IsSVECalleeSave(std::prev(RestoreEnd)) && "Unexpected instruction");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86099.287877.patch
Type: text/x-patch
Size: 2712 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200826/b3135b04/attachment.bin>
More information about the llvm-commits
mailing list