[SCEV] Extend type hint in analysis output to all backedge kinds

This extends the work from 7755c26 to all of the different backend
taken count kinds that we print for the scev analysis printer.  As
before, the goal is to cut down on confusion as i4 -1 is a very
different (unsigned) value from i32 -1.

Author: preames

llvm/lib/Analysis/ScalarEvolution.cpp

@@ -13469,6 +13469,14 @@ bool ScalarEvolution::hasLoopInvariantBackedgeTakenCount(const Loop *L) {
   return !isa<SCEVCouldNotCompute>(getBackedgeTakenCount(L));
 }
 
+/// When printing a top-level SCEV for trip counts, it's helpful to include
+/// a type for constants which are otherwise hard to disambiguate.
+static void PrintSCEVWithTypeHint(raw_ostream &OS, const SCEV* S) {
+  if (isa<SCEVConstant>(S))
+    OS << *S->getType() << " ";
+  OS << *S;
+}
+
 static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
                           const Loop *L) {
   // Print all inner loops first
@@ -13485,15 +13493,18 @@ static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
     OS << "<multiple exits> ";
 
   auto *BTC = SE->getBackedgeTakenCount(L);
-  if (!isa<SCEVCouldNotCompute>(BTC))
-    OS << "backedge-taken count is " << *BTC << "\n";
-  else
-    OS << "Unpredictable backedge-taken count.\n";
+  if (!isa<SCEVCouldNotCompute>(BTC)) {
+    OS << "backedge-taken count is ";
+    PrintSCEVWithTypeHint(OS, BTC);
+  } else
+    OS << "Unpredictable backedge-taken count.";
+  OS << "\n";
 
   if (ExitingBlocks.size() > 1)
     for (BasicBlock *ExitingBlock : ExitingBlocks) {
-      OS << "  exit count for " << ExitingBlock->getName() << ": "
-         << *SE->getExitCount(L, ExitingBlock) << "\n";
+      OS << "  exit count for " << ExitingBlock->getName() << ": ";
+      PrintSCEVWithTypeHint(OS, SE->getExitCount(L, ExitingBlock));
+      OS << "\n";
     }
 
   OS << "Loop ";
@@ -13502,8 +13513,8 @@ static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
 
   auto *ConstantBTC = SE->getConstantMaxBackedgeTakenCount(L);
   if (!isa<SCEVCouldNotCompute>(ConstantBTC)) {
-    OS << "constant max backedge-taken count is "
-       << *ConstantBTC->getType() << " " << *ConstantBTC;
+    OS << "constant max backedge-taken count is ";
+    PrintSCEVWithTypeHint(OS, ConstantBTC);
     if (SE->isBackedgeTakenCountMaxOrZero(L))
       OS << ", actual taken count either this or zero.";
   } else {
@@ -13517,19 +13528,22 @@ static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
 
   auto *SymbolicBTC = SE->getSymbolicMaxBackedgeTakenCount(L);
   if (!isa<SCEVCouldNotCompute>(SymbolicBTC)) {
-    OS << "symbolic max backedge-taken count is " << *SymbolicBTC;
+    OS << "symbolic max backedge-taken count is ";
+    PrintSCEVWithTypeHint(OS, SymbolicBTC);
     if (SE->isBackedgeTakenCountMaxOrZero(L))
       OS << ", actual taken count either this or zero.";
   } else {
     OS << "Unpredictable symbolic max backedge-taken count. ";
   }
-
   OS << "\n";
+
   if (ExitingBlocks.size() > 1)
     for (BasicBlock *ExitingBlock : ExitingBlocks) {
-      OS << "  symbolic max exit count for " << ExitingBlock->getName() << ": "
-         << *SE->getExitCount(L, ExitingBlock, ScalarEvolution::SymbolicMaximum)
-         << "\n";
+      OS << "  symbolic max exit count for " << ExitingBlock->getName() << ": ";
+      auto *ExitBTC = SE->getExitCount(L, ExitingBlock,
+                                       ScalarEvolution::SymbolicMaximum);
+      PrintSCEVWithTypeHint(OS, ExitBTC);
+      OS << "\n";
     }
 
   SmallVector<const SCEVPredicate *, 4> Preds;
@@ -13538,10 +13552,12 @@ static void PrintLoopInfo(raw_ostream &OS, ScalarEvolution *SE,
     OS << "Loop ";
     L->getHeader()->printAsOperand(OS, /*PrintType=*/false);
     OS << ": ";
-    if (!isa<SCEVCouldNotCompute>(PBT))
-      OS << "Predicated backedge-taken count is " << *PBT << "\n";
-    else
-      OS << "Unpredictable predicated backedge-taken count.\n";
+    if (!isa<SCEVCouldNotCompute>(PBT)) {
+      OS << "Predicated backedge-taken count is ";
+      PrintSCEVWithTypeHint(OS, PBT);
+    } else
+      OS << "Unpredictable predicated backedge-taken count.";
+    OS << "\n";
     OS << " Predicates:\n";
     for (const auto *P : Preds)
       P->print(OS, 4);

llvm/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll

@@ -8,9 +8,9 @@
 define void @loop(i32 %x) {
 ; CHECK-LABEL: 'loop'
 ; CHECK-NEXT:  Determining loop execution counts for: @loop
-; CHECK-NEXT:  Loop %bb: backedge-taken count is 100
+; CHECK-NEXT:  Loop %bb: backedge-taken count is i32 100
 ; CHECK-NEXT:  Loop %bb: constant max backedge-taken count is i32 100
-; CHECK-NEXT:  Loop %bb: symbolic max backedge-taken count is 100
+; CHECK-NEXT:  Loop %bb: symbolic max backedge-taken count is i32 100
 ; CHECK-NEXT:  Loop %bb: Trip multiple is 101
 ;
 entry:

llvm/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll

@@ -6,9 +6,9 @@
 define i32 @f() {
 ; CHECK-LABEL: 'f'
 ; CHECK-NEXT:  Determining loop execution counts for: @f
-; CHECK-NEXT:  Loop %bb5: backedge-taken count is 13
+; CHECK-NEXT:  Loop %bb5: backedge-taken count is i32 13
 ; CHECK-NEXT:  Loop %bb5: constant max backedge-taken count is i32 13
-; CHECK-NEXT:  Loop %bb5: symbolic max backedge-taken count is 13
+; CHECK-NEXT:  Loop %bb5: symbolic max backedge-taken count is i32 13
 ; CHECK-NEXT:  Loop %bb5: Trip multiple is 14
 ;
 entry:

llvm/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll

@@ -6,9 +6,9 @@
 define i32 @func_6() nounwind  {
 ; CHECK-LABEL: 'func_6'
 ; CHECK-NEXT:  Determining loop execution counts for: @func_6
-; CHECK-NEXT:  Loop %bb5: backedge-taken count is 61
+; CHECK-NEXT:  Loop %bb5: backedge-taken count is i8 61
 ; CHECK-NEXT:  Loop %bb5: constant max backedge-taken count is i8 61
-; CHECK-NEXT:  Loop %bb5: symbolic max backedge-taken count is 61
+; CHECK-NEXT:  Loop %bb5: symbolic max backedge-taken count is i8 61
 ; CHECK-NEXT:  Loop %bb5: Trip multiple is 62
 ;
 entry:

llvm/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll

@@ -6,9 +6,9 @@
 define void @fun() {
 ; CHECK-LABEL: 'fun'
 ; CHECK-NEXT:  Determining loop execution counts for: @fun
-; CHECK-NEXT:  Loop %loop: backedge-taken count is 113
+; CHECK-NEXT:  Loop %loop: backedge-taken count is i8 113
 ; CHECK-NEXT:  Loop %loop: constant max backedge-taken count is i8 113
-; CHECK-NEXT:  Loop %loop: symbolic max backedge-taken count is 113
+; CHECK-NEXT:  Loop %loop: symbolic max backedge-taken count is i8 113
 ; CHECK-NEXT:  Loop %loop: Trip multiple is 114
 ;
 entry:

llvm/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll

@@ -5,9 +5,9 @@
 define i32 @foo(i32 %x, i32 %y, ptr %lam, ptr %alp) nounwind {
 ; CHECK-LABEL: 'foo'
 ; CHECK-NEXT:  Determining loop execution counts for: @foo
-; CHECK-NEXT:  Loop %bb1: backedge-taken count is 255
+; CHECK-NEXT:  Loop %bb1: backedge-taken count is i32 255
 ; CHECK-NEXT:  Loop %bb1: constant max backedge-taken count is i32 255
-; CHECK-NEXT:  Loop %bb1: symbolic max backedge-taken count is 255
+; CHECK-NEXT:  Loop %bb1: symbolic max backedge-taken count is i32 255
 ; CHECK-NEXT:  Loop %bb1: Trip multiple is 256
 ;
 bb1.thread:

llvm/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll

@@ -11,9 +11,9 @@ target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:1
 define void @_Z3foov() nounwind {
 ; CHECK-LABEL: '_Z3foov'
 ; CHECK-NEXT:  Determining loop execution counts for: @_Z3foov
-; CHECK-NEXT:  Loop %bb1.i: backedge-taken count is 2
+; CHECK-NEXT:  Loop %bb1.i: backedge-taken count is i64 2
 ; CHECK-NEXT:  Loop %bb1.i: constant max backedge-taken count is i64 2
-; CHECK-NEXT:  Loop %bb1.i: symbolic max backedge-taken count is 2
+; CHECK-NEXT:  Loop %bb1.i: symbolic max backedge-taken count is i64 2
 ; CHECK-NEXT:  Loop %bb1.i: Trip multiple is 3
 ;
 entry:

llvm/test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll

@@ -8,9 +8,9 @@
 define void @test1(i32 %N) {
 ; CHECK-LABEL: 'test1'
 ; CHECK-NEXT:  Determining loop execution counts for: @test1
-; CHECK-NEXT:  Loop %bb3: backedge-taken count is 100
+; CHECK-NEXT:  Loop %bb3: backedge-taken count is i32 100
 ; CHECK-NEXT:  Loop %bb3: constant max backedge-taken count is i32 100
-; CHECK-NEXT:  Loop %bb3: symbolic max backedge-taken count is 100
+; CHECK-NEXT:  Loop %bb3: symbolic max backedge-taken count is i32 100
 ; CHECK-NEXT:  Loop %bb3: Trip multiple is 101
 ;
 entry:

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

@@ -28,10 +28,10 @@ define void @test(ptr %p) {
 ; CHECK-NEXT:  Determining loop execution counts for: @test
 ; CHECK-NEXT:  Loop %loop2: Unpredictable backedge-taken count.
 ; CHECK-NEXT:  Loop %loop2: constant max backedge-taken count is i32 -1
-; CHECK-NEXT:  Loop %loop2: symbolic max backedge-taken count is -1
-; CHECK-NEXT:  Loop %loop3: backedge-taken count is false
+; CHECK-NEXT:  Loop %loop2: symbolic max backedge-taken count is i32 -1
+; CHECK-NEXT:  Loop %loop3: backedge-taken count is i1 false
 ; CHECK-NEXT:  Loop %loop3: constant max backedge-taken count is i1 false
-; CHECK-NEXT:  Loop %loop3: symbolic max backedge-taken count is false
+; CHECK-NEXT:  Loop %loop3: symbolic max backedge-taken count is i1 false
 ; CHECK-NEXT:  Loop %loop3: Trip multiple is 1
 ; CHECK-NEXT:  Loop %loop.header: <multiple exits> Unpredictable backedge-taken count.
 ; CHECK-NEXT:  Loop %loop.header: Unpredictable constant max backedge-taken count.

llvm/test/Analysis/ScalarEvolution/alloca.ll

@@ -43,9 +43,9 @@ define void @alloca_icmp_null_exit_count() {
 ; CHECK-NEXT:    %and = and i1 %cmp1, %cmp2
 ; CHECK-NEXT:    --> (%cmp2 umin %cmp1) U: full-set S: full-set Exits: <<Unknown>> LoopDispositions: { %loop: Variant }
 ; CHECK-NEXT:  Determining loop execution counts for: @alloca_icmp_null_exit_count
-; CHECK-NEXT:  Loop %loop: backedge-taken count is 2
+; CHECK-NEXT:  Loop %loop: backedge-taken count is i64 2
 ; CHECK-NEXT:  Loop %loop: constant max backedge-taken count is i64 2
-; CHECK-NEXT:  Loop %loop: symbolic max backedge-taken count is 2
+; CHECK-NEXT:  Loop %loop: symbolic max backedge-taken count is i64 2
 ; CHECK-NEXT:  Loop %loop: Trip multiple is 3
 ;
 entry: