Skip to content

Commit c7fdb80

Browse files
committed
[SLP][REVEC] getNumElements should not be used as VF when REVEC is
enabled.
1 parent 2bac936 commit c7fdb80

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11298,8 +11298,7 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
1129811298
if (!E2 && InVectors.size() == 1) {
1129911299
unsigned VF = E1.getVectorFactor();
1130011300
if (Value *V1 = dyn_cast<Value *>(InVectors.front())) {
11301-
VF = std::max(VF,
11302-
cast<FixedVectorType>(V1->getType())->getNumElements());
11301+
VF = std::max(VF, getVF(V1));
1130311302
} else {
1130411303
const auto *E = cast<const TreeEntry *>(InVectors.front());
1130511304
VF = std::max(VF, E->getVectorFactor());

llvm/test/Transforms/SLPVectorizer/X86/revec-estimateNodesPermuteCost.ll

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@
22
; RUN: opt -mtriple=x86_64-unknown-linux-gnu -mattr=+avx2 -passes=slp-vectorizer -S -slp-revec < %s | FileCheck %s
33

44
define i32 @test1(<4 x float> %0, <4 x float> %1) {
5+
; CHECK-LABEL: @test1(
6+
; CHECK-NEXT: entry:
7+
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i8, ptr null, i64 288
8+
; CHECK-NEXT: [[TMP3:%.*]] = getelementptr i8, ptr null, i64 304
9+
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr i8, ptr null, i64 416
10+
; CHECK-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr null, i64 432
11+
; CHECK-NEXT: [[TMP6:%.*]] = getelementptr i8, ptr null, i64 256
12+
; CHECK-NEXT: [[TMP7:%.*]] = getelementptr i8, ptr null, i64 272
13+
; CHECK-NEXT: [[TMP8:%.*]] = getelementptr i8, ptr null, i64 288
14+
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr null, i64 304
15+
; CHECK-NEXT: [[TMP10:%.*]] = load <4 x float>, ptr [[TMP2]], align 16
16+
; CHECK-NEXT: [[TMP11:%.*]] = load <4 x float>, ptr [[TMP3]], align 16
17+
; CHECK-NEXT: [[TMP12:%.*]] = load <4 x float>, ptr [[TMP4]], align 16
18+
; CHECK-NEXT: [[TMP13:%.*]] = load <4 x float>, ptr [[TMP5]], align 16
19+
; CHECK-NEXT: [[TMP14:%.*]] = fmul <4 x float> [[TMP10]], [[TMP0:%.*]]
20+
; CHECK-NEXT: [[TMP15:%.*]] = fmul <4 x float> [[TMP11]], [[TMP0]]
21+
; CHECK-NEXT: [[TMP16:%.*]] = fmul <4 x float> [[TMP12]], [[TMP0]]
22+
; CHECK-NEXT: [[TMP17:%.*]] = fmul <4 x float> [[TMP13]], [[TMP0]]
23+
; CHECK-NEXT: [[TMP18:%.*]] = fsub <4 x float> [[TMP14]], [[TMP1:%.*]]
24+
; CHECK-NEXT: [[TMP19:%.*]] = fsub <4 x float> [[TMP15]], zeroinitializer
25+
; CHECK-NEXT: [[TMP20:%.*]] = fsub <4 x float> [[TMP16]], [[TMP1]]
26+
; CHECK-NEXT: [[TMP21:%.*]] = fsub <4 x float> [[TMP17]], zeroinitializer
27+
; CHECK-NEXT: [[TMP22:%.*]] = fmul <4 x float> [[TMP11]], zeroinitializer
28+
; CHECK-NEXT: [[TMP23:%.*]] = fmul <4 x float> [[TMP13]], zeroinitializer
29+
; CHECK-NEXT: [[TMP24:%.*]] = fadd <4 x float> [[TMP18]], [[TMP0]]
30+
; CHECK-NEXT: [[TMP25:%.*]] = fadd <4 x float> [[TMP19]], zeroinitializer
31+
; CHECK-NEXT: [[TMP26:%.*]] = fadd <4 x float> [[TMP20]], [[TMP0]]
32+
; CHECK-NEXT: [[TMP27:%.*]] = fadd <4 x float> [[TMP21]], zeroinitializer
33+
; CHECK-NEXT: store <4 x float> [[TMP24]], ptr [[TMP6]], align 16
34+
; CHECK-NEXT: store <4 x float> [[TMP25]], ptr [[TMP7]], align 16
35+
; CHECK-NEXT: store <4 x float> [[TMP26]], ptr [[TMP8]], align 16
36+
; CHECK-NEXT: store <4 x float> [[TMP27]], ptr [[TMP9]], align 16
37+
; CHECK-NEXT: ret i32 0
38+
;
539
entry:
640
%2 = getelementptr i8, ptr null, i64 288
741
%3 = getelementptr i8, ptr null, i64 304

0 commit comments

Comments
 (0)