Skip to content

Commit 23e1e14

Browse files
Dinar Temirbulatovyuxuanchen1997
authored andcommitted
[LoopVectorize] LLVM fails to vectorise loops with multi-bool varables (#89226)
This change allows to consider compare instructions in the loop with multiple use inside the loop and outside. This change allows to vectorise this loop: int foo(float* a, int n) { _Bool any = 0; _Bool all = 1; for (int i = 0; i < n; i++) { if (a[i] < 0.0f) { any = 1; } else { all = 0; } } return all ? 1 : any ? 2 : 3; }
1 parent 65eecb1 commit 23e1e14

File tree

4 files changed

+1779
-37
lines changed

4 files changed

+1779
-37
lines changed

llvm/lib/Analysis/IVDescriptors.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,8 @@ RecurrenceDescriptor::isAnyOfPattern(Loop *Loop, PHINode *OrigPhi,
635635
return InstDesc(Select, Prev.getRecKind());
636636
}
637637

638-
// Only match select with single use cmp condition.
639-
if (!match(I, m_Select(m_OneUse(m_Cmp(Pred, m_Value(), m_Value())), m_Value(),
640-
m_Value())))
638+
if (!match(I,
639+
m_Select(m_Cmp(Pred, m_Value(), m_Value()), m_Value(), m_Value())))
641640
return InstDesc(false, I);
642641

643642
SelectInst *SI = cast<SelectInst>(I);

llvm/test/Transforms/LoopVectorize/AArch64/select-costs.ll

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
; REQUIRES: asserts
2-
; RUN: opt < %s -passes=loop-vectorize -debug-only=loop-vectorize -S 2>&1 | FileCheck %s
2+
; RUN: opt < %s -passes=loop-vectorize -debug-only=loop-vectorize -disable-output -S 2>&1 | FileCheck %s
33

44
target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
55
target triple = "arm64-apple-ios5.0.0"
66

77
define void @selects_1(ptr nocapture %dst, i32 %A, i32 %B, i32 %C, i32 %N) {
8+
; CHECK: LV: Checking a loop in 'selects_1'
89
; CHECK: LV: Found an estimated cost of 1 for VF 2 For instruction: %cond = select i1 %cmp1, i32 10, i32 %and
910
; CHECK: LV: Found an estimated cost of 1 for VF 2 For instruction: %cond6 = select i1 %cmp2, i32 30, i32 %and
1011
; CHECK: LV: Found an estimated cost of 1 for VF 2 For instruction: %cond11 = select i1 %cmp7, i32 %cond, i32 %cond6
1112

1213
; CHECK: LV: Found an estimated cost of 1 for VF 4 For instruction: %cond = select i1 %cmp1, i32 10, i32 %and
1314
; CHECK: LV: Found an estimated cost of 1 for VF 4 For instruction: %cond6 = select i1 %cmp2, i32 30, i32 %and
1415
; CHECK: LV: Found an estimated cost of 1 for VF 4 For instruction: %cond11 = select i1 %cmp7, i32 %cond, i32 %cond6
15-
16-
; CHECK-LABEL: define void @selects_1(
17-
; CHECK: vector.body:
18-
; CHECK: select <4 x i1>
16+
; CHECK: LV: Selecting VF: 4
1917

2018
entry:
2119
%cmp26 = icmp sgt i32 %N, 0
2220
br i1 %cmp26, label %for.body.preheader, label %for.cond.cleanup
2321

2422
for.body.preheader: ; preds = %entry
25-
%wide.trip.count = zext i32 %N to i64
23+
%n = zext i32 %N to i64
2624
br label %for.body
2725

2826
for.body: ; preds = %for.body.preheader, %for.body
@@ -38,7 +36,7 @@ for.body: ; preds = %for.body.preheader,
3836
%cond11 = select i1 %cmp7, i32 %cond, i32 %cond6
3937
store i32 %cond11, ptr %arrayidx, align 4
4038
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
41-
%exitcond.not = icmp eq i64 %indvars.iv.next, %wide.trip.count
39+
%exitcond.not = icmp eq i64 %indvars.iv.next, %n
4240
br i1 %exitcond.not, label %for.cond.cleanup.loopexit, label %for.body
4341

4442
for.cond.cleanup.loopexit: ; preds = %for.body
@@ -47,3 +45,31 @@ for.cond.cleanup.loopexit: ; preds = %for.body
4745
for.cond.cleanup: ; preds = %for.cond.cleanup.loopexit, %entry
4846
ret void
4947
}
48+
49+
define i32 @multi_user_cmp(ptr readonly %a, i64 noundef %n) {
50+
; CHECK: LV: Checking a loop in 'multi_user_cmp'
51+
; CHECK: LV: Found an estimated cost of 4 for VF 16 For instruction: %cmp1 = fcmp olt float %load1, 0.000000e+00
52+
; CHECK: LV: Found an estimated cost of 1 for VF 16 For instruction: %.any.0.off0 = select i1 %cmp1, i1 true, i1 %any.0.off09
53+
; CHECK: LV: Found an estimated cost of 1 for VF 16 For instruction: %all.off = select i1 %cmp1, i1 %all.off.next, i1 false
54+
; CHECK: LV: Selecting VF: 16.
55+
entry:
56+
br label %for.body
57+
58+
for.body:
59+
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
60+
%all.off.next = phi i1 [ true, %entry ], [ %all.off, %for.body ]
61+
%any.0.off09 = phi i1 [ false, %entry ], [ %.any.0.off0, %for.body ]
62+
%arrayidx = getelementptr inbounds float, ptr %a, i64 %indvars.iv
63+
%load1 = load float, ptr %arrayidx, align 4
64+
%cmp1 = fcmp olt float %load1, 0.000000e+00
65+
%.any.0.off0 = select i1 %cmp1, i1 true, i1 %any.0.off09
66+
%all.off = select i1 %cmp1, i1 %all.off.next, i1 false
67+
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
68+
%exitcond.not = icmp eq i64 %indvars.iv.next, %n
69+
br i1 %exitcond.not, label %exit, label %for.body
70+
71+
exit:
72+
%0 = select i1 %.any.0.off0, i32 2, i32 3
73+
%1 = select i1 %all.off, i32 1, i32 %0
74+
ret i32 %1
75+
}

0 commit comments

Comments
 (0)