Skip to content

Commit 0280f97

Browse files
committed
[SLP]Fix PR95925: extract vectorized index of the potential buildvector sequence.
If the vectorized scalar is not the insert value in the buildvector sequence but the index, it should be always extracted.
1 parent d264514 commit 0280f97

File tree

2 files changed

+46
-2
lines changed

2 files changed

+46
-2
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10269,7 +10269,8 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals) {
1026910269

1027010270
// If found user is an insertelement, do not calculate extract cost but try
1027110271
// to detect it as a final shuffled/identity match.
10272-
if (auto *VU = dyn_cast_or_null<InsertElementInst>(EU.User)) {
10272+
if (auto *VU = dyn_cast_or_null<InsertElementInst>(EU.User);
10273+
VU && VU->getOperand(1) == EU.Scalar) {
1027310274
if (auto *FTy = dyn_cast<FixedVectorType>(VU->getType())) {
1027410275
if (!UsedInserts.insert(VU).second)
1027510276
continue;
@@ -13768,7 +13769,8 @@ Value *BoUpSLP::vectorizeTree(
1376813769
continue;
1376913770
}
1377013771

13771-
if (auto *VU = dyn_cast<InsertElementInst>(User)) {
13772+
if (auto *VU = dyn_cast<InsertElementInst>(User);
13773+
VU && VU && VU->getOperand(1) == Scalar) {
1377213774
// Skip if the scalar is another vector op or Vec is not an instruction.
1377313775
if (!Scalar->getType()->isVectorTy() && isa<Instruction>(Vec)) {
1377413776
if (auto *FTy = dyn_cast<FixedVectorType>(User->getType())) {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S --passes=slp-vectorizer -slp-threshold=-10 < %s -mtriple=x86_64-pc-windows-msvc19.39.33523 | FileCheck %s
3+
4+
define void @test(ptr %0) {
5+
; CHECK-LABEL: define void @test(
6+
; CHECK-SAME: ptr [[TMP0:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*:]]
8+
; CHECK-NEXT: [[TMP1:%.*]] = insertelement <2 x ptr> <ptr null, ptr poison>, ptr [[TMP0]], i32 1
9+
; CHECK-NEXT: [[TMP2:%.*]] = ptrtoint <2 x ptr> [[TMP1]] to <2 x i64>
10+
; CHECK-NEXT: [[TMP3:%.*]] = trunc <2 x i64> [[TMP2]] to <2 x i32>
11+
; CHECK-NEXT: switch i32 0, label %[[NEWFUNCROOT994:.*]] [
12+
; CHECK-NEXT: i32 1, label %[[NEWFUNCROOT994]]
13+
; CHECK-NEXT: i32 0, label %[[NEWFUNCROOT584:.*]]
14+
; CHECK-NEXT: ]
15+
; CHECK: [[NEWFUNCROOT584]]:
16+
; CHECK-NEXT: [[TMP4:%.*]] = shufflevector <2 x i32> [[TMP3]], <2 x i32> poison, <4 x i32> <i32 0, i32 1, i32 poison, i32 poison>
17+
; CHECK-NEXT: ret void
18+
; CHECK: [[NEWFUNCROOT994]]:
19+
; CHECK-NEXT: [[TMP5:%.*]] = extractelement <2 x i32> [[TMP3]], i32 1
20+
; CHECK-NEXT: [[TMP6:%.*]] = extractelement <2 x i64> [[TMP2]], i32 0
21+
; CHECK-NEXT: [[TMP7:%.*]] = insertelement <4 x i32> zeroinitializer, i32 [[TMP5]], i64 [[TMP6]]
22+
; CHECK-NEXT: ret void
23+
;
24+
entry:
25+
%1 = ptrtoint ptr %0 to i64
26+
%2 = trunc i64 %1 to i32
27+
%3 = ptrtoint ptr null to i64
28+
%4 = trunc i64 %3 to i32
29+
switch i32 0, label %newFuncRoot994 [
30+
i32 1, label %newFuncRoot994
31+
i32 0, label %newFuncRoot584
32+
]
33+
34+
newFuncRoot584:
35+
%5 = insertelement <4 x i32> poison, i32 %4, i64 0
36+
%6 = insertelement <4 x i32> %5, i32 %2, i64 1
37+
ret void
38+
39+
newFuncRoot994:
40+
%7 = insertelement <4 x i32> zeroinitializer, i32 %2, i64 %3
41+
ret void
42+
}

0 commit comments

Comments
 (0)