Skip to content

Commit 211d941

Browse files
xortatorxortator
committed
[SCEV] Rename max backedge-taken count -> constant max backedge taken-count in printout
This is a preparatory step for introducing symbolic max backedge-taken count.
1 parent 011b2af commit 211d941

File tree

83 files changed

+571
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+571
-570
lines changed

‎llvm/lib/Analysis/ScalarEvolution.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13369,11 +13369,12 @@ static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
1336913369
OS << ": ";
1337013370

1337113371
if (!isa<SCEVCouldNotCompute>(SE->getConstantMaxBackedgeTakenCount(L))) {
13372-
OS << "max backedge-taken count is " << *SE->getConstantMaxBackedgeTakenCount(L);
13372+
OS << "constant max backedge-taken count is "
13373+
<< *SE->getConstantMaxBackedgeTakenCount(L);
1337313374
if (SE->isBackedgeTakenCountMaxOrZero(L))
1337413375
OS << ", actual taken count either this or zero.";
1337513376
} else {
13376-
OS << "Unpredictable max backedge-taken count. ";
13377+
OS << "Unpredictable constant max backedge-taken count. ";
1337713378
}
1337813379

1337913380
OS << "\n"

‎llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; RUN: opt < %s -disable-output "-passes=print<scalar-evolution>" 2>&1 | FileCheck %s
22

33
; CHECK: Loop %bb: backedge-taken count is ((-5 + %x) /u 3)
4-
; CHECK: Loop %bb: max backedge-taken count is 1431655764
4+
; CHECK: Loop %bb: constant max backedge-taken count is 1431655764
55

66

77
; ScalarEvolution can't compute a trip count because it doesn't know if

‎llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; RUN: opt < %s -disable-output "-passes=print<scalar-evolution>" 2>&1 2>&1 | FileCheck %s
22

33
; CHECK: Loop %bb: backedge-taken count is (((-3 + (-1 * (1 umin (-3 + (-1 * %x) + (1000 umax (3 + %x)))))<nuw><nsw> + (-1 * %x) + (1000 umax (3 + %x))) /u 3) + (1 umin (-3 + (-1 * %x) + (1000 umax (3 + %x)))))
4-
; CHECK: Loop %bb: max backedge-taken count is 334
4+
; CHECK: Loop %bb: constant max backedge-taken count is 334
55

66

77
; This is a tricky testcase for unsigned wrap detection which ScalarEvolution

‎llvm/test/Analysis/ScalarEvolution/add-expr-pointer-operand-sorting.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ define i32 @d(i32 %base) {
4747
; CHECK-NEXT: --> {(1 + %base),+,1}<nw><%for.cond> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %for.cond: Computable }
4848
; CHECK-NEXT: Determining loop execution counts for: @d
4949
; CHECK-NEXT: Loop %for.cond: <multiple exits> Unpredictable backedge-taken count.
50-
; CHECK-NEXT: Loop %for.cond: Unpredictable max backedge-taken count.
50+
; CHECK-NEXT: Loop %for.cond: Unpredictable constant max backedge-taken count.
5151
; CHECK-NEXT: Loop %for.cond: Unpredictable predicated backedge-taken count.
5252
;
5353
entry:

‎llvm/test/Analysis/ScalarEvolution/addrec-computed-during-addrec-calculation.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ define void @test(i32* %p) {
2727
; CHECK-NEXT: --> {{\{}}{%iv,+,1}<nsw><%loop2>,+,1}<%loop3> U: full-set S: full-set --> {%iv,+,1}<nsw><%loop2> U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop.header: Variant, %loop2: Variant, %loop3: Computable }
2828
; CHECK-NEXT: Determining loop execution counts for: @test
2929
; CHECK-NEXT: Loop %loop2: Unpredictable backedge-taken count.
30-
; CHECK-NEXT: Loop %loop2: max backedge-taken count is -1
30+
; CHECK-NEXT: Loop %loop2: constant max backedge-taken count is -1
3131
; CHECK-NEXT: Loop %loop2: Unpredictable predicated backedge-taken count.
3232
; CHECK-NEXT: Loop %loop3: backedge-taken count is false
33-
; CHECK-NEXT: Loop %loop3: max backedge-taken count is false
33+
; CHECK-NEXT: Loop %loop3: constant max backedge-taken count is false
3434
; CHECK-NEXT: Loop %loop3: Predicated backedge-taken count is false
3535
; CHECK-NEXT: Predicates:
3636
; CHECK: Loop %loop3: Trip multiple is 1
3737
; CHECK-NEXT: Loop %loop.header: <multiple exits> Unpredictable backedge-taken count.
38-
; CHECK-NEXT: Loop %loop.header: Unpredictable max backedge-taken count.
38+
; CHECK-NEXT: Loop %loop.header: Unpredictable constant max backedge-taken count.
3939
; CHECK-NEXT: Loop %loop.header: Unpredictable predicated backedge-taken count.
4040
;
4141
entry:

‎llvm/test/Analysis/ScalarEvolution/becount-invalidation.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ define void @test(i64* %arg) {
3030
; CHECK-NEXT: Loop %loop2.header: <multiple exits> Unpredictable backedge-taken count.
3131
; CHECK-NEXT: exit count for loop2.header: ***COULDNOTCOMPUTE***
3232
; CHECK-NEXT: exit count for loop2.latch: false
33-
; CHECK-NEXT: Loop %loop2.header: max backedge-taken count is false
33+
; CHECK-NEXT: Loop %loop2.header: constant max backedge-taken count is false
3434
; CHECK-NEXT: Loop %loop2.header: Unpredictable predicated backedge-taken count.
3535
; CHECK-NEXT: Loop %loop.header: Unpredictable backedge-taken count.
36-
; CHECK-NEXT: Loop %loop.header: Unpredictable max backedge-taken count.
36+
; CHECK-NEXT: Loop %loop.header: Unpredictable constant max backedge-taken count.
3737
; CHECK-NEXT: Loop %loop.header: Unpredictable predicated backedge-taken count.
3838
;
3939
entry:

‎llvm/test/Analysis/ScalarEvolution/cycled_phis.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ define void @test_01() {
1515
; CHECK-NEXT: --> %cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Variant }
1616
; CHECK-NEXT: Determining loop execution counts for: @test_01
1717
; CHECK-NEXT: Loop %loop: Unpredictable backedge-taken count.
18-
; CHECK-NEXT: Loop %loop: Unpredictable max backedge-taken count.
18+
; CHECK-NEXT: Loop %loop: Unpredictable constant max backedge-taken count.
1919
; CHECK-NEXT: Loop %loop: Unpredictable predicated backedge-taken count.
2020
;
2121
entry:
@@ -51,10 +51,10 @@ define void @test_02(i32* %p, i32* %q) {
5151
; CHECK-NEXT: --> %outer_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
5252
; CHECK-NEXT: Determining loop execution counts for: @test_02
5353
; CHECK-NEXT: Loop %inner_loop: Unpredictable backedge-taken count.
54-
; CHECK-NEXT: Loop %inner_loop: Unpredictable max backedge-taken count.
54+
; CHECK-NEXT: Loop %inner_loop: Unpredictable constant max backedge-taken count.
5555
; CHECK-NEXT: Loop %inner_loop: Unpredictable predicated backedge-taken count.
5656
; CHECK-NEXT: Loop %outer_loop: Unpredictable backedge-taken count.
57-
; CHECK-NEXT: Loop %outer_loop: Unpredictable max backedge-taken count.
57+
; CHECK-NEXT: Loop %outer_loop: Unpredictable constant max backedge-taken count.
5858
; CHECK-NEXT: Loop %outer_loop: Unpredictable predicated backedge-taken count.
5959
;
6060
entry:
@@ -102,10 +102,10 @@ define void @test_03(i32* %p, i32* %q) {
102102
; CHECK-NEXT: --> %outer_cond U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %outer_loop: Variant, %inner_loop: Invariant }
103103
; CHECK-NEXT: Determining loop execution counts for: @test_03
104104
; CHECK-NEXT: Loop %inner_loop: Unpredictable backedge-taken count.
105-
; CHECK-NEXT: Loop %inner_loop: Unpredictable max backedge-taken count.
105+
; CHECK-NEXT: Loop %inner_loop: Unpredictable constant max backedge-taken count.
106106
; CHECK-NEXT: Loop %inner_loop: Unpredictable predicated backedge-taken count.
107107
; CHECK-NEXT: Loop %outer_loop: Unpredictable backedge-taken count.
108-
; CHECK-NEXT: Loop %outer_loop: Unpredictable max backedge-taken count.
108+
; CHECK-NEXT: Loop %outer_loop: Unpredictable constant max backedge-taken count.
109109
; CHECK-NEXT: Loop %outer_loop: Unpredictable predicated backedge-taken count.
110110
;
111111
entry:

‎llvm/test/Analysis/ScalarEvolution/exact-exit-count-more-precise.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ define void @test_and(i16 %in) {
1414
; CHECK-NEXT: --> (%_tmp10.i umin %exitcond.i) U: full-set S: full-set Exits: true LoopDispositions: { %bb1.i: Variant, %bb2: Variant }
1515
; CHECK-NEXT: Determining loop execution counts for: @test_and
1616
; CHECK-NEXT: Loop %bb1.i: backedge-taken count is (1 + (-1 * %in))
17-
; CHECK-NEXT: Loop %bb1.i: max backedge-taken count is -1
17+
; CHECK-NEXT: Loop %bb1.i: constant max backedge-taken count is -1
1818
; CHECK-NEXT: Loop %bb1.i: Predicated backedge-taken count is (1 + (-1 * %in))
1919
; CHECK-NEXT: Predicates:
2020
; CHECK: Loop %bb1.i: Trip multiple is 1
2121
; CHECK-NEXT: Loop %bb2: <multiple exits> Unpredictable backedge-taken count.
22-
; CHECK-NEXT: Loop %bb2: Unpredictable max backedge-taken count.
22+
; CHECK-NEXT: Loop %bb2: Unpredictable constant max backedge-taken count.
2323
; CHECK-NEXT: Loop %bb2: Unpredictable predicated backedge-taken count.
2424
;
2525
br label %bb2
@@ -54,7 +54,7 @@ define void @test_or() {
5454
; CHECK-NEXT: --> (%C11 umax %C5) U: full-set S: full-set Exits: false LoopDispositions: { %BB: Variant }
5555
; CHECK-NEXT: Determining loop execution counts for: @test_or
5656
; CHECK-NEXT: Loop %BB: backedge-taken count is undef
57-
; CHECK-NEXT: Loop %BB: max backedge-taken count is -1
57+
; CHECK-NEXT: Loop %BB: constant max backedge-taken count is -1
5858
; CHECK-NEXT: Loop %BB: Predicated backedge-taken count is undef
5959
; CHECK-NEXT: Predicates:
6060
; CHECK: Loop %BB: Trip multiple is 1

‎llvm/test/Analysis/ScalarEvolution/exhaustive-trip-counts.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ target triple = "x86_64-unknown-linux-gnu"
66
define void @f_0() {
77
; CHECK-LABEL: Printing analysis 'Scalar Evolution Analysis' for function 'f_0':
88
; CHECK: Loop %for.body: backedge-taken count is 5
9-
; CHECK: Loop %for.body: max backedge-taken count is 5
9+
; CHECK: Loop %for.body: constant max backedge-taken count is 5
1010
; CHECK: Loop %for.body: Predicated backedge-taken count is 5
1111

1212
entry:

0 commit comments

Comments
 (0)