Skip to content

Commit 54e5de0

Browse files
authored
[ARM][LSR] Exclude uses outside the loop when favoring postinc. (#67090)
Extra uses for variables outside the loop can mess with the generation of postinc variables. This patch alters the collection of loop invariant fixups in LSR when the target is optimizing for PostInc, to exclude the collection of these extra uses. It is expected that the variable can be rematerialized, which will lead to a more optimal sequence of instructions in the loop.
1 parent af199ee commit 54e5de0

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3470,6 +3470,11 @@ LSRInstance::CollectLoopInvariantFixupsAndFormulae() {
34703470
SmallVector<const SCEV *, 8> Worklist(RegUses.begin(), RegUses.end());
34713471
SmallPtrSet<const SCEV *, 32> Visited;
34723472

3473+
// Don't collect outside uses if we are favoring postinc - the instructions in
3474+
// the loop are more important than the ones outside of it.
3475+
if (AMK == TTI::AMK_PostIndexed)
3476+
return;
3477+
34733478
while (!Worklist.empty()) {
34743479
const SCEV *S = Worklist.pop_back_val();
34753480

llvm/test/CodeGen/Thumb2/mve-useafterloop.ll

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@ define nonnull ptr @useafterloop(ptr nocapture noundef readonly %pSrcA, ptr noca
77
; CHECK-NEXT: .save {r7, lr}
88
; CHECK-NEXT: push {r7, lr}
99
; CHECK-NEXT: mov.w lr, #64
10-
; CHECK-NEXT: mov r12, r2
11-
; CHECK-NEXT: movs r3, #0
10+
; CHECK-NEXT: mov r3, r2
1211
; CHECK-NEXT: .LBB0_1: @ %while.body
1312
; CHECK-NEXT: @ =>This Inner Loop Header: Depth=1
1413
; CHECK-NEXT: vldrw.u32 q0, [r0], #16
1514
; CHECK-NEXT: vldrw.u32 q1, [r1], #16
16-
; CHECK-NEXT: add.w r2, r12, r3
17-
; CHECK-NEXT: adds r3, #16
1815
; CHECK-NEXT: vadd.f32 q0, q1, q0
19-
; CHECK-NEXT: vstrw.32 q0, [r2]
16+
; CHECK-NEXT: vstrb.8 q0, [r3], #16
2017
; CHECK-NEXT: le lr, .LBB0_1
2118
; CHECK-NEXT: @ %bb.2: @ %while.end
22-
; CHECK-NEXT: mov r0, r12
19+
; CHECK-NEXT: mov r0, r2
2320
; CHECK-NEXT: pop {r7, pc}
2421
entry:
2522
br label %while.body
@@ -92,17 +89,15 @@ define nofpclass(nan inf) float @manyusesafterloop(ptr nocapture noundef readonl
9289
; CHECK-NEXT: .save {r4, lr}
9390
; CHECK-NEXT: push {r4, lr}
9491
; CHECK-NEXT: mov.w lr, #64
95-
; CHECK-NEXT: movs r3, #0
92+
; CHECK-NEXT: mov r12, r0
93+
; CHECK-NEXT: mov r3, r1
94+
; CHECK-NEXT: mov r4, r2
9695
; CHECK-NEXT: .LBB2_1: @ %while.body
9796
; CHECK-NEXT: @ =>This Inner Loop Header: Depth=1
98-
; CHECK-NEXT: add.w r12, r0, r3
99-
; CHECK-NEXT: adds r4, r1, r3
100-
; CHECK-NEXT: vldrw.u32 q1, [r4]
101-
; CHECK-NEXT: vldrw.u32 q0, [r12]
102-
; CHECK-NEXT: adds r4, r2, r3
103-
; CHECK-NEXT: adds r3, #16
97+
; CHECK-NEXT: vldrw.u32 q0, [r12], #16
98+
; CHECK-NEXT: vldrw.u32 q1, [r3], #16
10499
; CHECK-NEXT: vadd.f32 q0, q1, q0
105-
; CHECK-NEXT: vstrw.32 q0, [r4]
100+
; CHECK-NEXT: vstrb.8 q0, [r4], #16
106101
; CHECK-NEXT: le lr, .LBB2_1
107102
; CHECK-NEXT: @ %bb.2: @ %while.end
108103
; CHECK-NEXT: vldr s0, [r2]

0 commit comments

Comments
 (0)