llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-llvm-transforms Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> If we have LCSSA preservation enabled, SplitCriticalEdge inserts a new LCSSA Phi node which means we have an incoming value we are going to replace that is not in DeadInsts. Add the phi node so we do cleanup properly. --- Full diff: https://github.com/llvm/llvm-project/pull/237532.diff 4 Files Affected: - (modified) llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp (+4) - (modified) llvm/test/Transforms/LoopStrengthReduce/X86/incoming-dead-insts.ll (-3) - (modified) llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll (-1) - (modified) llvm/test/Transforms/LoopStrengthReduce/preserve-lcssa.ll (-1) ``````````diff diff --git a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 4a5e9ad68dd34..fd2927d54ca5d 100644 --- a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -6120,6 +6120,10 @@ void LSRInstance::RewriteForPHI(PHINode *PN, const LSRUse &LU, if (L->contains(I) && !L->contains(BB)) InsertedNonLCSSAInsts.insert(I); + if (auto *OldIncomingInst = + dyn_cast<Instruction>(PN->getIncomingValue(i))) + DeadInsts.emplace_back(OldIncomingInst); + PN->setIncomingValue(i, FullV); Pair.first->second = FullV; } diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/incoming-dead-insts.ll b/llvm/test/Transforms/LoopStrengthReduce/X86/incoming-dead-insts.ll index 46484a384d73e..fe0fcb4b70538 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/X86/incoming-dead-insts.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/X86/incoming-dead-insts.ll @@ -14,8 +14,6 @@ define i64 @redundant_iv_crit_edge_exit(i64 %n) { ; CHECK-NEXT: br label %[[LOOP_HEADER:.*]] ; CHECK: [[LOOP_HEADER]]: ; CHECK-NEXT: [[LSR_IV:%.*]] = phi i64 [ [[LSR_IV_NEXT:%.*]], %[[LOOP_LATCH:.*]] ], [ 3, %[[ENTRY]] ] -; CHECK-NEXT: [[IV2:%.*]] = phi i64 [ 2, %[[ENTRY]] ], [ [[IV2_NEXT:%.*]], %[[LOOP_LATCH]] ] -; CHECK-NEXT: [[IV2_NEXT]] = add nuw nsw i64 [[IV2]], 1 ; CHECK-NEXT: [[EARLY_COND:%.*]] = call i1 @cond() ; CHECK-NEXT: br i1 [[EARLY_COND]], label %[[LOOP_LATCH]], label %[[LOOP_HEADER_EXIT_CRIT_EDGE:.*]] ; CHECK: [[LOOP_LATCH]]: @@ -28,7 +26,6 @@ define i64 @redundant_iv_crit_edge_exit(i64 %n) { ; CHECK-NEXT: br label %[[EXIT:.*]] ; CHECK: [[LOOP_HEADER_EXIT_CRIT_EDGE]]: ; CHECK-NEXT: [[LSR_IV_LCSSA:%.*]] = phi i64 [ [[LSR_IV]], %[[LOOP_HEADER]] ] -; CHECK-NEXT: [[SPLIT:%.*]] = phi i64 [ [[IV2_NEXT]], %[[LOOP_HEADER]] ] ; CHECK-NEXT: br label %[[EXIT]] ; CHECK: [[EXIT]]: ; CHECK-NEXT: [[RES:%.*]] = phi i64 [ [[LSR_IV_LCSSA]], %[[LOOP_HEADER_EXIT_CRIT_EDGE]] ], [ [[RES_PH]], %[[EXITSPLIT]] ] diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll b/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll index 24354d1ffae8e..cca791150128b 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll @@ -133,7 +133,6 @@ define i64 @regression3() { ; CHECK: [[LOOP1_LATCH]]: ; CHECK-NEXT: br i1 false, label %[[LOOP1_LATCH_FUNCEXIT_CRIT_EDGE]], label %[[LOOP1_HEADER]] ; CHECK: [[LOOP1_LATCH_FUNCEXIT_CRIT_EDGE]]: -; CHECK-NEXT: [[SPLIT:%.*]] = phi i64 [ [[ASHR]], %[[LOOP1_LATCH]] ] ; CHECK-NEXT: br label %[[FUNCEXIT]] ; entry: diff --git a/llvm/test/Transforms/LoopStrengthReduce/preserve-lcssa.ll b/llvm/test/Transforms/LoopStrengthReduce/preserve-lcssa.ll index e4890fc00355f..427cdee75c42c 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/preserve-lcssa.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/preserve-lcssa.ll @@ -61,7 +61,6 @@ define void @function_0(i32 %val_i32_8, i32 %val_i32_9) { ; NEWPM-NEXT: br label [[LOOP_EXIT_7:%.*]] ; NEWPM: be_6.loop_exit_7_crit_edge: ; NEWPM-NEXT: [[LSR_IV_LCSSA1:%.*]] = phi i32 [ [[LSR_IV]], [[BE_6]] ] -; NEWPM-NEXT: [[SPLIT:%.*]] = phi i32 [ [[VAL_I32_24]], [[BE_6]] ] ; NEWPM-NEXT: br label [[LOOP_EXIT_7]] ; NEWPM: loop_exit_7: ; NEWPM-NEXT: [[VAL_I32_24_LCSSA]] = phi i32 [ [[LSR_IV_LCSSA1]], [[BE_6_LOOP_EXIT_7_CRIT_EDGE]] ], [ [[VAL_I32_24_LCSSA_PH]], [[LOOP_EXIT_7SPLIT]] ] `````````` </details> https://github.com/llvm/llvm-project/pull/237532 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
