[llvm] 4eac8da - [LoopPeel] Handle non-local instructions/arguments when updating exiting values (#142993)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Jun 5 21:56:32 PDT 2025
Author: Yingwei Zheng
Date: 2025-06-06T12:56:28+08:00
New Revision: 4eac8daa38990871e50b804c0cc19a3ad9c98db2
URL: https://github.com/llvm/llvm-project/commit/4eac8daa38990871e50b804c0cc19a3ad9c98db2
DIFF: https://github.com/llvm/llvm-project/commit/4eac8daa38990871e50b804c0cc19a3ad9c98db2.diff
LOG: [LoopPeel] Handle non-local instructions/arguments when updating exiting values (#142993)
Similar to
https://github.com/llvm/llvm-project/commit/7e14161f49b32387988cf9d937bbfaa27d0fbdd5,
the exiting value may be a non-local instruction or an argument.
Closes https://github.com/llvm/llvm-project/issues/142895.
Added:
Modified:
llvm/lib/Transforms/Utils/LoopPeel.cpp
llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Utils/LoopPeel.cpp b/llvm/lib/Transforms/Utils/LoopPeel.cpp
index bd025fddd0cf7..9149f71941db4 100644
--- a/llvm/lib/Transforms/Utils/LoopPeel.cpp
+++ b/llvm/lib/Transforms/Utils/LoopPeel.cpp
@@ -1257,7 +1257,11 @@ bool llvm::peelLoop(Loop *L, unsigned PeelCount, bool PeelLast, LoopInfo *LI,
// Now adjust users of the original exit values by replacing them with the
// exit value from the peeled iteration and remove them.
for (const auto &[P, E] : ExitValues) {
- P->replaceAllUsesWith(isa<Constant>(E) ? E : &*VMap.lookup(E));
+ Instruction *ExitInst = dyn_cast<Instruction>(E);
+ if (ExitInst && L->contains(ExitInst))
+ P->replaceAllUsesWith(&*VMap[ExitInst]);
+ else
+ P->replaceAllUsesWith(E);
P->eraseFromParent();
}
formLCSSA(*L, DT, LI, SE);
diff --git a/llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll b/llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll
index 7d38c18d10667..bc20c59c3943b 100644
--- a/llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll
+++ b/llvm/test/Transforms/LoopUnroll/unroll-and-peel-last-iteration.ll
@@ -71,8 +71,106 @@ exit:
ret i32 %1
}
+; Test case for https://github.com/llvm/llvm-project/issues/142895.
+
+define i32 @pr142895_exit_value_is_arg(i32 %arg) {
+; CHECK-LABEL: define i32 @pr142895_exit_value_is_arg(
+; CHECK-SAME: i32 [[ARG:%.*]]) {
+; CHECK-NEXT: [[ENTRY:.*]]:
+; CHECK-NEXT: br label %[[LOOP:.*]]
+; CHECK: [[LOOP]]:
+; CHECK-NEXT: [[INDVAR:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]], %[[LOOP]] ]
+; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[INDVAR]], 1
+; CHECK-NEXT: [[EXITCOND:%.*]] = icmp ne i32 [[INC]], 32
+; CHECK-NEXT: br i1 [[EXITCOND]], label %[[LOOP]], label %[[EXIT_PEEL_BEGIN:.*]], !llvm.loop [[LOOP2:![0-9]+]]
+; CHECK: [[EXIT_PEEL_BEGIN]]:
+; CHECK-NEXT: [[TMP0:%.*]] = phi i32 [ [[INC]], %[[LOOP]] ]
+; CHECK-NEXT: br label %[[LOOP_PEEL:.*]]
+; CHECK: [[LOOP_PEEL]]:
+; CHECK-NEXT: [[CMP1_PEEL:%.*]] = icmp eq i32 [[TMP0]], 32
+; CHECK-NEXT: [[SEL_PEEL:%.*]] = select i1 [[CMP1_PEEL]], i32 0, i32 0
+; CHECK-NEXT: [[SUB_PEEL:%.*]] = sub i32 0, 0
+; CHECK-NEXT: [[XOR_PEEL:%.*]] = xor i32 0, 0
+; CHECK-NEXT: [[INC_PEEL:%.*]] = add i32 [[TMP0]], 1
+; CHECK-NEXT: [[EXITCOND_PEEL:%.*]] = icmp ne i32 [[INC_PEEL]], 33
+; CHECK-NEXT: br i1 [[EXITCOND_PEEL]], label %[[EXIT_PEEL_NEXT:.*]], label %[[EXIT_PEEL_NEXT]]
+; CHECK: [[EXIT_PEEL_NEXT]]:
+; CHECK-NEXT: br label %[[LOOP_PEEL_NEXT:.*]]
+; CHECK: [[LOOP_PEEL_NEXT]]:
+; CHECK-NEXT: br label %[[EXIT:.*]]
+; CHECK: [[EXIT]]:
+; CHECK-NEXT: ret i32 [[ARG]]
+;
+entry:
+ br label %loop
+
+loop:
+ %indvar = phi i32 [ 0, %entry ], [ %inc, %loop ]
+ %cmp1 = icmp eq i32 %indvar, 32
+ %sel = select i1 %cmp1, i32 0, i32 0
+ %sub = sub i32 0, 0
+ %xor = xor i32 0, 0
+ %inc = add i32 %indvar, 1
+ %exitcond = icmp ne i32 %inc, 33
+ br i1 %exitcond, label %loop, label %exit
+
+exit:
+ %exit.lcssa = phi i32 [ %arg, %loop ]
+ ret i32 %exit.lcssa
+}
+
+define i32 @pr142895_exit_value_is_inst(i32 %arg) {
+; CHECK-LABEL: define i32 @pr142895_exit_value_is_inst(
+; CHECK-SAME: i32 [[ARG:%.*]]) {
+; CHECK-NEXT: [[ENTRY:.*]]:
+; CHECK-NEXT: [[MUL:%.*]] = mul i32 [[ARG]], 7
+; CHECK-NEXT: br label %[[LOOP:.*]]
+; CHECK: [[LOOP]]:
+; CHECK-NEXT: [[INDVAR:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]], %[[LOOP]] ]
+; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[INDVAR]], 1
+; CHECK-NEXT: [[EXITCOND:%.*]] = icmp ne i32 [[INC]], 32
+; CHECK-NEXT: br i1 [[EXITCOND]], label %[[LOOP]], label %[[EXIT_PEEL_BEGIN:.*]], !llvm.loop [[LOOP3:![0-9]+]]
+; CHECK: [[EXIT_PEEL_BEGIN]]:
+; CHECK-NEXT: [[TMP0:%.*]] = phi i32 [ [[INC]], %[[LOOP]] ]
+; CHECK-NEXT: br label %[[LOOP_PEEL:.*]]
+; CHECK: [[LOOP_PEEL]]:
+; CHECK-NEXT: [[CMP1_PEEL:%.*]] = icmp eq i32 [[TMP0]], 32
+; CHECK-NEXT: [[SEL_PEEL:%.*]] = select i1 [[CMP1_PEEL]], i32 0, i32 0
+; CHECK-NEXT: [[SUB_PEEL:%.*]] = sub i32 0, 0
+; CHECK-NEXT: [[XOR_PEEL:%.*]] = xor i32 0, 0
+; CHECK-NEXT: [[INC_PEEL:%.*]] = add i32 [[TMP0]], 1
+; CHECK-NEXT: [[EXITCOND_PEEL:%.*]] = icmp ne i32 [[INC_PEEL]], 33
+; CHECK-NEXT: br i1 [[EXITCOND_PEEL]], label %[[EXIT_PEEL_NEXT:.*]], label %[[EXIT_PEEL_NEXT]]
+; CHECK: [[EXIT_PEEL_NEXT]]:
+; CHECK-NEXT: br label %[[LOOP_PEEL_NEXT:.*]]
+; CHECK: [[LOOP_PEEL_NEXT]]:
+; CHECK-NEXT: br label %[[EXIT:.*]]
+; CHECK: [[EXIT]]:
+; CHECK-NEXT: ret i32 [[MUL]]
+;
+entry:
+ %mul = mul i32 %arg, 7
+ br label %loop
+
+loop:
+ %indvar = phi i32 [ 0, %entry ], [ %inc, %loop ]
+ %cmp1 = icmp eq i32 %indvar, 32
+ %sel = select i1 %cmp1, i32 0, i32 0
+ %sub = sub i32 0, 0
+ %xor = xor i32 0, 0
+ %inc = add i32 %indvar, 1
+ %exitcond = icmp ne i32 %inc, 33
+ br i1 %exitcond, label %loop, label %exit
+
+exit:
+ %exit.lcssa = phi i32 [ %mul, %loop ]
+ ret i32 %exit.lcssa
+}
+
declare void @foo(i32)
;.
; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]]}
; CHECK: [[META1]] = !{!"llvm.loop.peeled.count", i32 1}
+; CHECK: [[LOOP2]] = distinct !{[[LOOP2]], [[META1]]}
+; CHECK: [[LOOP3]] = distinct !{[[LOOP3]], [[META1]]}
;.
More information about the llvm-commits
mailing list