[llvm-branch-commits] [LSR] Deduplicate Phi Nodes before rewriteLoopExitValues (PR #237520)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Sat Oct 31 00:50:01 PDT 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-llvm-transforms

Author: Aiden Grossman (boomanaiden154)

<details>
<summary>Changes</summary>

Otherwise we might end up with duplicate LCSSA phi nodes that cause
rewriteLoopExitValues to bail given the extra uses, which can cause
optimization regressions.

This works towards getting LSR to work with LCSSA IR which is the last
remaining known blocker for enabling the NewPM for CodeGen more broadly.
A set of patches in https://github.com/llvm/llvm-project/pull/235054
shows a mix of improvements/regressions, but an overall improvement.


---
Full diff: https://github.com/llvm/llvm-project/pull/237520.diff


3 Files Affected:

- (modified) llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp (+9) 
- (modified) llvm/test/Transforms/LoopStrengthReduce/X86/duplicate-phi-nodes.ll (+3-6) 
- (modified) llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll (-2) 


``````````diff
diff --git a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
index 18fd5e0b8352a..4a5e9ad68dd34 100644
--- a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
@@ -7240,6 +7240,15 @@ static bool ReduceLoopStrength(Loop *L, IVUsers &IU, ScalarEvolution &SE,
       DeleteDeadPHIs(L->getHeader(), &TLI, MSSAU.get());
     }
   }
+
+  // We might end up with duplicate phi nodes when preserving LCSSA. Clean them
+  // up here, as otherwise rewriteLoopExitValues will bail due to the extra
+  // uses.
+  SmallVector<BasicBlock *, 4> ExitBlocks;
+  L->getUniqueExitBlocks(ExitBlocks);
+  for (BasicBlock *ExitBB : ExitBlocks)
+    Changed |= EliminateDuplicatePHINodes(ExitBB);
+
   // LSR may at times remove all uses of an induction variable from a loop.
   // The only remaining use is the PHI in the exit block.
   // When this is the case, if the exit value of the IV can be calculated using
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/duplicate-phi-nodes.ll b/llvm/test/Transforms/LoopStrengthReduce/X86/duplicate-phi-nodes.ll
index 75bfa76a16970..823f1e417a3d4 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/X86/duplicate-phi-nodes.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/X86/duplicate-phi-nodes.ll
@@ -8,24 +8,21 @@ define i64 @testDuplicateLCSSA(ptr nocapture %a, i64 signext %m, i64 signext %n)
 ; CHECK-LABEL: define i64 @testDuplicateLCSSA(
 ; CHECK-SAME: ptr captures(none) [[A:%.*]], i64 signext [[M:%.*]], i64 signext [[N:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*]]:
+; CHECK-NEXT:    [[TMP0:%.*]] = add i64 [[N]], [[M]]
 ; CHECK-NEXT:    br label %[[FOR_BODY:.*]]
 ; CHECK:       [[FOR_BODY]]:
 ; CHECK-NEXT:    [[LSR_IV1:%.*]] = phi ptr [ [[SCEVGEP:%.*]], %[[FOR_BODY]] ], [ [[A]], %[[ENTRY]] ]
 ; CHECK-NEXT:    [[LSR_IV:%.*]] = phi i64 [ [[LSR_IV_NEXT:%.*]], %[[FOR_BODY]] ], [ [[N]], %[[ENTRY]] ]
-; CHECK-NEXT:    [[INDVARS_IV_PROL:%.*]] = phi i64 [ [[INDVARS_IV_NEXT_PROL:%.*]], %[[FOR_BODY]] ], [ [[M]], %[[ENTRY]] ]
 ; CHECK-NEXT:    store i64 55, ptr [[LSR_IV1]], align 4
-; CHECK-NEXT:    [[INDVARS_IV_NEXT_PROL]] = add i64 [[INDVARS_IV_PROL]], 1
 ; CHECK-NEXT:    [[LSR_IV_NEXT]] = add i64 [[LSR_IV]], -1
 ; CHECK-NEXT:    [[SCEVGEP]] = getelementptr i8, ptr [[LSR_IV1]], i64 8
 ; CHECK-NEXT:    [[I_CMP_NOT:%.*]] = icmp eq i64 [[LSR_IV_NEXT]], 0
 ; CHECK-NEXT:    br i1 [[I_CMP_NOT]], label %[[FOR_EXIT:.*]], label %[[FOR_BODY]]
 ; CHECK:       [[FOR_EXIT]]:
-; CHECK-NEXT:    [[INDVARS_IV_NEXT_PROL_LCSSA1:%.*]] = phi i64 [ [[INDVARS_IV_NEXT_PROL]], %[[FOR_BODY]] ]
-; CHECK-NEXT:    [[INDVARS_IV_NEXT_PROL_LCSSA2:%.*]] = phi i64 [ [[INDVARS_IV_NEXT_PROL]], %[[FOR_BODY]] ]
 ; CHECK-NEXT:    br label %[[EXIT:.*]]
 ; CHECK:       [[EXIT]]:
-; CHECK-NEXT:    [[INDVARS_IV_UNR1:%.*]] = phi i64 [ [[INDVARS_IV_NEXT_PROL_LCSSA1]], %[[FOR_EXIT]] ]
-; CHECK-NEXT:    [[INDVARS_IV_UNR2:%.*]] = phi i64 [ [[INDVARS_IV_NEXT_PROL_LCSSA2]], %[[FOR_EXIT]] ]
+; CHECK-NEXT:    [[INDVARS_IV_UNR1:%.*]] = phi i64 [ [[TMP0]], %[[FOR_EXIT]] ]
+; CHECK-NEXT:    [[INDVARS_IV_UNR2:%.*]] = phi i64 [ [[TMP0]], %[[FOR_EXIT]] ]
 ; CHECK-NEXT:    [[SUM:%.*]] = add i64 [[INDVARS_IV_UNR1]], [[INDVARS_IV_UNR2]]
 ; CHECK-NEXT:    ret i64 [[SUM]]
 ;
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll b/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll
index 2cbd37c515d1e..24354d1ffae8e 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/X86/lcssa-preservation-regression.ll
@@ -76,7 +76,6 @@ define void @regression2() {
 ; CHECK:       [[LOOP1_LATCH1_LOOP1_LATCH3_CRIT_EDGE]]:
 ; CHECK-NEXT:    [[PHI_LCSSA:%.*]] = phi i32 [ [[PHI]], %[[LOOP1_LATCH1]] ]
 ; CHECK-NEXT:    [[SPLIT:%.*]] = phi i32 [ 0, %[[LOOP1_LATCH1]] ]
-; CHECK-NEXT:    [[SPLIT1:%.*]] = phi i32 [ [[PHI]], %[[LOOP1_LATCH1]] ]
 ; CHECK-NEXT:    br label %[[LOOP1_LATCH3]]
 ; CHECK:       [[LOOP1_LATCH3]]:
 ; CHECK-NEXT:    [[PHI6:%.*]] = phi i32 [ [[SPLIT]], %[[LOOP1_LATCH1_LOOP1_LATCH3_CRIT_EDGE]] ], [ [[PHI6_PH]], %[[LOOP1_LATCH3SPLIT]] ]
@@ -228,7 +227,6 @@ define i32 @regression5() personality ptr @__gxx_personality_v0 {
 ; CHECK:       [[LPAD1]]:
 ; CHECK-NEXT:    [[IV_LCSSA7:%.*]] = phi i32 [ [[IV]], %[[LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[OTHER_LCSSA_PH:%.*]] = phi i32 [ 0, %[[LOOP_HEADER]] ]
-; CHECK-NEXT:    [[IV_LCSSA_PH:%.*]] = phi i32 [ [[IV]], %[[LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[LPAD5:%.*]] = landingpad { ptr, i32 }
 ; CHECK-NEXT:            cleanup
 ; CHECK-NEXT:    br label %[[LPAD]]

``````````

</details>


https://github.com/llvm/llvm-project/pull/237520


More information about the llvm-branch-commits mailing list