!fixup update to main, use more verbose naming, simplify code a bit

Author: fhahn

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -8982,12 +8982,8 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
       U->replaceUsesOfWith(OrigExitingVPV, FinalReductionResult);
 
       // Look through ExtractLastPart.
-      if (match(U, m_ExtractLastPart(m_VPValue()))) {
-        auto *ExtractPart = cast<VPInstruction>(U);
-        if (ExtractPart->getNumUsers() != 1)
-          continue;
-        U = *ExtractPart->user_begin();
-      }
+      if (match(U, m_ExtractLastPart(m_VPValue())))
+        U = cast<VPInstruction>(U)->getSingleUser();
 
       if (match(U, m_CombineOr(m_ExtractLane(m_VPValue(), m_VPValue()),
                                m_ExtractLastLane(m_VPValue()))))

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -1464,10 +1464,10 @@ class VPIRInstruction : public VPRecipeBase {
     return true;
   }
 
-  /// Update the recipe's first operand to the final lane of the operand using
-  /// \p Builder. Must only be used for VPIRInstructions with at least one
-  /// operand wrapping a PHINode.
-  void extractFinalLaneOfFirstOperand(VPBuilder &Builder);
+  /// Update the recipe's first operand to the last lane of the last part of the
+  /// operand using \p Builder. Must only be used for VPIRInstructions with at
+  /// least one operand wrapping a PHINode.
+  void extractLastLaneOfLastPartOfFirstOperand(VPBuilder &Builder);
 
 protected:
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)

llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp

@@ -126,11 +126,8 @@ Type *VPTypeAnalysis::inferScalarTypeForRecipe(const VPInstruction *R) {
       return VecTy->getElementType();
     return BaseTy;
   }
-  case VPInstruction::ExtractLastPart: {
-    // Element type of ExtractLastPart is equal to the element type of its
-    // operand.
+  case VPInstruction::ExtractLastPart:
     return inferScalarType(R->getOperand(0));
-  }
   case VPInstruction::LogicalAnd:
     assert(inferScalarType(R->getOperand(0))->isIntegerTy(1) &&
            inferScalarType(R->getOperand(1))->isIntegerTy(1) &&

llvm/lib/Transforms/Vectorize/VPlanPatternMatch.h

@@ -414,7 +414,7 @@ template <typename Op0_t>
 inline VPInstruction_match<
     VPInstruction::ExtractLastLane,
     VPInstruction_match<VPInstruction::ExtractLastPart, Op0_t>>
-m_ExtractFinalLane(const Op0_t &Op0) {
+m_ExtractLastLaneOfLastPart(const Op0_t &Op0) {
   return m_ExtractLastLane(m_ExtractLastPart(Op0));
 }
 

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -1497,7 +1497,8 @@ InstructionCost VPIRInstruction::computeCost(ElementCount VF,
   return 0;
 }
 
-void VPIRInstruction::extractFinalLaneOfFirstOperand(VPBuilder &Builder) {
+void VPIRInstruction::extractLastLaneOfLastPartOfFirstOperand(
+    VPBuilder &Builder) {
   assert(isa<PHINode>(getInstruction()) &&
          "can only update exiting operands to phi nodes");
   assert(getNumOperands() > 0 && "must have at least one operand");

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -946,7 +946,7 @@ static VPValue *optimizeLatchExitInductionUser(
     VPlan &Plan, VPTypeAnalysis &TypeInfo, VPBlockBase *PredVPBB, VPValue *Op,
     DenseMap<VPValue *, VPValue *> &EndValues, ScalarEvolution &SE) {
   VPValue *Incoming;
-  if (!match(Op, m_ExtractFinalLane(m_VPValue(Incoming))))
+  if (!match(Op, m_ExtractLastLaneOfLastPart(m_VPValue(Incoming))))
     return nullptr;
 
   auto *WideIV = getOptimizableIVOf(Incoming, SE);
@@ -3764,7 +3764,7 @@ void VPlanTransforms::handleUncountableEarlyExit(VPBasicBlock *EarlyExitingVPBB,
     if (ExitIRI->getNumOperands() != 1) {
       // The first of two operands corresponds to the latch exit, via MiddleVPBB
       // predecessor. Extract its final lane.
-      ExitIRI->extractFinalLaneOfFirstOperand(MiddleBuilder);
+      ExitIRI->extractLastLaneOfLastPartOfFirstOperand(MiddleBuilder);
     }
 
     VPValue *IncomingFromEarlyExit = ExitIRI->getOperand(EarlyExitIdx);
@@ -5093,7 +5093,7 @@ void VPlanTransforms::addExitUsersForFirstOrderRecurrences(VPlan &Plan,
     // the VPIRInstruction modeling the phi.
     for (VPRecipeBase &R : make_early_inc_range(
              make_range(MiddleVPBB->getFirstNonPhi(), MiddleVPBB->end()))) {
-      if (!match(&R, m_ExtractFinalLane(m_Specific(FOR))))
+      if (!match(&R, m_ExtractLastLaneOfLastPart(m_Specific(FOR))))
         continue;
 
       // For VF vscale x 1, if vscale = 1, we are unable to extract the

llvm/lib/Transforms/Vectorize/VPlanUnroll.cpp

@@ -371,7 +371,7 @@ void UnrollState::unrollBlock(VPBlockBase *VPB) {
       continue;
     }
 
-    if (match(&R, m_ExtractFinalLane(m_VPValue(Op0))) ||
+    if (match(&R, m_ExtractLastLaneOfLastPart(m_VPValue(Op0))) ||
         match(&R, m_ExtractPenultimateElement(m_VPValue(Op0)))) {
       addUniformForAllParts(cast<VPSingleDefRecipe>(&R));
       if (Plan.hasScalarVFOnly()) {