fixup! Address review comments

Author: mshockwave

llvm/lib/CodeGen/InterleavedAccessPass.cpp

@@ -634,37 +634,28 @@ getVectorDeinterleaveFactor(IntrinsicInst *II,
 // mask.
 static Value *getMask(Value *WideMask, unsigned Factor,
                       VectorType *LeafValueTy) {
-  Value *MaskVal = nullptr;
-
   using namespace llvm::PatternMatch;
   if (auto *IMI = dyn_cast<IntrinsicInst>(WideMask)) {
     SmallVector<Value *, 8> Operands;
     SmallVector<Instruction *, 8> DeadInsts;
     if (getVectorInterleaveFactor(IMI, Operands, DeadInsts)) {
       assert(!Operands.empty());
       if (Operands.size() == Factor && llvm::all_equal(Operands))
-        MaskVal = Operands[0];
+        return Operands[0];
     }
   }
 
   if (match(WideMask, m_AllOnes())) {
-    // Scale the vector length.
+    // Scale the vector length of all-ones mask.
     ElementCount OrigEC =
         cast<VectorType>(WideMask->getType())->getElementCount();
-    MaskVal =
-        ConstantVector::getSplat(OrigEC.divideCoefficientBy(Factor),
-                                 cast<Constant>(WideMask)->getSplatValue());
-  }
-
-  if (MaskVal) {
-    // Check if the vector length of mask matches that of the leaf values.
-    auto *MaskTy = cast<VectorType>(MaskVal->getType());
-    if (!MaskTy->getElementType()->isIntegerTy(/*Bitwidth=*/1) ||
-        MaskTy->getElementCount() != LeafValueTy->getElementCount())
+    if (OrigEC.getKnownMinValue() % Factor)
       return nullptr;
+    return ConstantVector::getSplat(OrigEC.divideCoefficientBy(Factor),
+                                    cast<Constant>(WideMask)->getSplatValue());
   }
 
-  return MaskVal;
+  return nullptr;
 }
 
 bool InterleavedAccessImpl::lowerDeinterleaveIntrinsic(

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -22538,12 +22538,12 @@ static bool isMultipleOfN(const Value *V, const DataLayout &DL, unsigned N) {
   if (isPowerOf2_32(N)) {
     KnownBits KB = llvm::computeKnownBits(V, DL);
     return KB.countMinTrailingZeros() >= Log2_32(N);
-  } else {
-    using namespace PatternMatch;
-    // Right now we're only recognizing the simplest pattern.
-    uint64_t C;
-    return match(V, m_c_Mul(m_Value(), m_ConstantInt(C))) && C && C % N == 0;
   }
+
+  using namespace PatternMatch;
+  // Right now we're only recognizing the simplest pattern.
+  uint64_t C;
+  return match(V, m_c_Mul(m_Value(), m_ConstantInt(C))) && C && C % N == 0;
 }
 
 /// Lower an interleaved vp.load into a vlsegN intrinsic.