Skip to content

Commit 5e67c41

Browse files
committed
[SLP]Fix PR90780: insert cast instruction for PHI nodes after all phi nodes.
Need to check if the vectorized value is a PHINode before insert casting instruction and insert it after all phis to generate the code correctly.
1 parent 33e16ca commit 5e67c41

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13747,7 +13747,10 @@ Value *BoUpSLP::vectorizeTree(
1374713747
auto VecIt = VectorCasts.find(Key);
1374813748
if (VecIt == VectorCasts.end()) {
1374913749
IRBuilderBase::InsertPointGuard Guard(Builder);
13750-
if (auto *IVec = dyn_cast<Instruction>(Vec))
13750+
if (auto *IVec = dyn_cast<PHINode>(Vec))
13751+
Builder.SetInsertPoint(
13752+
IVec->getParent()->getFirstNonPHIOrDbgOrLifetime());
13753+
else if (auto *IVec = dyn_cast<Instruction>(Vec))
1375113754
Builder.SetInsertPoint(IVec->getNextNonDebugInstruction());
1375213755
Vec = Builder.CreateIntCast(
1375313756
Vec,
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
2+
;RUN: opt -S -S --passes=slp-vectorizer -slp-threshold=-99999 < %s | FileCheck %s
3+
4+
define double @test() {
5+
; CHECK-LABEL: define double @test() {
6+
; CHECK-NEXT: bb:
7+
; CHECK-NEXT: br label [[BB7:%.*]]
8+
; CHECK: bb7:
9+
; CHECK-NEXT: [[TMP0:%.*]] = phi <2 x i32> [ poison, [[BB9:%.*]] ], [ zeroinitializer, [[BB:%.*]] ]
10+
; CHECK-NEXT: [[TMP1:%.*]] = phi <2 x i32> [ zeroinitializer, [[BB9]] ], [ zeroinitializer, [[BB]] ]
11+
; CHECK-NEXT: [[TMP2:%.*]] = zext <2 x i32> [[TMP0]] to <2 x i64>
12+
; CHECK-NEXT: [[TMP3:%.*]] = extractelement <2 x i32> [[TMP0]], i32 0
13+
; CHECK-NEXT: [[TMP4:%.*]] = zext i32 [[TMP3]] to i64
14+
; CHECK-NEXT: [[TMP5:%.*]] = extractelement <2 x i32> [[TMP0]], i32 1
15+
; CHECK-NEXT: [[TMP6:%.*]] = zext i32 [[TMP5]] to i64
16+
; CHECK-NEXT: [[ICMP:%.*]] = icmp ult i64 [[TMP6]], [[TMP4]]
17+
; CHECK-NEXT: [[TMP7:%.*]] = shufflevector <2 x i64> zeroinitializer, <2 x i64> [[TMP2]], <2 x i32> <i32 3, i32 1>
18+
; CHECK-NEXT: ret double 0.000000e+00
19+
; CHECK: bb9:
20+
; CHECK-NEXT: br label [[BB7]]
21+
;
22+
bb:
23+
br label %bb7
24+
25+
bb7:
26+
%0 = phi <2 x i32> [ poison, %bb9 ], [ zeroinitializer, %bb ]
27+
%1 = phi <2 x i32> [ zeroinitializer, %bb9 ], [ zeroinitializer, %bb ]
28+
%2 = extractelement <2 x i32> %0, i32 1
29+
%3 = extractelement <2 x i32> %0, i32 0
30+
%zext8 = zext i32 %3 to i64
31+
%zext = zext i32 %2 to i64
32+
%icmp = icmp ult i64 %zext, %zext8
33+
%4 = insertelement <2 x i64> zeroinitializer, i64 %zext, i32 0
34+
ret double 0.000000e+00
35+
36+
bb9:
37+
br label %bb7
38+
}

0 commit comments

Comments
 (0)