Skip to content

Commit d57ab27

Browse files
committed
[SLP] Recalculate cleared deps for potential control schedule data nodes
Need to recalculate the dependencies for all potential control data schedule nodes to prevent compiler crash. Fixes #153571
1 parent 177f27d commit d57ab27

File tree

2 files changed

+70
-2
lines changed

2 files changed

+70
-2
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20796,6 +20796,10 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
2079620796
<< BB->getName() << "\n");
2079720797
calculateDependencies(Bundle, /*InsertInReadyList=*/!ReSchedule, SLP,
2079820798
ControlDependentMembers);
20799+
} else if (!ControlDependentMembers.empty()) {
20800+
ScheduleBundle Invalid = ScheduleBundle::invalid();
20801+
calculateDependencies(Invalid, /*InsertInReadyList=*/!ReSchedule, SLP,
20802+
ControlDependentMembers);
2079920803
}
2080020804

2080120805
if (ReSchedule) {
@@ -20891,6 +20895,7 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
2089120895
}
2089220896
}
2089320897
ScheduledBundlesList.pop_back();
20898+
SmallVector<ScheduleData *> ControlDependentMembers;
2089420899
for (Value *V : VL) {
2089520900
if (S.isNonSchedulable(V))
2089620901
continue;
@@ -20930,11 +20935,20 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
2093020935
ScheduleCopyableDataMapByUsers.erase(I);
2093120936
ScheduleCopyableDataMap.erase(KV);
2093220937
// Need to recalculate dependencies for the actual schedule data.
20933-
if (ScheduleData *OpSD = getScheduleData(I))
20938+
if (ScheduleData *OpSD = getScheduleData(I)) {
2093420939
OpSD->clearDirectDependencies();
20940+
if (RegionHasStackSave ||
20941+
!isGuaranteedToTransferExecutionToSuccessor(OpSD->getInst()))
20942+
ControlDependentMembers.push_back(OpSD);
20943+
}
2093520944
continue;
2093620945
}
2093720946
ScheduledBundles.find(I)->getSecond().pop_back();
20947+
if (!ControlDependentMembers.empty()) {
20948+
ScheduleBundle Invalid = ScheduleBundle::invalid();
20949+
calculateDependencies(Invalid, /*InsertInReadyList=*/false, SLP,
20950+
ControlDependentMembers);
20951+
}
2093820952
}
2093920953
return std::nullopt;
2094020954
}
@@ -21304,7 +21318,10 @@ void BoUpSLP::BlockScheduling::calculateDependencies(
2130421318
}
2130521319
};
2130621320

21307-
WorkList.push_back(Bundle.getBundle().front());
21321+
assert((Bundle || !ControlDeps.empty()) &&
21322+
"expected at least one instruction to schedule");
21323+
if (Bundle)
21324+
WorkList.push_back(Bundle.getBundle().front());
2130821325
WorkList.append(ControlDeps.begin(), ControlDeps.end());
2130921326
SmallPtrSet<ScheduleBundle *, 16> Visited;
2131021327
while (!WorkList.empty()) {
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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 < %s | FileCheck %s
3+
4+
define i32 @test(i32 %mul) {
5+
; CHECK-LABEL: define i32 @test(
6+
; CHECK-SAME: i32 [[MUL:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*:]]
8+
; CHECK-NEXT: [[H:%.*]] = alloca [4 x i32], align 16
9+
; CHECK-NEXT: [[ADD:%.*]] = add i32 0, 0
10+
; CHECK-NEXT: [[ADD4:%.*]] = add i32 [[ADD]], 0
11+
; CHECK-NEXT: [[CALL:%.*]] = tail call i32 @f1(i32 [[ADD4]])
12+
; CHECK-NEXT: [[MUL1:%.*]] = shl i32 0, 1
13+
; CHECK-NEXT: [[ADD5:%.*]] = add i32 [[CALL]], [[MUL1]]
14+
; CHECK-NEXT: store i32 [[ADD5]], ptr [[H]], align 16
15+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT:%.*]] = getelementptr i8, ptr [[H]], i64 4
16+
; CHECK-NEXT: [[ADD6:%.*]] = add i32 0, 0
17+
; CHECK-NEXT: [[ADD7:%.*]] = add i32 [[ADD6]], [[MUL]]
18+
; CHECK-NEXT: [[ADD9:%.*]] = add i32 [[ADD7]], [[ADD4]]
19+
; CHECK-NEXT: store i32 [[ADD9]], ptr [[ARRAYINIT_ELEMENT]], align 4
20+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT10:%.*]] = getelementptr i8, ptr [[H]], i64 8
21+
; CHECK-NEXT: [[ADD11:%.*]] = or i32 [[ADD]], 0
22+
; CHECK-NEXT: [[ADD12:%.*]] = add i32 [[ADD11]], [[ADD4]]
23+
; CHECK-NEXT: store i32 [[ADD12]], ptr [[ARRAYINIT_ELEMENT10]], align 8
24+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT13:%.*]] = getelementptr i8, ptr [[H]], i64 12
25+
; CHECK-NEXT: store i32 0, ptr [[ARRAYINIT_ELEMENT13]], align 4
26+
; CHECK-NEXT: ret i32 0
27+
;
28+
entry:
29+
%h = alloca [4 x i32], align 16
30+
%add = add i32 0, 0
31+
%add4 = add i32 %add, 0
32+
%call = tail call i32 @f1(i32 %add4)
33+
%mul1 = shl i32 0, 1
34+
%add5 = add i32 %call, %mul1
35+
store i32 %add5, ptr %h, align 16
36+
%arrayinit.element = getelementptr i8, ptr %h, i64 4
37+
%add6 = add i32 0, 0
38+
%add7 = add i32 %add6, %mul
39+
%add9 = add i32 %add7, %add4
40+
store i32 %add9, ptr %arrayinit.element, align 4
41+
%arrayinit.element10 = getelementptr i8, ptr %h, i64 8
42+
%add11 = or i32 %add, 0
43+
%add12 = add i32 %add11, %add4
44+
store i32 %add12, ptr %arrayinit.element10, align 8
45+
%arrayinit.element13 = getelementptr i8, ptr %h, i64 12
46+
store i32 0, ptr %arrayinit.element13, align 4
47+
ret i32 0
48+
}
49+
50+
declare i32 @f1(i32)
51+

0 commit comments

Comments
 (0)