!fixup use pattern matching in a few more cases.

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -3698,22 +3698,23 @@ bool isHeaderMask(VPValue *V, VPlan &Plan);
 /// if it is either defined outside the vector region or its operand is known to
 /// be uniform across all VFs and UFs (e.g. VPDerivedIV or VPCanonicalIVPHI).
 inline bool isUniformAcrossVFsAndUFs(VPValue *V) {
-  if (auto *VPI = dyn_cast_or_null<VPInstruction>(V->getDefiningRecipe())) {
-    return VPI ==
-           VPI->getParent()->getPlan()->getCanonicalIV()->getBackedgeValue();
-  }
+  if (V->isLiveIn())
+    return true;
   if (isa<VPCanonicalIVPHIRecipe, VPDerivedIVRecipe, VPExpandSCEVRecipe>(V))
     return true;
+  auto *R = cast<VPSingleDefRecipe>(V->getDefiningRecipe());
+  if (R == R->getParent()->getPlan()->getCanonicalIV()->getBackedgeValue())
+    return true;
   if (isa<VPReplicateRecipe>(V) && cast<VPReplicateRecipe>(V)->isUniform() &&
       (isa<LoadInst, StoreInst>(V->getUnderlyingValue())) &&
       all_of(V->getDefiningRecipe()->operands(),
              [](VPValue *Op) { return Op->isDefinedOutsideVectorRegions(); }))
     return true;
 
-  auto *C = dyn_cast_or_null<VPScalarCastRecipe>(V->getDefiningRecipe());
-  return C && (C->isDefinedOutsideVectorRegions() ||
-               isa<VPDerivedIVRecipe>(C->getOperand(0)) ||
-               isa<VPCanonicalIVPHIRecipe>(C->getOperand(0)));
+  return isa<VPScalarCastRecipe, VPWidenCastRecipe>(R) &&
+         (R->isDefinedOutsideVectorRegions() || R->getOperand(0)->isLiveIn() ||
+          isa<VPDerivedIVRecipe>(R->getOperand(0)) ||
+          isa<VPCanonicalIVPHIRecipe>(R->getOperand(0)));
 }
 
 } // end namespace vputils

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -1226,7 +1226,6 @@ void VPWidenIntOrFpInductionRecipe::execute(VPTransformState &State) {
     // Need to create stuff in PH.
     SplatVF = State.get(getOperand(2), 0);
   } else {
-
     // Multiply the vectorization factor by the step using integer or
     // floating-point arithmetic as appropriate.
     Type *StepType = Step->getType();