fixup! Address review comments

Author: mshockwave

llvm/include/llvm/Analysis/VectorUtils.h

@@ -189,8 +189,9 @@ LLVM_ABI unsigned getInterleaveIntrinsicFactor(Intrinsic::ID ID);
 /// Returns the corresponding factor of llvm.vector.deinterleaveN intrinsics.
 LLVM_ABI unsigned getDeinterleaveIntrinsicFactor(Intrinsic::ID ID);
 
-/// Given a deinterleaveN intrinsic, return the (narrow) type of each factor.
-LLVM_ABI Type *getDeinterleavedVectorType(IntrinsicInst *DI);
+/// Given a deinterleaveN intrinsic, return the (narrow) vector type of each
+/// factor.
+LLVM_ABI VectorType *getDeinterleavedVectorType(IntrinsicInst *DI);
 
 /// Given a vector and an element number, see if the scalar value is
 /// already around as a register, for example if it were inserted then extracted

llvm/lib/Analysis/VectorUtils.cpp

@@ -306,13 +306,13 @@ unsigned llvm::getDeinterleaveIntrinsicFactor(Intrinsic::ID ID) {
   }
 }
 
-Type *llvm::getDeinterleavedVectorType(IntrinsicInst *DI) {
+VectorType *llvm::getDeinterleavedVectorType(IntrinsicInst *DI) {
   [[maybe_unused]] unsigned Factor =
       getDeinterleaveIntrinsicFactor(DI->getIntrinsicID());
   ArrayRef<Type *> DISubtypes = DI->getType()->subtypes();
   assert(Factor && Factor == DISubtypes.size() &&
          "unexpected deinterleave factor or result type");
-  return DISubtypes[0];
+  return cast<VectorType>(DISubtypes[0]);
 }
 
 /// Given a vector and an element number, see if the scalar value is

llvm/lib/CodeGen/InterleavedAccessPass.cpp

@@ -624,8 +624,7 @@ bool InterleavedAccessImpl::lowerDeinterleaveIntrinsic(
       return false;
     // Check mask operand. Handle both all-true/false and interleaved mask.
     Value *WideMask = VPLoad->getOperand(1);
-    Mask = getMask(WideMask, Factor,
-                   cast<VectorType>(getDeinterleavedVectorType(DI)));
+    Mask = getMask(WideMask, Factor, getDeinterleavedVectorType(DI));
     if (!Mask)
       return false;
 

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -17497,7 +17497,7 @@ bool AArch64TargetLowering::lowerDeinterleaveIntrinsicToLoad(
     return false;
   assert(!Mask && "Unexpected mask on a load\n");
 
-  VectorType *VTy = cast<VectorType>(getDeinterleavedVectorType(DI));
+  VectorType *VTy = getDeinterleavedVectorType(DI);
 
   const DataLayout &DL = LI->getModule()->getDataLayout();
   bool UseScalable;

llvm/lib/Target/RISCV/RISCVInterleavedAccess.cpp

@@ -259,13 +259,12 @@ static bool isMultipleOfN(const Value *V, const DataLayout &DL, unsigned N) {
 bool RISCVTargetLowering::lowerDeinterleaveIntrinsicToLoad(
     Instruction *Load, Value *Mask, IntrinsicInst *DI) const {
   const unsigned Factor = getDeinterleaveIntrinsicFactor(DI->getIntrinsicID());
-  assert(Factor && "unexpected deinterleaving factor");
   if (Factor > 8)
     return false;
 
   IRBuilder<> Builder(Load);
 
-  VectorType *ResVTy = cast<VectorType>(getDeinterleavedVectorType(DI));
+  VectorType *ResVTy = getDeinterleavedVectorType(DI);
 
   const DataLayout &DL = Load->getDataLayout();
   auto *XLenTy = Type::getIntNTy(Load->getContext(), Subtarget.getXLen());