Skip to content

Commit 4eac8da

Browse files
authored
[LoopPeel] Handle non-local instructions/arguments when updating exiting values (llvm#142993)
Similar to llvm@7e14161, the exiting value may be a non-local instruction or an argument. Closes llvm#142895.
1 parent d5d6f60 commit 4eac8da

File tree

2 files changed

+103
-1
lines changed

2 files changed

+103
-1
lines changed

llvm/lib/Transforms/Utils/LoopPeel.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,11 @@ bool llvm::peelLoop(Loop *L, unsigned PeelCount, bool PeelLast, LoopInfo *LI,
12571257
// Now adjust users of the original exit values by replacing them with the
12581258
// exit value from the peeled iteration and remove them.
12591259
for (const auto &[P, E] : ExitValues) {
1260-
P->replaceAllUsesWith(isa<Constant>(E) ? E : &*VMap.lookup(E));
1260+
Instruction *ExitInst = dyn_cast<Instruction>(E);
1261+
if (ExitInst && L->contains(ExitInst))
1262+
P->replaceAllUsesWith(&*VMap[ExitInst]);
1263+
else
1264+
P->replaceAllUsesWith(E);
12611265
P->eraseFromParent();
12621266
}
12631267
formLCSSA(*L, DT, LI, SE);

llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,106 @@ exit:
7171
ret i32 %1
7272
}
7373

74+
; Test case for https://github.com/llvm/llvm-project/issues/142895.
75+
76+
define i32 @pr142895_exit_value_is_arg(i32 %arg) {
77+
; CHECK-LABEL: define i32 @pr142895_exit_value_is_arg(
78+
; CHECK-SAME: i32 [[ARG:%.*]]) {
79+
; CHECK-NEXT: [[ENTRY:.*]]:
80+
; CHECK-NEXT: br label %[[LOOP:.*]]
81+
; CHECK: [[LOOP]]:
82+
; CHECK-NEXT: [[INDVAR:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]], %[[LOOP]] ]
83+
; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[INDVAR]], 1
84+
; CHECK-NEXT: [[EXITCOND:%.*]] = icmp ne i32 [[INC]], 32
85+
; CHECK-NEXT: br i1 [[EXITCOND]], label %[[LOOP]], label %[[EXIT_PEEL_BEGIN:.*]], !llvm.loop [[LOOP2:![0-9]+]]
86+
; CHECK: [[EXIT_PEEL_BEGIN]]:
87+
; CHECK-NEXT: [[TMP0:%.*]] = phi i32 [ [[INC]], %[[LOOP]] ]
88+
; CHECK-NEXT: br label %[[LOOP_PEEL:.*]]
89+
; CHECK: [[LOOP_PEEL]]:
90+
; CHECK-NEXT: [[CMP1_PEEL:%.*]] = icmp eq i32 [[TMP0]], 32
91+
; CHECK-NEXT: [[SEL_PEEL:%.*]] = select i1 [[CMP1_PEEL]], i32 0, i32 0
92+
; CHECK-NEXT: [[SUB_PEEL:%.*]] = sub i32 0, 0
93+
; CHECK-NEXT: [[XOR_PEEL:%.*]] = xor i32 0, 0
94+
; CHECK-NEXT: [[INC_PEEL:%.*]] = add i32 [[TMP0]], 1
95+
; CHECK-NEXT: [[EXITCOND_PEEL:%.*]] = icmp ne i32 [[INC_PEEL]], 33
96+
; CHECK-NEXT: br i1 [[EXITCOND_PEEL]], label %[[EXIT_PEEL_NEXT:.*]], label %[[EXIT_PEEL_NEXT]]
97+
; CHECK: [[EXIT_PEEL_NEXT]]:
98+
; CHECK-NEXT: br label %[[LOOP_PEEL_NEXT:.*]]
99+
; CHECK: [[LOOP_PEEL_NEXT]]:
100+
; CHECK-NEXT: br label %[[EXIT:.*]]
101+
; CHECK: [[EXIT]]:
102+
; CHECK-NEXT: ret i32 [[ARG]]
103+
;
104+
entry:
105+
br label %loop
106+
107+
loop:
108+
%indvar = phi i32 [ 0, %entry ], [ %inc, %loop ]
109+
%cmp1 = icmp eq i32 %indvar, 32
110+
%sel = select i1 %cmp1, i32 0, i32 0
111+
%sub = sub i32 0, 0
112+
%xor = xor i32 0, 0
113+
%inc = add i32 %indvar, 1
114+
%exitcond = icmp ne i32 %inc, 33
115+
br i1 %exitcond, label %loop, label %exit
116+
117+
exit:
118+
%exit.lcssa = phi i32 [ %arg, %loop ]
119+
ret i32 %exit.lcssa
120+
}
121+
122+
define i32 @pr142895_exit_value_is_inst(i32 %arg) {
123+
; CHECK-LABEL: define i32 @pr142895_exit_value_is_inst(
124+
; CHECK-SAME: i32 [[ARG:%.*]]) {
125+
; CHECK-NEXT: [[ENTRY:.*]]:
126+
; CHECK-NEXT: [[MUL:%.*]] = mul i32 [[ARG]], 7
127+
; CHECK-NEXT: br label %[[LOOP:.*]]
128+
; CHECK: [[LOOP]]:
129+
; CHECK-NEXT: [[INDVAR:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]], %[[LOOP]] ]
130+
; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[INDVAR]], 1
131+
; CHECK-NEXT: [[EXITCOND:%.*]] = icmp ne i32 [[INC]], 32
132+
; CHECK-NEXT: br i1 [[EXITCOND]], label %[[LOOP]], label %[[EXIT_PEEL_BEGIN:.*]], !llvm.loop [[LOOP3:![0-9]+]]
133+
; CHECK: [[EXIT_PEEL_BEGIN]]:
134+
; CHECK-NEXT: [[TMP0:%.*]] = phi i32 [ [[INC]], %[[LOOP]] ]
135+
; CHECK-NEXT: br label %[[LOOP_PEEL:.*]]
136+
; CHECK: [[LOOP_PEEL]]:
137+
; CHECK-NEXT: [[CMP1_PEEL:%.*]] = icmp eq i32 [[TMP0]], 32
138+
; CHECK-NEXT: [[SEL_PEEL:%.*]] = select i1 [[CMP1_PEEL]], i32 0, i32 0
139+
; CHECK-NEXT: [[SUB_PEEL:%.*]] = sub i32 0, 0
140+
; CHECK-NEXT: [[XOR_PEEL:%.*]] = xor i32 0, 0
141+
; CHECK-NEXT: [[INC_PEEL:%.*]] = add i32 [[TMP0]], 1
142+
; CHECK-NEXT: [[EXITCOND_PEEL:%.*]] = icmp ne i32 [[INC_PEEL]], 33
143+
; CHECK-NEXT: br i1 [[EXITCOND_PEEL]], label %[[EXIT_PEEL_NEXT:.*]], label %[[EXIT_PEEL_NEXT]]
144+
; CHECK: [[EXIT_PEEL_NEXT]]:
145+
; CHECK-NEXT: br label %[[LOOP_PEEL_NEXT:.*]]
146+
; CHECK: [[LOOP_PEEL_NEXT]]:
147+
; CHECK-NEXT: br label %[[EXIT:.*]]
148+
; CHECK: [[EXIT]]:
149+
; CHECK-NEXT: ret i32 [[MUL]]
150+
;
151+
entry:
152+
%mul = mul i32 %arg, 7
153+
br label %loop
154+
155+
loop:
156+
%indvar = phi i32 [ 0, %entry ], [ %inc, %loop ]
157+
%cmp1 = icmp eq i32 %indvar, 32
158+
%sel = select i1 %cmp1, i32 0, i32 0
159+
%sub = sub i32 0, 0
160+
%xor = xor i32 0, 0
161+
%inc = add i32 %indvar, 1
162+
%exitcond = icmp ne i32 %inc, 33
163+
br i1 %exitcond, label %loop, label %exit
164+
165+
exit:
166+
%exit.lcssa = phi i32 [ %mul, %loop ]
167+
ret i32 %exit.lcssa
168+
}
169+
74170
declare void @foo(i32)
75171
;.
76172
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]]}
77173
; CHECK: [[META1]] = !{!"llvm.loop.peeled.count", i32 1}
174+
; CHECK: [[LOOP2]] = distinct !{[[LOOP2]], [[META1]]}
175+
; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META1]]}
78176
;.

0 commit comments

Comments
 (0)