Skip to content

Commit de254aa

Browse files
committed
[AArch64][SME] Only use ADDSVL for SVE stack if there's a streaming body
It is possible for the SMEPeepeholeOpt pass to optimize out the streaming-mode changes, which for a locally_streaming function essentially removes the streaming body. This means the ADDSVL is unnecessary (and can cause complications for unwindinfo, see llvm#152283 (comment))
1 parent a9dacb1 commit de254aa

File tree

2 files changed

+89
-3
lines changed

2 files changed

+89
-3
lines changed

llvm/lib/Target/AArch64/AArch64InstrInfo.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6147,9 +6147,13 @@ void llvm::emitFrameOffset(MachineBasicBlock &MBB,
61476147
// vscale in the prologue/epilogue is different the runtime value of vscale
61486148
// in the function's body. To avoid having to consider multiple vscales,
61496149
// we can use `addsvl` to allocate any scalable stack-slots, which under
6150-
// most circumstances will be only locals, not callee-save slots.
6151-
const Function &F = MBB.getParent()->getFunction();
6152-
bool UseSVL = F.hasFnAttribute("aarch64_pstate_sm_body");
6150+
// most circumstances will be only locals, not callee-save slots. Note: We
6151+
// check "hasStreamingModeChanges" here as it is possible for the
6152+
// SMEPeepeholeOpt pass to optimize out the streaming-mode changes (removing
6153+
// the streaming body).
6154+
auto &AFI = *MBB.getParent()->getInfo<AArch64FunctionInfo>();
6155+
bool UseSVL =
6156+
AFI.hasStreamingModeChanges() && AFI.getSMEFnAttrs().hasStreamingBody();
61536157

61546158
int64_t Bytes, NumPredicateVectors, NumDataVectors;
61556159
AArch64InstrInfo::decomposeStackOffsetForFrameOffsets(

llvm/test/CodeGen/AArch64/sme-peephole-opts.ll

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,88 @@ define void @test9() "aarch64_pstate_sm_body" {
314314
ret void
315315
}
316316

317+
; test that if the 'smstart' and 'smtop' are entirely removed in a locally
318+
; streaming function, we use addvl (not addsvl) for setting up the SVE stack.
319+
define aarch64_sve_vector_pcs void @test9_1() "aarch64_pstate_sm_body" {
320+
; CHECK-LABEL: test9_1:
321+
; CHECK: // %bb.0:
322+
; CHECK-NEXT: stp x29, x30, [sp, #-16]! // 16-byte Folded Spill
323+
; CHECK-NEXT: addvl sp, sp, #-18
324+
; CHECK-NEXT: str p15, [sp, #4, mul vl] // 2-byte Folded Spill
325+
; CHECK-NEXT: str p14, [sp, #5, mul vl] // 2-byte Folded Spill
326+
; CHECK-NEXT: str p13, [sp, #6, mul vl] // 2-byte Folded Spill
327+
; CHECK-NEXT: str p12, [sp, #7, mul vl] // 2-byte Folded Spill
328+
; CHECK-NEXT: str p11, [sp, #8, mul vl] // 2-byte Folded Spill
329+
; CHECK-NEXT: str p10, [sp, #9, mul vl] // 2-byte Folded Spill
330+
; CHECK-NEXT: str p9, [sp, #10, mul vl] // 2-byte Folded Spill
331+
; CHECK-NEXT: str p8, [sp, #11, mul vl] // 2-byte Folded Spill
332+
; CHECK-NEXT: str p7, [sp, #12, mul vl] // 2-byte Folded Spill
333+
; CHECK-NEXT: str p6, [sp, #13, mul vl] // 2-byte Folded Spill
334+
; CHECK-NEXT: str p5, [sp, #14, mul vl] // 2-byte Folded Spill
335+
; CHECK-NEXT: str p4, [sp, #15, mul vl] // 2-byte Folded Spill
336+
; CHECK-NEXT: str z23, [sp, #2, mul vl] // 16-byte Folded Spill
337+
; CHECK-NEXT: str z22, [sp, #3, mul vl] // 16-byte Folded Spill
338+
; CHECK-NEXT: str z21, [sp, #4, mul vl] // 16-byte Folded Spill
339+
; CHECK-NEXT: str z20, [sp, #5, mul vl] // 16-byte Folded Spill
340+
; CHECK-NEXT: str z19, [sp, #6, mul vl] // 16-byte Folded Spill
341+
; CHECK-NEXT: str z18, [sp, #7, mul vl] // 16-byte Folded Spill
342+
; CHECK-NEXT: str z17, [sp, #8, mul vl] // 16-byte Folded Spill
343+
; CHECK-NEXT: str z16, [sp, #9, mul vl] // 16-byte Folded Spill
344+
; CHECK-NEXT: str z15, [sp, #10, mul vl] // 16-byte Folded Spill
345+
; CHECK-NEXT: str z14, [sp, #11, mul vl] // 16-byte Folded Spill
346+
; CHECK-NEXT: str z13, [sp, #12, mul vl] // 16-byte Folded Spill
347+
; CHECK-NEXT: str z12, [sp, #13, mul vl] // 16-byte Folded Spill
348+
; CHECK-NEXT: str z11, [sp, #14, mul vl] // 16-byte Folded Spill
349+
; CHECK-NEXT: str z10, [sp, #15, mul vl] // 16-byte Folded Spill
350+
; CHECK-NEXT: str z9, [sp, #16, mul vl] // 16-byte Folded Spill
351+
; CHECK-NEXT: str z8, [sp, #17, mul vl] // 16-byte Folded Spill
352+
; CHECK-NEXT: .cfi_escape 0x0f, 0x0a, 0x8f, 0x10, 0x92, 0x2e, 0x00, 0x11, 0x90, 0x01, 0x1e, 0x22 // sp + 16 + 144 * VG
353+
; CHECK-NEXT: .cfi_offset w30, -8
354+
; CHECK-NEXT: .cfi_offset w29, -16
355+
; CHECK-NEXT: .cfi_escape 0x10, 0x48, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x78, 0x1e, 0x22, 0x40, 0x1c // $d8 @ cfa - 8 * VG - 16
356+
; CHECK-NEXT: .cfi_escape 0x10, 0x49, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x70, 0x1e, 0x22, 0x40, 0x1c // $d9 @ cfa - 16 * VG - 16
357+
; CHECK-NEXT: .cfi_escape 0x10, 0x4a, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x68, 0x1e, 0x22, 0x40, 0x1c // $d10 @ cfa - 24 * VG - 16
358+
; CHECK-NEXT: .cfi_escape 0x10, 0x4b, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x60, 0x1e, 0x22, 0x40, 0x1c // $d11 @ cfa - 32 * VG - 16
359+
; CHECK-NEXT: .cfi_escape 0x10, 0x4c, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x58, 0x1e, 0x22, 0x40, 0x1c // $d12 @ cfa - 40 * VG - 16
360+
; CHECK-NEXT: .cfi_escape 0x10, 0x4d, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x50, 0x1e, 0x22, 0x40, 0x1c // $d13 @ cfa - 48 * VG - 16
361+
; CHECK-NEXT: .cfi_escape 0x10, 0x4e, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x48, 0x1e, 0x22, 0x40, 0x1c // $d14 @ cfa - 56 * VG - 16
362+
; CHECK-NEXT: .cfi_escape 0x10, 0x4f, 0x09, 0x92, 0x2e, 0x00, 0x11, 0x40, 0x1e, 0x22, 0x40, 0x1c // $d15 @ cfa - 64 * VG - 16
363+
; CHECK-NEXT: bl callee
364+
; CHECK-NEXT: ldr z23, [sp, #2, mul vl] // 16-byte Folded Reload
365+
; CHECK-NEXT: ldr z22, [sp, #3, mul vl] // 16-byte Folded Reload
366+
; CHECK-NEXT: ldr z21, [sp, #4, mul vl] // 16-byte Folded Reload
367+
; CHECK-NEXT: ldr z20, [sp, #5, mul vl] // 16-byte Folded Reload
368+
; CHECK-NEXT: ldr z19, [sp, #6, mul vl] // 16-byte Folded Reload
369+
; CHECK-NEXT: ldr z18, [sp, #7, mul vl] // 16-byte Folded Reload
370+
; CHECK-NEXT: ldr z17, [sp, #8, mul vl] // 16-byte Folded Reload
371+
; CHECK-NEXT: ldr z16, [sp, #9, mul vl] // 16-byte Folded Reload
372+
; CHECK-NEXT: ldr z15, [sp, #10, mul vl] // 16-byte Folded Reload
373+
; CHECK-NEXT: ldr z14, [sp, #11, mul vl] // 16-byte Folded Reload
374+
; CHECK-NEXT: ldr z13, [sp, #12, mul vl] // 16-byte Folded Reload
375+
; CHECK-NEXT: ldr z12, [sp, #13, mul vl] // 16-byte Folded Reload
376+
; CHECK-NEXT: ldr z11, [sp, #14, mul vl] // 16-byte Folded Reload
377+
; CHECK-NEXT: ldr z10, [sp, #15, mul vl] // 16-byte Folded Reload
378+
; CHECK-NEXT: ldr z9, [sp, #16, mul vl] // 16-byte Folded Reload
379+
; CHECK-NEXT: ldr z8, [sp, #17, mul vl] // 16-byte Folded Reload
380+
; CHECK-NEXT: ldr p15, [sp, #4, mul vl] // 2-byte Folded Reload
381+
; CHECK-NEXT: ldr p14, [sp, #5, mul vl] // 2-byte Folded Reload
382+
; CHECK-NEXT: ldr p13, [sp, #6, mul vl] // 2-byte Folded Reload
383+
; CHECK-NEXT: ldr p12, [sp, #7, mul vl] // 2-byte Folded Reload
384+
; CHECK-NEXT: ldr p11, [sp, #8, mul vl] // 2-byte Folded Reload
385+
; CHECK-NEXT: ldr p10, [sp, #9, mul vl] // 2-byte Folded Reload
386+
; CHECK-NEXT: ldr p9, [sp, #10, mul vl] // 2-byte Folded Reload
387+
; CHECK-NEXT: ldr p8, [sp, #11, mul vl] // 2-byte Folded Reload
388+
; CHECK-NEXT: ldr p7, [sp, #12, mul vl] // 2-byte Folded Reload
389+
; CHECK-NEXT: ldr p6, [sp, #13, mul vl] // 2-byte Folded Reload
390+
; CHECK-NEXT: ldr p5, [sp, #14, mul vl] // 2-byte Folded Reload
391+
; CHECK-NEXT: ldr p4, [sp, #15, mul vl] // 2-byte Folded Reload
392+
; CHECK-NEXT: addvl sp, sp, #18
393+
; CHECK-NEXT: ldp x29, x30, [sp], #16 // 16-byte Folded Reload
394+
; CHECK-NEXT: ret
395+
call void @callee()
396+
ret void
397+
}
398+
317399
; similar to above, but in this case only the first
318400
; 'smstart, smstop' pair can be removed and the code required
319401
; for the CFI is still needed.

0 commit comments

Comments
 (0)