[llvm] [SLP][NFC] Address follow-up cleanups in SLPUtils (PR #210016)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-vectorizers

@llvm/pr-subscribers-llvm-transforms

Author: Madhur Amilkanthwar (madhur13490)

<details>
<summary>Changes</summary>

Follow-up to #<!-- -->206881, addressing deferred review comments:
- Assert VL is non-empty in allSameType before consume_front.
- Use llvm::all_of instead of std::all_of in allSameOpcode.
- Rewrite isVectorLikeInstWithConstOps as a dyn_cast + opcode switch.

---
Full diff: https://github.com/llvm/llvm-project/pull/210016.diff


1 Files Affected:

- (modified) llvm/lib/Transforms/Vectorize/SLPVectorizer/SLPUtils.cpp (+13-9) 


``````````diff
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer/SLPUtils.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer/SLPUtils.cpp
index 3eef3c52c0b7d..7cc57c68e3594 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer/SLPUtils.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer/SLPUtils.cpp
@@ -33,20 +33,23 @@ bool isConstant(Value *V) {
 }
 
 bool isVectorLikeInstWithConstOps(Value *V) {
-  if (!isa<InsertElementInst, InsertValueInst, ExtractElementInst>(V) &&
-      !isa<ExtractValueInst, UndefValue>(V))
-    return false;
   auto *I = dyn_cast<Instruction>(V);
-  if (!I || isa<ExtractValueInst>(I))
+  // Non-instructions are vector-like only if they are undef.
+  if (!I)
+    return isa<UndefValue>(V);
+  switch (I->getOpcode()) {
+  case Instruction::ExtractValue:
+  case Instruction::InsertValue:
     return true;
-  if (isa<ExtractElementInst>(I))
+  case Instruction::ExtractElement:
     return isa<FixedVectorType>(I->getOperand(0)->getType()) &&
            isConstant(I->getOperand(1));
-  if (isa<InsertElementInst>(I))
+  case Instruction::InsertElement:
     return isa<FixedVectorType>(I->getOperand(0)->getType()) &&
            isConstant(I->getOperand(2));
-  assert(isa<InsertValueInst>(I) && "Expected InsertValueInst");
-  return true;
+  default:
+    return false;
+  }
 }
 
 unsigned getNumElements(Type *Ty) {
@@ -221,7 +224,7 @@ bool allSameOpcode(ArrayRef<Value *> VL) {
   bool IsCmpOp = isa<CmpInst>(MainOp);
   CmpInst::Predicate BasePred = IsCmpOp ? cast<CmpInst>(MainOp)->getPredicate()
                                         : CmpInst::BAD_ICMP_PREDICATE;
-  return std::all_of(It, VL.end(), [&](Value *V) {
+  return all_of(iterator_range(It, VL.end()), [&](Value *V) {
     if (auto *CI = dyn_cast<CmpInst>(V))
       return BasePred == CI->getPredicate();
     if (auto *I = dyn_cast<Instruction>(V))
@@ -274,6 +277,7 @@ void reorderScalars(SmallVectorImpl<Value *> &Scalars, ArrayRef<int> Mask) {
 }
 
 bool allSameType(ArrayRef<Value *> VL) {
+  assert(!VL.empty() && "Expected non-empty list of values.");
   Type *Ty = VL.consume_front()->getType();
   return all_of(VL, [&](Value *V) { return V->getType() == Ty; });
 }

``````````

</details>


https://github.com/llvm/llvm-project/pull/210016