Skip to content

Commit 13b54f7

Browse files
committed
[SLP] Recalculate dependencies for potential control dependencies if cleared
If the control dependecies are cleared after calcellation of the copyables, need to reclculate them unconditionally. Fixes #153754 #153676
1 parent f24d91e commit 13b54f7

File tree

2 files changed

+49
-5
lines changed

2 files changed

+49
-5
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20975,11 +20975,11 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
2097520975
continue;
2097620976
}
2097720977
ScheduledBundles.find(I)->getSecond().pop_back();
20978-
if (!ControlDependentMembers.empty()) {
20979-
ScheduleBundle Invalid = ScheduleBundle::invalid();
20980-
calculateDependencies(Invalid, /*InsertInReadyList=*/false, SLP,
20981-
ControlDependentMembers);
20982-
}
20978+
}
20979+
if (!ControlDependentMembers.empty()) {
20980+
ScheduleBundle Invalid = ScheduleBundle::invalid();
20981+
calculateDependencies(Invalid, /*InsertInReadyList=*/false, SLP,
20982+
ControlDependentMembers);
2098320983
}
2098420984
return std::nullopt;
2098520985
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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 void @test(i32 %e, i32 %0) {
5+
; CHECK-LABEL: define void @test(
6+
; CHECK-SAME: i32 [[E:%.*]], i32 [[TMP0:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*:]]
8+
; CHECK-NEXT: [[H:%.*]] = alloca [4 x i32], align 16
9+
; CHECK-NEXT: [[ADD:%.*]] = add i32 [[TMP0]], [[E]]
10+
; CHECK-NEXT: [[ADD2:%.*]] = add i32 [[ADD]], 1
11+
; CHECK-NEXT: [[ADD4:%.*]] = add i32 [[ADD]], [[ADD2]]
12+
; CHECK-NEXT: store i32 [[ADD4]], ptr [[H]], align 16
13+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT:%.*]] = getelementptr i8, ptr [[H]], i64 4
14+
; CHECK-NEXT: [[ADD5:%.*]] = add i32 [[E]], 1
15+
; CHECK-NEXT: [[ADD6:%.*]] = add i32 [[ADD5]], [[ADD2]]
16+
; CHECK-NEXT: store i32 [[ADD6]], ptr [[ARRAYINIT_ELEMENT]], align 4
17+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT7:%.*]] = getelementptr i8, ptr [[H]], i64 8
18+
; CHECK-NEXT: store i32 [[ADD6]], ptr [[ARRAYINIT_ELEMENT7]], align 8
19+
; CHECK-NEXT: [[ARRAYINIT_ELEMENT10:%.*]] = getelementptr i8, ptr [[H]], i64 12
20+
; CHECK-NEXT: [[CALL12:%.*]] = tail call i32 @fn1(i32 [[ADD]])
21+
; CHECK-NEXT: store i32 [[CALL12]], ptr [[ARRAYINIT_ELEMENT10]], align 4
22+
; CHECK-NEXT: store volatile i32 0, ptr [[H]], align 4
23+
; CHECK-NEXT: ret void
24+
;
25+
entry:
26+
%h = alloca [4 x i32], align 16
27+
%add = add i32 %0, %e
28+
%add2 = add i32 %add, 1
29+
%add4 = add i32 %add, %add2
30+
store i32 %add4, ptr %h, align 16
31+
%arrayinit.element = getelementptr i8, ptr %h, i64 4
32+
%add5 = add i32 %e, 1
33+
%add6 = add i32 %add5, %add2
34+
store i32 %add6, ptr %arrayinit.element, align 4
35+
%arrayinit.element7 = getelementptr i8, ptr %h, i64 8
36+
store i32 %add6, ptr %arrayinit.element7, align 8
37+
%arrayinit.element10 = getelementptr i8, ptr %h, i64 12
38+
%call12 = tail call i32 @fn1(i32 %add)
39+
store i32 %call12, ptr %arrayinit.element10, align 4
40+
store volatile i32 0, ptr %h, align 4
41+
ret void
42+
}
43+
44+
declare i32 @fn1(i32)

0 commit comments

Comments
 (0)