Skip to content

Commit e5c2270

Browse files
committed
!fixup address latest comments, thanks!
1 parent 29a43e8 commit e5c2270

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

llvm/lib/Transforms/Vectorize/VPlan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,8 +1961,8 @@ class VPScalarPHIRecipe : public VPHeaderPHIRecipe {
19611961
/// A recipe for widened phis. Incoming values are operands of the recipe and
19621962
/// their operand index corresponds to the incoming predeocessor block. If the
19631963
/// recipe is placed in an entry block to a (non-replicate) region, it must have
1964-
/// exactly 2 incoming values, the first from the predecessors of the region and the second
1965-
/// from the exiting block of the region.
1964+
/// exactly 2 incoming values, the first from the predecessors of the region and
1965+
/// the second from the exiting block of the region.
19661966
class VPWidenPHIRecipe : public VPSingleDefRecipe {
19671967
public:
19681968
/// Create a new VPWidenPHIRecipe for \p Phi with start value \p Start and

llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ void PlainCFGBuilder::fixPhiNodes() {
151151
getOrCreateVPOperand(Phi->getIncomingValue(I));
152152
}
153153
for (VPBlockBase *Pred : VPPhi->getParent()->getPredecessors())
154-
VPPhi->addOperand(VPPredToIncomingValue.lookup(Pred->getExitingBasicBlock()));
154+
VPPhi->addOperand(
155+
VPPredToIncomingValue.lookup(Pred->getExitingBasicBlock()));
155156
}
156157
}
157158

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3614,10 +3614,14 @@ VPBasicBlock *VPWidenPHIRecipe::getIncomingBlock(unsigned I) {
36143614
VPBlockBase *Pred = nullptr;
36153615
if (Parent->getNumPredecessors() == 0) {
36163616
auto *Region = Parent->getParent();
3617-
assert(Region && !Region->isReplicator() && Region->getEntry() == Parent && "must be in the entry block of a non-replicate region");
3618-
assert(I < 2 && getNumOperands() == 2 && "when placed in an entry block, only 2 incoming blocks are available");
3617+
assert(Region && !Region->isReplicator() && Region->getEntry() == Parent &&
3618+
"must be in the entry block of a non-replicate region");
3619+
assert(
3620+
I < 2 && getNumOperands() == 2 &&
3621+
"when placed in an entry block, only 2 incoming blocks are available");
36193622

3620-
// I == 0 selects the predecessor of the region, I == 1 selects the region itself whose exiting block feeds the phi across the backedge.
3623+
// I == 0 selects the predecessor of the region, I == 1 selects the region
3624+
// itself whose exiting block feeds the phi across the backedge.
36213625
Pred = I == 0 ? Region->getSinglePredecessor() : Region;
36223626
} else {
36233627
Pred = Parent->getPredecessors()[I];

0 commit comments

Comments
 (0)