Skip to content

Commit 092d628

Browse files
committed
[SLP]Check for div/rem instructions before extending with poisons
Need to check if the instructions can be safely extended with poison before actually doing this to avoid incorrect transformations. Fixes #122691
1 parent 26e1309 commit 092d628

File tree

2 files changed

+79
-1
lines changed

2 files changed

+79
-1
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8091,6 +8091,13 @@ void BoUpSLP::buildTree_rec(ArrayRef<Value *> VL, unsigned Depth,
80918091
NonUniqueValueVL.append(
80928092
PWSz - UniqueValues.size(),
80938093
PoisonValue::get(UniqueValues.front()->getType()));
8094+
// Check that extended with poisons operations are still valid for
8095+
// vectorization (div/rem are not allowed).
8096+
if (!getSameOpcode(NonUniqueValueVL, *TLI).valid()) {
8097+
LLVM_DEBUG(dbgs() << "SLP: Scalar used twice in bundle.\n");
8098+
newTreeEntry(VL, std::nullopt /*not vectorized*/, S, UserTreeIdx);
8099+
return false;
8100+
}
80948101
VL = NonUniqueValueVL;
80958102
}
80968103
return true;
@@ -17818,7 +17825,7 @@ bool BoUpSLP::collectValuesToDemote(
1781817825
};
1781917826
if (E.isGather() || !Visited.insert(&E).second ||
1782017827
any_of(E.Scalars, [&](Value *V) {
17821-
return all_of(V->users(), [&](User *U) {
17828+
return !isa<PoisonValue>(V) && all_of(V->users(), [&](User *U) {
1782217829
return isa<InsertElementInst>(U) && !getTreeEntry(U);
1782317830
});
1782417831
}))
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S --passes=slp-vectorizer -mtriple=x86_64-unknown-linux-gnu -slp-threshold=-100 < %s | FileCheck %s
3+
4+
define i8 @test(ptr %g_127, i32 %0, i16 %1) {
5+
; CHECK-LABEL: define i8 @test(
6+
; CHECK-SAME: ptr [[G_127:%.*]], i32 [[TMP0:%.*]], i16 [[TMP1:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*]]:
8+
; CHECK-NEXT: br label %[[FOR_INC434_I:.*]]
9+
; CHECK: [[FOR_COND166_PREHEADER_I:.*]]:
10+
; CHECK-NEXT: br label %[[FOR_INC434_I]]
11+
; CHECK: [[FOR_INC434_I]]:
12+
; CHECK-NEXT: [[TMP2:%.*]] = phi i64 [ 0, %[[ENTRY]] ], [ 60, %[[FOR_COND166_PREHEADER_I]] ]
13+
; CHECK-NEXT: [[CONV8_I_I:%.*]] = zext nneg i32 [[TMP0]] to i64
14+
; CHECK-NEXT: [[DIV_I_I_1:%.*]] = udiv i64 [[CONV8_I_I]], [[TMP2]]
15+
; CHECK-NEXT: [[TMP3:%.*]] = trunc i64 [[DIV_I_I_1]] to i16
16+
; CHECK-NEXT: [[TMP4:%.*]] = insertelement <8 x i16> poison, i16 [[TMP3]], i32 0
17+
; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x i64> poison, i64 [[CONV8_I_I]], i32 0
18+
; CHECK-NEXT: [[TMP6:%.*]] = shufflevector <4 x i64> [[TMP5]], <4 x i64> poison, <4 x i32> zeroinitializer
19+
; CHECK-NEXT: [[TMP7:%.*]] = insertelement <4 x i64> poison, i64 [[TMP2]], i32 0
20+
; CHECK-NEXT: [[TMP8:%.*]] = shufflevector <4 x i64> [[TMP7]], <4 x i64> poison, <4 x i32> zeroinitializer
21+
; CHECK-NEXT: [[TMP9:%.*]] = udiv <4 x i64> [[TMP6]], [[TMP8]]
22+
; CHECK-NEXT: [[TMP10:%.*]] = trunc <4 x i64> [[TMP9]] to <4 x i16>
23+
; CHECK-NEXT: [[TMP11:%.*]] = shufflevector <4 x i16> [[TMP10]], <4 x i16> poison, <8 x i32> <i32 0, i32 poison, i32 1, i32 2, i32 poison, i32 3, i32 poison, i32 poison>
24+
; CHECK-NEXT: [[TMP12:%.*]] = shufflevector <8 x i16> [[TMP4]], <8 x i16> [[TMP11]], <8 x i32> <i32 0, i32 8, i32 poison, i32 10, i32 11, i32 poison, i32 13, i32 poison>
25+
; CHECK-NEXT: [[TMP13:%.*]] = shufflevector <8 x i16> [[TMP12]], <8 x i16> poison, <8 x i32> <i32 0, i32 1, i32 1, i32 3, i32 4, i32 4, i32 6, i32 6>
26+
; CHECK-NEXT: [[TMP14:%.*]] = call <8 x i16> @llvm.bswap.v8i16(<8 x i16> [[TMP13]])
27+
; CHECK-NEXT: [[TMP15:%.*]] = call i16 @llvm.vector.reduce.and.v8i16(<8 x i16> [[TMP14]])
28+
; CHECK-NEXT: [[OP_RDX:%.*]] = and i16 [[TMP15]], [[TMP1]]
29+
; CHECK-NEXT: [[AND14_I_2_I_5:%.*]] = zext i16 [[OP_RDX]] to i32
30+
; CHECK-NEXT: store i32 [[AND14_I_2_I_5]], ptr [[G_127]], align 4
31+
; CHECK-NEXT: ret i8 0
32+
;
33+
entry:
34+
br label %for.inc434.i
35+
36+
for.cond166.preheader.i:
37+
br label %for.inc434.i
38+
39+
for.inc434.i:
40+
%2 = phi i64 [ 0, %entry ], [ 60, %for.cond166.preheader.i ]
41+
%conv8.i.i = zext nneg i32 %0 to i64
42+
%div.i.i.1 = udiv i64 %conv8.i.i, %2
43+
%3 = trunc i64 %div.i.i.1 to i16
44+
%call12.i.2.i.1 = tail call i16 @llvm.bswap.i16(i16 %3)
45+
%and14.i.2.i.118 = and i16 %1, %call12.i.2.i.1
46+
%div.i.i.2 = udiv i64 %conv8.i.i, %2
47+
%4 = trunc i64 %div.i.i.2 to i16
48+
%call12.i.i.2 = tail call i16 @llvm.bswap.i16(i16 %4)
49+
%and14.i.i.219 = and i16 %and14.i.2.i.118, %call12.i.i.2
50+
%call12.i.2.i.2 = tail call i16 @llvm.bswap.i16(i16 %4)
51+
%and14.i.2.i.220 = and i16 %and14.i.i.219, %call12.i.2.i.2
52+
%div.i.i.3 = udiv i64 %conv8.i.i, %2
53+
%5 = trunc i64 %div.i.i.3 to i16
54+
%call12.i.2.i.3 = tail call i16 @llvm.bswap.i16(i16 %5)
55+
%and14.i.2.i.322 = and i16 %and14.i.2.i.220, %call12.i.2.i.3
56+
%div.i.i.4 = udiv i64 %conv8.i.i, %2
57+
%6 = trunc i64 %div.i.i.4 to i16
58+
%call12.i.i.4 = tail call i16 @llvm.bswap.i16(i16 %6)
59+
%and14.i.i.423 = and i16 %and14.i.2.i.322, %call12.i.i.4
60+
%call12.i.2.i.4 = tail call i16 @llvm.bswap.i16(i16 %6)
61+
%and14.i.2.i.424 = and i16 %and14.i.i.423, %call12.i.2.i.4
62+
%div.i.i.5 = udiv i64 %conv8.i.i, %2
63+
%7 = trunc i64 %div.i.i.5 to i16
64+
%call12.i.i.5 = tail call i16 @llvm.bswap.i16(i16 %7)
65+
%and14.i.i.525 = and i16 %and14.i.2.i.424, %call12.i.i.5
66+
%call12.i.2.i.5 = tail call i16 @llvm.bswap.i16(i16 %7)
67+
%and14.i.2.i.51 = and i16 %and14.i.i.525, %call12.i.2.i.5
68+
%and14.i.2.i.5 = zext i16 %and14.i.2.i.51 to i32
69+
store i32 %and14.i.2.i.5, ptr %g_127, align 4
70+
ret i8 0
71+
}

0 commit comments

Comments
 (0)