[llvm] [SLP] NFC. ShuffleInstructionBuilder::add V1->getType() is always a (PR #99842)
Han-Kuan Chen via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 22 09:06:19 PDT 2024
https://github.com/HanKuanChen updated https://github.com/llvm/llvm-project/pull/99842
>From c11288a63a5629522292786464a85728b39c0b65 Mon Sep 17 00:00:00 2001
From: Han-Kuan Chen <hankuan.chen at sifive.com>
Date: Mon, 22 Jul 2024 00:26:58 -0700
Subject: [PATCH] [SLP] NFC. ShuffleInstructionBuilder::add V1->getType() is
always a FixedVectorType.
castToScalarTyElem has a cast<VectorType>(V->getType()).
---
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index d8c3bae06e932..e418f30b5efe3 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -12041,6 +12041,8 @@ class BoUpSLP::ShuffleInstructionBuilder final : public BaseShuffleAnalysis {
}
/// Adds 2 input vectors and the mask for their shuffling.
void add(Value *V1, Value *V2, ArrayRef<int> Mask) {
+ assert(isa<FixedVectorType>(V1->getType()));
+ assert(isa<FixedVectorType>(V2->getType()));
assert(V1 && V2 && !Mask.empty() && "Expected non-empty input vectors.");
V1 = castToScalarTyElem(V1);
V2 = castToScalarTyElem(V2);
@@ -12071,13 +12073,9 @@ class BoUpSLP::ShuffleInstructionBuilder final : public BaseShuffleAnalysis {
}
/// Adds another one input vector and the mask for the shuffling.
void add(Value *V1, ArrayRef<int> Mask, bool = false) {
+ assert(isa<FixedVectorType>(V1->getType()));
V1 = castToScalarTyElem(V1);
if (InVectors.empty()) {
- if (!isa<FixedVectorType>(V1->getType())) {
- V1 = createShuffle(V1, nullptr, CommonMask);
- CommonMask.assign(Mask.size(), PoisonMaskElem);
- transformMaskAfterShuffle(CommonMask, Mask);
- }
InVectors.push_back(V1);
CommonMask.assign(Mask.begin(), Mask.end());
return;
@@ -12085,8 +12083,7 @@ class BoUpSLP::ShuffleInstructionBuilder final : public BaseShuffleAnalysis {
const auto *It = find(InVectors, V1);
if (It == InVectors.end()) {
if (InVectors.size() == 2 ||
- InVectors.front()->getType() != V1->getType() ||
- !isa<FixedVectorType>(V1->getType())) {
+ InVectors.front()->getType() != V1->getType()) {
Value *V = InVectors.front();
if (InVectors.size() == 2) {
V = createShuffle(InVectors.front(), InVectors.back(), CommonMask);
@@ -12120,9 +12117,7 @@ class BoUpSLP::ShuffleInstructionBuilder final : public BaseShuffleAnalysis {
break;
}
}
- int VF = CommonMask.size();
- if (auto *FTy = dyn_cast<FixedVectorType>(V1->getType()))
- VF = FTy->getNumElements();
+ int VF = cast<FixedVectorType>(V1->getType())->getNumElements();
for (unsigned Idx = 0, Sz = CommonMask.size(); Idx < Sz; ++Idx)
if (Mask[Idx] != PoisonMaskElem && CommonMask[Idx] == PoisonMaskElem)
CommonMask[Idx] = Mask[Idx] + (It == InVectors.begin() ? 0 : VF);
More information about the llvm-commits
mailing list