Skip to content

Commit 79314c6

Browse files
committed
[SLP]Fix PR90224: check that users of gep are all vectorized.
Before deleting extractelement instruction for vectorized GEP with external users, need to check that all users vectorized before deleting this extractelement.
1 parent 01d7dcf commit 79314c6

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8499,6 +8499,12 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
84998499
const TreeEntry *VE = R.getTreeEntry(V);
85008500
if (!CheckedExtracts.insert(V).second ||
85018501
!R.areAllUsersVectorized(cast<Instruction>(V), &VectorizedVals) ||
8502+
any_of(EE->users(),
8503+
[&](User *U) {
8504+
return isa<GetElementPtrInst>(U) &&
8505+
!R.areAllUsersVectorized(cast<Instruction>(U),
8506+
&VectorizedVals);
8507+
}) ||
85028508
(VE && VE != E))
85038509
continue;
85048510
std::optional<unsigned> EEIdx = getExtractIndex(EE);
@@ -11397,6 +11403,8 @@ class BoUpSLP::ShuffleInstructionBuilder final : public BaseShuffleAnalysis {
1139711403
any_of(EI->users(), [&](User *U) {
1139811404
const TreeEntry *UTE = R.getTreeEntry(U);
1139911405
return !UTE || R.MultiNodeScalars.contains(U) ||
11406+
(isa<GetElementPtrInst>(U) &&
11407+
!R.areAllUsersVectorized(cast<Instruction>(U))) ||
1140011408
count_if(R.VectorizableTree,
1140111409
[&](const std::unique_ptr<TreeEntry> &TE) {
1140211410
return any_of(TE->UserTreeIndices,
@@ -13329,8 +13337,11 @@ Value *BoUpSLP::vectorizeTree(
1332913337
// Leave the GEPs as is, they are free in most cases and better to
1333013338
// keep them as GEPs.
1333113339
auto *CloneGEP = GEP->clone();
13332-
CloneGEP->insertBefore(*Builder.GetInsertBlock(),
13333-
Builder.GetInsertPoint());
13340+
if (isa<Instruction>(Vec))
13341+
CloneGEP->insertBefore(*Builder.GetInsertBlock(),
13342+
Builder.GetInsertPoint());
13343+
else
13344+
CloneGEP->insertBefore(GEP);
1333413345
if (GEP->hasName())
1333513346
CloneGEP->takeName(GEP);
1333613347
Ex = CloneGEP;
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
2+
; RUN: opt -S --passes=slp-vectorizer -mtriple=x86_64-unknown-linux-gnu -slp-threshold=-99999 < %s | FileCheck %s
3+
4+
define void @test() {
5+
; CHECK-LABEL: define void @test() {
6+
; CHECK-NEXT: bb:
7+
; CHECK-NEXT: [[TMP0:%.*]] = extractelement <2 x ptr> zeroinitializer, i32 0
8+
; CHECK-NEXT: [[GETELEMENTPTR6:%.*]] = getelementptr i8, ptr [[TMP0]], i64 872
9+
; CHECK-NEXT: store double 0.000000e+00, ptr [[GETELEMENTPTR6]], align 8
10+
; CHECK-NEXT: br label [[BB9:%.*]]
11+
; CHECK: bb9:
12+
; CHECK-NEXT: [[TMP1:%.*]] = phi <2 x ptr> [ getelementptr (i8, <2 x ptr> zeroinitializer, <2 x i64> <i64 32, i64 872>), [[BB:%.*]] ]
13+
; CHECK-NEXT: ret void
14+
;
15+
bb:
16+
%getelementptr = getelementptr i8, ptr null, i64 32
17+
%0 = extractelement <2 x ptr> zeroinitializer, i32 0
18+
%getelementptr6 = getelementptr i8, ptr %0, i64 872
19+
store double 0.000000e+00, ptr %getelementptr6, align 8
20+
br label %bb9
21+
22+
bb9:
23+
%phi10 = phi ptr [ %getelementptr, %bb ]
24+
%phi11 = phi ptr [ %getelementptr6, %bb ]
25+
ret void
26+
}

0 commit comments

Comments
 (0)