diff --git a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll
index 641f911129fb..d84e0ca21178 100644
--- a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll
+++ b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -disable-output "-passes=print<scalar-evolution>" 2>&1 | FileCheck %s
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py
+; RUN: opt < %s -disable-output "-passes=print<scalar-evolution>" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s
 
 declare { i16, i1 } @llvm.sadd.with.overflow.i16(i16, i16) nounwind readnone
 declare { i16, i1 } @llvm.uadd.with.overflow.i16(i16, i16) nounwind readnone
@@ -7,9 +8,15 @@ declare { i16, i1 } @llvm.usub.with.overflow.i16(i16, i16) nounwind readnone
 declare { i16, i1 } @llvm.smul.with.overflow.i16(i16, i16) nounwind readnone
 declare { i16, i1 } @llvm.umul.with.overflow.i16(i16, i16) nounwind readnone
 
-; CHECK-LABEL: Classifying expressions for: @uadd_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 35
 define void @uadd_exhaustive() {
+; CHECK-LABEL: 'uadd_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @uadd_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 35
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 35
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 35
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 36
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader
 
@@ -27,9 +34,15 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
-; CHECK-LABEL: Classifying expressions for: @sadd_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 67
 define void @sadd_exhaustive() {
+; CHECK-LABEL: 'sadd_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @sadd_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 67
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 67
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 67
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 68
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader
 
@@ -47,9 +60,15 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
-; CHECK-LABEL: Classifying expressions for: @usub_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 50
 define void @usub_exhaustive() {
+; CHECK-LABEL: 'usub_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @usub_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 50
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 50
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 50
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 51
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader
 
@@ -67,9 +86,15 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
-; CHECK-LABEL: Classifying expressions for: @ssub_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 68
 define void @ssub_exhaustive() {
+; CHECK-LABEL: 'ssub_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @ssub_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 68
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 68
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 68
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 69
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader
 
@@ -87,9 +112,15 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
-; CHECK-LABEL: Classifying expressions for: @smul_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 14
 define void @smul_exhaustive() {
+; CHECK-LABEL: 'smul_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @smul_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 14
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 14
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 14
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 15
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader
 
@@ -107,9 +138,15 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
-; CHECK-LABEL: Classifying expressions for: @umul_exhaustive
-; CHECK: Loop %for.body: backedge-taken count is 15
 define void @umul_exhaustive() {
+; CHECK-LABEL: 'umul_exhaustive'
+; CHECK-NEXT:  Determining loop execution counts for: @umul_exhaustive
+; CHECK-NEXT:  Loop %for.body: backedge-taken count is 15
+; CHECK-NEXT:  Loop %for.body: max backedge-taken count is 15
+; CHECK-NEXT:  Loop %for.body: Predicated backedge-taken count is 15
+; CHECK-NEXT:   Predicates:
+; CHECK:       Loop %for.body: Trip multiple is 16
+;
 entry:
   br i1 undef, label %for.end, label %for.body.preheader