Merge commit 'cbf7b52a6589' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 4e9360746f51 · 2023-12-02T15:22:09.000Z
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -9271,6 +9271,9 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
               ? new VPInstruction(Instruction::Select, {Cond, Red, PhiR}, FMFs)
               : new VPInstruction(Instruction::Select, {Cond, Red, PhiR});
       Result->insertBefore(&*Builder.getInsertPoint());
+      Red->replaceUsesWithIf(
+          Result->getVPSingleValue(),
+          [](VPUser &U, unsigned) { return isa<VPLiveOut>(&U); });
       if (PreferPredicatedReductionSelect ||
           TTI.preferPredicatedReductionSelect(
               PhiR->getRecurrenceDescriptor().getOpcode(), PhiTy,
diff --git a/llvm/test/Transforms/LoopVectorize/first-order-recurrence-sink-replicate-region.ll b/llvm/test/Transforms/LoopVectorize/first-order-recurrence-sink-replicate-region.ll
@@ -214,7 +214,7 @@ define i32 @sink_replicate_region_3_reduction(i32 %x, i8 %y, ptr %ptr) optsize {
 ; CHECK-NEXT: middle.block:
 ; CHECK-NEXT: No successors
 ; CHECK-EMPTY:
-; CHECK-NEXT: Live-out i32 %res = ir<%and.red.next>
+; CHECK-NEXT: Live-out i32 %res = vp<[[SEL]]>
 ; CHECK-NEXT: }
 ;
 entry:

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ define i32 @sink_replicate_region_3_reduction(i32 %x, i8 %y, ptr %ptr) optsize {`
`214`	`214`	`; CHECK-NEXT: middle.block:`
`215`	`215`	`; CHECK-NEXT: No successors`
`216`	`216`	`; CHECK-EMPTY:`
`217`		`-; CHECK-NEXT: Live-out i32 %res = ir<%and.red.next>`
	`217`	`+; CHECK-NEXT: Live-out i32 %res = vp<[[SEL]]>`
`218`	`218`	`; CHECK-NEXT: }`
`219`	`219`	`;`
`220`	`220`	`entry:`