Skip to content

Commit 05beaf2

Browse files
committed
[SLP][REVEC] getScalarizationOverhead should not be used when ScalarTy
is FixedVectorType.
1 parent 74c6638 commit 05beaf2

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9616,8 +9616,20 @@ void BoUpSLP::reorderGatherNode(TreeEntry &TE) {
96169616
Cost += ::getShuffleCost(*TTI, TTI::SK_InsertSubvector, VecTy, {}, CostKind,
96179617
Idx, getWidenedType(ScalarTy, Sz));
96189618
}
9619-
Cost += TTI->getScalarizationOverhead(VecTy, DemandedElts, /*Insert=*/true,
9620-
/*Extract=*/false, CostKind);
9619+
if (isa<FixedVectorType>(ScalarTy)) {
9620+
assert(SLPReVec && "Only supported by REVEC.");
9621+
// If ScalarTy is FixedVectorType, we should use CreateInsertVector instead
9622+
// of CreateInsertElement.
9623+
unsigned ScalarTyNumElements = getNumElements(ScalarTy);
9624+
for (unsigned I : seq<unsigned>(TE.Scalars.size()))
9625+
if (DemandedElts[I])
9626+
Cost += TTI->getShuffleCost(
9627+
TTI::SK_InsertSubvector, VecTy, std::nullopt, CostKind,
9628+
I * ScalarTyNumElements, cast<FixedVectorType>(ScalarTy));
9629+
} else {
9630+
Cost += TTI->getScalarizationOverhead(VecTy, DemandedElts, /*Insert=*/true,
9631+
/*Extract=*/false, CostKind);
9632+
}
96219633
int Sz = TE.Scalars.size();
96229634
SmallVector<int> ReorderMask(TE.ReorderIndices.begin(),
96239635
TE.ReorderIndices.end());

llvm/test/Transforms/SLPVectorizer/SystemZ/revec-fix-117393.ll

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
; RUN: opt -mtriple=systemz-unknown -mcpu=z15 -passes=slp-vectorizer -S -slp-revec %s | FileCheck %s
33

44
define void @h() {
5+
; CHECK-LABEL: @h(
6+
; CHECK-NEXT: entry:
7+
; CHECK-NEXT: [[TMP0:%.*]] = shl <4 x i32> zeroinitializer, zeroinitializer
8+
; CHECK-NEXT: [[TMP1:%.*]] = or <4 x i32> [[TMP0]], zeroinitializer
9+
; CHECK-NEXT: [[TMP2:%.*]] = or <4 x i32> splat (i32 1), zeroinitializer
10+
; CHECK-NEXT: [[TMP3:%.*]] = shl <4 x i32> zeroinitializer, zeroinitializer
11+
; CHECK-NEXT: [[TMP4:%.*]] = or <4 x i32> [[TMP3]], zeroinitializer
12+
; CHECK-NEXT: [[TMP5:%.*]] = and <4 x i32> [[TMP2]], [[TMP1]]
13+
; CHECK-NEXT: [[TMP6:%.*]] = and <4 x i32> zeroinitializer, [[TMP5]]
14+
; CHECK-NEXT: [[TMP7:%.*]] = and <4 x i32> [[TMP4]], [[TMP6]]
15+
; CHECK-NEXT: [[TMP8:%.*]] = call i32 @llvm.vector.reduce.and.v4i32(<4 x i32> [[TMP7]])
16+
; CHECK-NEXT: ret void
17+
;
518
entry:
619
%0 = shl <4 x i32> zeroinitializer, zeroinitializer
720
%1 = or <4 x i32> %0, zeroinitializer

0 commit comments

Comments
 (0)