Skip to content

Commit aa452b6

Browse files
committed
[SLP]Restore insertion points after gathers vectorization
Restore insertion points after gathers vectorization to avoid a crash in a root node vectorization. Fixes #141265
1 parent 69f2ff3 commit aa452b6

File tree

2 files changed

+56
-0
lines changed

2 files changed

+56
-0
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18535,6 +18535,7 @@ Value *BoUpSLP::vectorizeTree(
1853518535
}
1853618536
}
1853718537
for (auto &Entry : GatherEntries) {
18538+
IRBuilderBase::InsertPointGuard Guard(Builder);
1853818539
Builder.SetInsertPoint(Entry.second);
1853918540
Builder.SetCurrentDebugLocation(Entry.second->getDebugLoc());
1854018541
(void)vectorizeTree(Entry.first);
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S --passes=slp-vectorizer -mtriple=riscv64-unknown-linux-gnu -mattr=+v < %s | FileCheck %s
3+
4+
define i16 @test(ptr %i) {
5+
; CHECK-LABEL: define i16 @test(
6+
; CHECK-SAME: ptr [[I:%.*]]) #[[ATTR0:[0-9]+]] {
7+
; CHECK-NEXT: [[ENTRY:.*:]]
8+
; CHECK-NEXT: [[TMP0:%.*]] = insertelement <2 x ptr> poison, ptr [[I]], i32 0
9+
; CHECK-NEXT: [[TMP1:%.*]] = shufflevector <2 x ptr> [[TMP0]], <2 x ptr> poison, <2 x i32> zeroinitializer
10+
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i8, <2 x ptr> [[TMP1]], <2 x i64> <i64 132860, i64 137774>
11+
; CHECK-NEXT: [[TMP3:%.*]] = shufflevector <2 x ptr> [[TMP2]], <2 x ptr> poison, <4 x i32> <i32 0, i32 1, i32 0, i32 1>
12+
; CHECK-NEXT: [[GEP_US154_2:%.*]] = getelementptr i8, ptr [[I]], i64 142688
13+
; CHECK-NEXT: br label %[[FOR_COND5_US:.*]]
14+
; CHECK: [[FOR_COND5_US]]:
15+
; CHECK-NEXT: [[TMP4:%.*]] = call <4 x i16> @llvm.experimental.vp.strided.load.v4i16.p0.i64(ptr align 2 [[GEP_US154_2]], i64 4914, <4 x i1> splat (i1 true), i32 4)
16+
; CHECK-NEXT: [[TMP5:%.*]] = call <4 x i16> @llvm.masked.gather.v4i16.v4p0(<4 x ptr> [[TMP3]], i32 2, <4 x i1> splat (i1 true), <4 x i16> poison)
17+
; CHECK-NEXT: [[TMP6:%.*]] = call <8 x i16> @llvm.vector.insert.v8i16.v4i16(<8 x i16> poison, <4 x i16> [[TMP4]], i64 0)
18+
; CHECK-NEXT: [[TMP7:%.*]] = call <8 x i16> @llvm.vector.insert.v8i16.v4i16(<8 x i16> [[TMP6]], <4 x i16> [[TMP5]], i64 4)
19+
; CHECK-NEXT: [[TMP8:%.*]] = call i16 @llvm.vector.reduce.umax.v8i16(<8 x i16> [[TMP7]])
20+
; CHECK-NEXT: [[TMP9:%.*]] = call i16 @llvm.umax.i16(i16 [[TMP8]], i16 0)
21+
; CHECK-NEXT: ret i16 [[TMP9]]
22+
;
23+
entry:
24+
%gep.us154 = getelementptr i8, ptr %i, i64 132860
25+
%gep.us154.1 = getelementptr i8, ptr %i, i64 137774
26+
%gep.us154.2 = getelementptr i8, ptr %i, i64 142688
27+
%gep.us154.3 = getelementptr i8, ptr %i, i64 147602
28+
%gep.us154.4 = getelementptr i8, ptr %i, i64 152516
29+
%gep.us154.5 = getelementptr i8, ptr %i, i64 157430
30+
br label %for.cond5.us
31+
32+
for.cond5.us:
33+
%0 = load i16, ptr %gep.us154, align 2
34+
%1 = load i16, ptr %gep.us154.1, align 2
35+
%2 = load i16, ptr %gep.us154.2, align 2
36+
%3 = load i16, ptr %gep.us154.3, align 2
37+
%4 = load i16, ptr %gep.us154.4, align 2
38+
%5 = load i16, ptr %gep.us154.5, align 2
39+
%6 = call i16 @llvm.umax.i16(i16 %5, i16 0)
40+
%7 = call i16 @llvm.umax.i16(i16 %0, i16 %6)
41+
%8 = call i16 @llvm.umax.i16(i16 %1, i16 %7)
42+
%9 = call i16 @llvm.umax.i16(i16 %2, i16 %8)
43+
%10 = call i16 @llvm.umax.i16(i16 %3, i16 %9)
44+
%11 = call i16 @llvm.umax.i16(i16 %2, i16 %10)
45+
%12 = call i16 @llvm.umax.i16(i16 %3, i16 %11)
46+
%13 = call i16 @llvm.umax.i16(i16 %4, i16 %12)
47+
%14 = load i16, ptr %gep.us154, align 2
48+
%15 = call i16 @llvm.umax.i16(i16 %14, i16 %13)
49+
%16 = load i16, ptr %gep.us154.1, align 2
50+
%17 = call i16 @llvm.umax.i16(i16 %16, i16 %15)
51+
%18 = call i16 @llvm.umax.i16(i16 %4, i16 %17)
52+
ret i16 %18
53+
}
54+
55+
declare i16 @llvm.umax.i16(i16, i16) #1

0 commit comments

Comments
 (0)