[LV][EVL] Address code review comments

Author: LiqinWeng

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -1593,7 +1593,7 @@ class VPWidenCastRecipe : public VPRecipeWithIRFlags {
   Type *getResultType() const { return ResultTy; }
 };
 
-// A recipe for widening cast operation with vector-predication intrinsics with
+/// A recipe for widening cast operation with vector-predication intrinsics with
 /// explicit vector length (EVL).
 class VPWidenCastEVLRecipe : public VPWidenCastRecipe {
   using VPRecipeWithIRFlags::transferFlags;

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -1424,40 +1424,29 @@ void VPWidenCastRecipe::execute(VPTransformState &State) {
 
 void VPWidenCastEVLRecipe::execute(VPTransformState &State) {
   unsigned Opcode = getOpcode();
-  auto Inst = cast<CastInst>(getUnderlyingInstr());
   State.setDebugLocFrom(getDebugLoc());
-  assert(State.UF == 1 && "Expected only UF == 1 when vectorizing with "
-                          "explicit vector length.");
+  Value *SrcVal = State.get(getOperand(0));
+  VectorType *DsType = VectorType::get(getResultType(), State.VF);
 
-  if (Inst->isCast()) {
-    Value *SrcVal = State.get(getOperand(0), 0);
-    VectorType *DsType = VectorType::get(getResultType(), State.VF);
-
-    IRBuilderBase &BuilderIR = State.Builder;
-    VectorBuilder Builder(BuilderIR);
-    Value *Mask = BuilderIR.CreateVectorSplat(State.VF, BuilderIR.getTrue());
-    Builder.setMask(Mask).setEVL(State.get(getEVL(), 0, /*NeedsScalar=*/true));
-
-    Value *VPInst =
-        Builder.createVectorInstruction(Opcode, DsType, {SrcVal}, "vp.cast");
+  IRBuilderBase &BuilderIR = State.Builder;
+  VectorBuilder Builder(BuilderIR);
+  Value *Mask = BuilderIR.CreateVectorSplat(State.VF, BuilderIR.getTrue());
+  Builder.setMask(Mask).setEVL(State.get(getEVL(), /*NeedsScalar=*/true));
 
-    if (VPInst) {
-      if (auto *VecOp = dyn_cast<CastInst>(VPInst))
-        VecOp->copyIRFlags(getUnderlyingInstr());
-    }
+  Value *VPInst =
+      Builder.createVectorInstruction(Opcode, DsType, {SrcVal}, "vp.cast");
 
-    State.set(this, VPInst, 0);
-    State.addMetadata(VPInst,
-                      dyn_cast_or_null<Instruction>(getUnderlyingValue()));
-  }
+  State.set(this, VPInst, 0);
+  State.addMetadata(VPInst,
+                    dyn_cast_or_null<Instruction>(getUnderlyingValue()));
 }
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 void VPWidenCastRecipe::print(raw_ostream &O, const Twine &Indent,
                               VPSlotTracker &SlotTracker) const {
   O << Indent << "WIDEN-CAST ";
   printAsOperand(O, SlotTracker);
-  O << " = " << Instruction::getOpcodeName(Opcode);
+  O << " = " << Instruction::getOpcodeName(Opcode) << " ";
   printFlags(O);
   printOperands(O, SlotTracker);
   O << " to " << *getResultType();

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -1381,9 +1381,6 @@ static void transformRecipestoEVLRecipes(VPlan &Plan, VPValue &EVL) {
               })
               .Case<VPWidenCastRecipe>(
                   [&](VPWidenCastRecipe *W) -> VPRecipeBase * {
-                    auto Inst = cast<CastInst>(W->getUnderlyingInstr());
-                    if (!Inst->isCast())
-                      return nullptr;
                     return new VPWidenCastEVLRecipe(*W, EVL);
                   })
               .Case<VPReductionRecipe>([&](VPReductionRecipe *Red) {

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

@@ -141,16 +141,12 @@ bool VPlanVerifier::verifyEVLRecipe(const VPInstruction &EVL) const {
              .Case<VPWidenStoreEVLRecipe>([&](const VPWidenStoreEVLRecipe *S) {
                return VerifyEVLUse(*S, 2);
              })
-             .Case<VPWidenLoadEVLRecipe>([&](const VPWidenLoadEVLRecipe *L) {
-               return VerifyEVLUse(*L, 1);
-             })
+             .Case<VPWidenLoadEVLRecipe, VPWidenCastEVLRecipe>(
+                 [&](const VPRecipeBase *C) { return VerifyEVLUse(*C, 1); })
              .Case<VPWidenEVLRecipe>([&](const VPWidenEVLRecipe *W) {
                return VerifyEVLUse(
                    *W, Instruction::isUnaryOp(W->getOpcode()) ? 1 : 2);
              })
-             .Case<VPWidenCastEVLRecipe>([&](const VPWidenCastEVLRecipe *C) {
-               return VerifyEVLUse(*C, 1);
-             })
              .Case<VPReductionEVLRecipe>([&](const VPReductionEVLRecipe *R) {
                return VerifyEVLUse(*R, 2);
              })