Skip to content

Commit 552bd91

Browse files
committed
!fixup update recipe printing
1 parent 06c3d39 commit 552bd91

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -868,10 +868,12 @@ void VPIRInstruction::print(raw_ostream &O, const Twine &Indent,
868868
O << Indent << "IR " << I;
869869

870870
if (getNumOperands() != 0) {
871-
O << " (extra operand: ";
872-
getOperand(0)->printAsOperand(O, SlotTracker);
873-
O << " from ";
874-
getParent()->getPredecessors()[0]->printAsOperand(O);
871+
O << " (extra operand" << (getNumOperands() > 1 ? "s" : "") << ": ";
872+
interleaveComma(enumerate(operands()), O, [this, &O, &SlotTracker](auto Op) {
873+
Op.value()->printAsOperand(O, SlotTracker);
874+
O << " from ";
875+
getParent()->getPredecessors()[Op.index()]->printAsOperand(O);
876+
});
875877
O << ")";
876878
}
877879
}

llvm/test/Transforms/LoopVectorize/uncountable-early-exit-vplan.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ define i64 @multi_exiting_to_different_exits_live_in_exit_values() {
4141
; CHECK-NEXT: Successor(s): ir-bb<e1>, middle.block
4242
; CHECK-EMPTY:
4343
; CHECK-NEXT: ir-bb<e1>:
44-
; CHECK-NEXT: IR %p1 = phi i64 [ 0, %loop.header ] (extra operand: ir<0>)
44+
; CHECK-NEXT: IR %p1 = phi i64 [ 0, %loop.header ] (extra operand: ir<0> from middle.split)
4545
; CHECK-NEXT: No successors
4646
; CHECK-EMPTY:
4747
; CHECK-NEXT: middle.block:
@@ -50,7 +50,7 @@ define i64 @multi_exiting_to_different_exits_live_in_exit_values() {
5050
; CHECK-NEXT: Successor(s): ir-bb<e2>, scalar.ph
5151
; CHECK-EMPTY:
5252
; CHECK-NEXT: ir-bb<e2>:
53-
; CHECK-NEXT: IR %p2 = phi i64 [ 1, %loop.latch ] (extra operand: ir<1>)
53+
; CHECK-NEXT: IR %p2 = phi i64 [ 1, %loop.latch ] (extra operand: ir<1> from middle.block)
5454
; CHECK-NEXT: No successors
5555
; CHECK-EMPTY:
5656
; CHECK-NEXT: scalar.ph:
@@ -152,7 +152,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values() {
152152
; CHECK-NEXT: Successor(s): ir-bb<exit>, middle.block
153153
; CHECK-EMPTY:
154154
; CHECK-NEXT: ir-bb<exit>:
155-
; CHECK-NEXT: IR %p = phi i64 [ 0, %loop.header ], [ 1, %loop.latch ] (extra operand: ir<1>, ir<0>)
155+
; CHECK-NEXT: IR %p = phi i64 [ 0, %loop.header ], [ 1, %loop.latch ] (extra operands: ir<1> from middle.block, ir<0> from middle.split)
156156
; CHECK-NEXT: No successors
157157
; CHECK-EMPTY:
158158
; CHECK-NEXT: middle.block:
@@ -228,7 +228,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values_2() {
228228
; CHECK-NEXT: Successor(s): ir-bb<exit>, middle.block
229229
; CHECK-EMPTY:
230230
; CHECK-NEXT: ir-bb<exit>:
231-
; CHECK-NEXT: IR %p = phi i64 [ 0, %loop.header ], [ 1, %loop.latch ] (extra operand: ir<1>, ir<0>)
231+
; CHECK-NEXT: IR %p = phi i64 [ 0, %loop.header ], [ 1, %loop.latch ] (extra operands: ir<1> from middle.block, ir<0> from middle.split)
232232
; CHECK-NEXT: No successors
233233
; CHECK-EMPTY:
234234
; CHECK-NEXT: middle.block:

0 commit comments

Comments
 (0)