llvm11/trunk/not-sure-what-is-causing-this.patch

   1 diff --git a/llvm/test/Other/new-pass-manager.ll b/llvm/test/Other/new-pass-manager.ll
   2 index d769319ea1ca..fade460c8d02 100644
   3 --- a/llvm/test/Other/new-pass-manager.ll
   4 +++ b/llvm/test/Other/new-pass-manager.ll
   5 @@ -8,9 +8,9 @@
   6  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
   7  ; RUN:     -passes=no-op-module %s 2>&1 \
   8  ; RUN:     | FileCheck %s --check-prefix=CHECK-MODULE-PASS
   9 -; CHECK-MODULE-PASS: Starting llvm::Module pass manager run
  10 +; CHECK-MODULE-PASS: Starting Module pass manager run
  11  ; CHECK-MODULE-PASS-NEXT: Running pass: NoOpModulePass
  12 -; CHECK-MODULE-PASS-NEXT: Finished llvm::Module pass manager run
  13 +; CHECK-MODULE-PASS-NEXT: Finished Module pass manager run
  14
  15  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
  16  ; RUN:     -passes=no-op-cgscc %s 2>&1 \
  17 @@ -18,7 +18,7 @@
  18  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
  19  ; RUN:     -passes='cgscc(no-op-cgscc)' %s 2>&1 \
  20  ; RUN:     | FileCheck %s --check-prefix=CHECK-CGSCC-PASS
  21 -; CHECK-CGSCC-PASS: Starting llvm::Module pass manager run
  22 +; CHECK-CGSCC-PASS: Starting Module pass manager run
  23  ; CHECK-CGSCC-PASS-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor
  24  ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(CGSCCAnalysisManager|AnalysisManager<.*LazyCallGraph::SCC.*>).*}},{{.*}}Module>
  25  ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(FunctionAnalysisManager|AnalysisManager<.*Function.*>).*}},{{.*}}Module>
  26 @@ -31,7 +31,7 @@
  27  ; CHECK-CGSCC-PASS-NEXT: Starting CGSCC pass manager run
  28  ; CHECK-CGSCC-PASS-NEXT: Running pass: NoOpCGSCCPass
  29  ; CHECK-CGSCC-PASS-NEXT: Finished CGSCC pass manager run
  30 -; CHECK-CGSCC-PASS-NEXT: Finished llvm::Module pass manager run
  31 +; CHECK-CGSCC-PASS-NEXT: Finished Module pass manager run
  32
  33  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
  34  ; RUN:     -passes=no-op-function %s 2>&1 \
  35 @@ -39,58 +39,58 @@
  36  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
  37  ; RUN:     -passes='function(no-op-function)' %s 2>&1 \
  38  ; RUN:     | FileCheck %s --check-prefix=CHECK-FUNCTION-PASS
  39 -; CHECK-FUNCTION-PASS: Starting llvm::Module pass manager run
  40 +; CHECK-FUNCTION-PASS: Starting Module pass manager run
  41  ; CHECK-FUNCTION-PASS-NEXT: Running pass: ModuleToFunctionPassAdaptor
  42  ; CHECK-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
  43  ; CHECK-FUNCTION-PASS-NEXT: Running analysis: PassInstrumentationAnalysis
  44 -; CHECK-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run
  45 +; CHECK-FUNCTION-PASS-NEXT: Starting Function pass manager run
  46  ; CHECK-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass
  47 -; CHECK-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run
  48 -; CHECK-FUNCTION-PASS-NEXT: Finished llvm::Module pass manager run
  49 +; CHECK-FUNCTION-PASS-NEXT: Finished Function pass manager run
  50 +; CHECK-FUNCTION-PASS-NEXT: Finished Module pass manager run
  51
  52  ; RUN: opt -disable-output -debug-pass-manager -passes=print %s 2>&1 \
  53  ; RUN:     | FileCheck %s --check-prefix=CHECK-MODULE-PRINT
  54 -; CHECK-MODULE-PRINT: Starting llvm::Module pass manager run
  55 +; CHECK-MODULE-PRINT: Starting Module pass manager run
  56  ; CHECK-MODULE-PRINT: Running pass: VerifierPass
  57  ; CHECK-MODULE-PRINT: Running pass: PrintModulePass
  58  ; CHECK-MODULE-PRINT: ModuleID
  59  ; CHECK-MODULE-PRINT: define void @foo(i1 %x, i8* %p1, i8* %p2)
  60  ; CHECK-MODULE-PRINT: Running pass: VerifierPass
  61 -; CHECK-MODULE-PRINT: Finished llvm::Module pass manager run
  62 +; CHECK-MODULE-PRINT: Finished Module pass manager run
  63
  64  ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='print,verify' %s 2>&1 \
  65  ; RUN:     | FileCheck %s --check-prefix=CHECK-MODULE-VERIFY
  66 -; CHECK-MODULE-VERIFY: Starting llvm::Module pass manager run
  67 +; CHECK-MODULE-VERIFY: Starting Module pass manager run
  68  ; CHECK-MODULE-VERIFY: Running pass: PrintModulePass
  69  ; CHECK-MODULE-VERIFY: ModuleID
  70  ; CHECK-MODULE-VERIFY: define void @foo(i1 %x, i8* %p1, i8* %p2)
  71  ; CHECK-MODULE-VERIFY: Running pass: VerifierPass
  72 -; CHECK-MODULE-VERIFY: Finished llvm::Module pass manager run
  73 +; CHECK-MODULE-VERIFY: Finished Module pass manager run
  74
  75  ; RUN: opt -disable-output -debug-pass-manager -passes='function(print)' %s 2>&1 \
  76  ; RUN:     | FileCheck %s --check-prefix=CHECK-FUNCTION-PRINT
  77 -; CHECK-FUNCTION-PRINT: Starting llvm::Module pass manager run
  78 +; CHECK-FUNCTION-PRINT: Starting Module pass manager run
  79  ; CHECK-FUNCTION-PRINT: Running pass: VerifierPass
  80  ; CHECK-FUNCTION-PRINT: Running pass: ModuleToFunctionPassAdaptor
  81  ; CHECK-FUNCTION-PRINT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
  82 -; CHECK-FUNCTION-PRINT: Starting llvm::Function pass manager run
  83 +; CHECK-FUNCTION-PRINT: Starting Function pass manager run
  84  ; CHECK-FUNCTION-PRINT: Running pass: PrintFunctionPass
  85  ; CHECK-FUNCTION-PRINT-NOT: ModuleID
  86  ; CHECK-FUNCTION-PRINT: define void @foo(i1 %x, i8* %p1, i8* %p2)
  87 -; CHECK-FUNCTION-PRINT: Finished llvm::Function pass manager run
  88 +; CHECK-FUNCTION-PRINT: Finished Function pass manager run
  89  ; CHECK-FUNCTION-PRINT: Running pass: VerifierPass
  90 -; CHECK-FUNCTION-PRINT: Finished llvm::Module pass manager run
  91 +; CHECK-FUNCTION-PRINT: Finished Module pass manager run
  92
  93  ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='function(print,verify)' %s 2>&1 \
  94  ; RUN:     | FileCheck %s --check-prefix=CHECK-FUNCTION-VERIFY
  95 -; CHECK-FUNCTION-VERIFY: Starting llvm::Module pass manager run
  96 -; CHECK-FUNCTION-VERIFY: Starting llvm::Function pass manager run
  97 +; CHECK-FUNCTION-VERIFY: Starting Module pass manager run
  98 +; CHECK-FUNCTION-VERIFY: Starting Function pass manager run
  99  ; CHECK-FUNCTION-VERIFY: Running pass: PrintFunctionPass
 100  ; CHECK-FUNCTION-VERIFY-NOT: ModuleID
 101  ; CHECK-FUNCTION-VERIFY: define void @foo(i1 %x, i8* %p1, i8* %p2)
 102  ; CHECK-FUNCTION-VERIFY: Running pass: VerifierPass
 103 -; CHECK-FUNCTION-VERIFY: Finished llvm::Function pass manager run
 104 -; CHECK-FUNCTION-VERIFY: Finished llvm::Module pass manager run
 105 +; CHECK-FUNCTION-VERIFY: Finished Function pass manager run
 106 +; CHECK-FUNCTION-VERIFY: Finished Module pass manager run
 107
 108  ; RUN: opt -S -o - -passes='no-op-module,no-op-module' %s \
 109  ; RUN:     | FileCheck %s --check-prefix=CHECK-NOOP
 110 @@ -112,40 +112,40 @@
 111
 112  ; RUN: opt -disable-output -debug-pass-manager -verify-each -passes='no-op-module,function(no-op-function)' %s 2>&1 \
 113  ; RUN:     | FileCheck %s --check-prefix=CHECK-VERIFY-EACH
 114 -; CHECK-VERIFY-EACH: Starting llvm::Module pass manager run
 115 +; CHECK-VERIFY-EACH: Starting Module pass manager run
 116  ; CHECK-VERIFY-EACH: Running pass: VerifierPass
 117  ; CHECK-VERIFY-EACH: Running pass: NoOpModulePass
 118  ; CHECK-VERIFY-EACH: Running pass: VerifierPass
 119 -; CHECK-VERIFY-EACH: Starting llvm::Function pass manager run
 120 +; CHECK-VERIFY-EACH: Starting Function pass manager run
 121  ; CHECK-VERIFY-EACH: Running pass: NoOpFunctionPass
 122  ; CHECK-VERIFY-EACH: Running pass: VerifierPass
 123 -; CHECK-VERIFY-EACH: Finished llvm::Function pass manager run
 124 +; CHECK-VERIFY-EACH: Finished Function pass manager run
 125  ; CHECK-VERIFY-EACH: Running pass: VerifierPass
 126 -; CHECK-VERIFY-EACH: Finished llvm::Module pass manager run
 127 +; CHECK-VERIFY-EACH: Finished Module pass manager run
 128
 129  ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='no-op-module,function(no-op-function)' %s 2>&1 \
 130  ; RUN:     | FileCheck %s --check-prefix=CHECK-NO-VERIFY
 131 -; CHECK-NO-VERIFY: Starting llvm::Module pass manager run
 132 +; CHECK-NO-VERIFY: Starting Module pass manager run
 133  ; CHECK-NO-VERIFY-NOT: VerifierPass
 134  ; CHECK-NO-VERIFY: Running pass: NoOpModulePass
 135  ; CHECK-NO-VERIFY-NOT: VerifierPass
 136 -; CHECK-NO-VERIFY: Starting llvm::Function pass manager run
 137 +; CHECK-NO-VERIFY: Starting Function pass manager run
 138  ; CHECK-NO-VERIFY: Running pass: NoOpFunctionPass
 139  ; CHECK-NO-VERIFY-NOT: VerifierPass
 140 -; CHECK-NO-VERIFY: Finished llvm::Function pass manager run
 141 +; CHECK-NO-VERIFY: Finished Function pass manager run
 142  ; CHECK-NO-VERIFY-NOT: VerifierPass
 143 -; CHECK-NO-VERIFY: Finished llvm::Module pass manager run
 144 +; CHECK-NO-VERIFY: Finished Module pass manager run
 145
 146  ; RUN: opt -disable-output -debug-pass-manager \
 147  ; RUN:     -passes='require<no-op-module>,cgscc(require<no-op-cgscc>,function(require<no-op-function>))' %s 2>&1 \
 148  ; RUN:     | FileCheck %s --check-prefix=CHECK-ANALYSES
 149 -; CHECK-ANALYSES: Starting llvm::Module pass manager run
 150 +; CHECK-ANALYSES: Starting Module pass manager run
 151  ; CHECK-ANALYSES: Running pass: RequireAnalysisPass
 152  ; CHECK-ANALYSES: Running analysis: NoOpModuleAnalysis
 153  ; CHECK-ANALYSES: Starting CGSCC pass manager run
 154  ; CHECK-ANALYSES: Running pass: RequireAnalysisPass
 155  ; CHECK-ANALYSES: Running analysis: NoOpCGSCCAnalysis
 156 -; CHECK-ANALYSES: Starting llvm::Function pass manager run
 157 +; CHECK-ANALYSES: Starting Function pass manager run
 158  ; CHECK-ANALYSES: Running pass: RequireAnalysisPass
 159  ; CHECK-ANALYSES: Running analysis: NoOpFunctionAnalysis
 160
 161 @@ -154,13 +154,13 @@
 162  ; RUN: opt -disable-output -debug-pass-manager \
 163  ; RUN:     -passes='require<no-op-module>,cgscc(require<no-op-cgscc>,function(require<no-op-function>))' %s 2>&1 \
 164  ; RUN:     | FileCheck %s --check-prefix=CHECK-NO-OP-INVALIDATION
 165 -; CHECK-NO-OP-INVALIDATION: Starting llvm::Module pass manager run
 166 +; CHECK-NO-OP-INVALIDATION: Starting Module pass manager run
 167  ; CHECK-NO-OP-INVALIDATION-NOT: Invalidating all non-preserved analyses
 168
 169  ; RUN: opt -disable-output -debug-pass-manager \
 170  ; RUN:     -passes='require<no-op-module>,require<no-op-module>,require<no-op-module>' %s 2>&1 \
 171  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS
 172 -; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 173 +; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting Module pass manager run
 174  ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 175  ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis
 176  ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS-NOT: Running analysis: NoOpModuleAnalysis
 177 @@ -168,7 +168,7 @@
 178  ; RUN: opt -disable-output -debug-pass-manager \
 179  ; RUN:     -passes='require<no-op-module>,invalidate<no-op-module>,require<no-op-module>' %s 2>&1 \
 180  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS
 181 -; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 182 +; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting Module pass manager run
 183  ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 184  ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis
 185  ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Invalidating analysis: NoOpModuleAnalysis
 186 @@ -177,7 +177,7 @@
 187  ; RUN: opt -disable-output -debug-pass-manager \
 188  ; RUN:     -passes='cgscc(require<no-op-cgscc>,require<no-op-cgscc>,require<no-op-cgscc>)' %s 2>&1 \
 189  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS
 190 -; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 191 +; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting Module pass manager run
 192  ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 193  ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis
 194  ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS-NOT: Running analysis: NoOpCGSCCAnalysis
 195 @@ -185,7 +185,7 @@
 196  ; RUN: opt -disable-output -debug-pass-manager \
 197  ; RUN:     -passes='cgscc(require<no-op-cgscc>,invalidate<no-op-cgscc>,require<no-op-cgscc>)' %s 2>&1 \
 198  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS
 199 -; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 200 +; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting Module pass manager run
 201  ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 202  ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis
 203  ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Invalidating analysis: NoOpCGSCCAnalysis
 204 @@ -194,7 +194,7 @@
 205  ; RUN: opt -disable-output -debug-pass-manager \
 206  ; RUN:     -passes='function(require<no-op-function>,require<no-op-function>,require<no-op-function>)' %s 2>&1 \
 207  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS
 208 -; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 209 +; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting Module pass manager run
 210  ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 211  ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis
 212  ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS-NOT: Running analysis: NoOpFunctionAnalysis
 213 @@ -202,7 +202,7 @@
 214  ; RUN: opt -disable-output -debug-pass-manager \
 215  ; RUN:     -passes='function(require<no-op-function>,invalidate<no-op-function>,require<no-op-function>)' %s 2>&1 \
 216  ; RUN:     | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS
 217 -; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting llvm::Module pass manager run
 218 +; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting Module pass manager run
 219  ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass
 220  ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis
 221  ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Invalidating analysis: NoOpFunctionAnalysis
 222 @@ -211,49 +211,49 @@
 223  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 224  ; RUN:     -passes='require<no-op-module>,module(require<no-op-module>,function(require<no-op-function>,invalidate<all>,require<no-op-function>),require<no-op-module>),require<no-op-module>' %s 2>&1 \
 225  ; RUN:     | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL
 226 -; CHECK-INVALIDATE-ALL: Starting llvm::Module pass manager run
 227 +; CHECK-INVALIDATE-ALL: Starting Module pass manager run
 228  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 229  ; CHECK-INVALIDATE-ALL: Running analysis: NoOpModuleAnalysis
 230 -; CHECK-INVALIDATE-ALL: Starting llvm::Module pass manager run
 231 +; CHECK-INVALIDATE-ALL: Starting Module pass manager run
 232  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 233  ; CHECK-INVALIDATE-ALL-NOT: Running analysis: NoOpModuleAnalysis
 234 -; CHECK-INVALIDATE-ALL: Starting llvm::Function pass manager run
 235 +; CHECK-INVALIDATE-ALL: Starting Function pass manager run
 236  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 237  ; CHECK-INVALIDATE-ALL: Running analysis: NoOpFunctionAnalysis
 238  ; CHECK-INVALIDATE-ALL: Running pass: InvalidateAllAnalysesPass
 239  ; CHECK-INVALIDATE-ALL: Invalidating analysis: NoOpFunctionAnalysis
 240  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 241  ; CHECK-INVALIDATE-ALL: Running analysis: NoOpFunctionAnalysis
 242 -; CHECK-INVALIDATE-ALL: Finished llvm::Function pass manager run
 243 +; CHECK-INVALIDATE-ALL: Finished Function pass manager run
 244  ; CHECK-INVALIDATE-ALL: Invalidating analysis: NoOpModuleAnalysis
 245  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 246  ; CHECK-INVALIDATE-ALL: Running analysis: NoOpModuleAnalysis
 247 -; CHECK-INVALIDATE-ALL: Finished llvm::Module pass manager run
 248 +; CHECK-INVALIDATE-ALL: Finished Module pass manager run
 249  ; CHECK-INVALIDATE-ALL-NOT: Invalidating analysis: NoOpModuleAnalysis
 250  ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass
 251  ; CHECK-INVALIDATE-ALL-NOT: Running analysis: NoOpModuleAnalysis
 252 -; CHECK-INVALIDATE-ALL: Finished llvm::Module pass manager run
 253 +; CHECK-INVALIDATE-ALL: Finished Module pass manager run
 254
 255  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 256  ; RUN:     -passes='require<no-op-module>,module(require<no-op-module>,cgscc(require<no-op-cgscc>,function(require<no-op-function>,invalidate<all>,require<no-op-function>),require<no-op-cgscc>),require<no-op-module>),require<no-op-module>' %s 2>&1 \
 257  ; RUN:     | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL-CG
 258 -; CHECK-INVALIDATE-ALL-CG: Starting llvm::Module pass manager run
 259 +; CHECK-INVALIDATE-ALL-CG: Starting Module pass manager run
 260  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 261  ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpModuleAnalysis
 262 -; CHECK-INVALIDATE-ALL-CG: Starting llvm::Module pass manager run
 263 +; CHECK-INVALIDATE-ALL-CG: Starting Module pass manager run
 264  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 265  ; CHECK-INVALIDATE-ALL-CG-NOT: Running analysis: NoOpModuleAnalysis
 266  ; CHECK-INVALIDATE-ALL-CG: Starting CGSCC pass manager run
 267  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 268  ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpCGSCCAnalysis
 269 -; CHECK-INVALIDATE-ALL-CG: Starting llvm::Function pass manager run
 270 +; CHECK-INVALIDATE-ALL-CG: Starting Function pass manager run
 271  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 272  ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpFunctionAnalysis
 273  ; CHECK-INVALIDATE-ALL-CG: Running pass: InvalidateAllAnalysesPass
 274  ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpFunctionAnalysis
 275  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 276  ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpFunctionAnalysis
 277 -; CHECK-INVALIDATE-ALL-CG: Finished llvm::Function pass manager run
 278 +; CHECK-INVALIDATE-ALL-CG: Finished Function pass manager run
 279  ; CHECK-INVALIDATE-ALL-CG-NOT: Running analysis: NoOpFunctionAnalysis
 280  ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpCGSCCAnalysis
 281  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 282 @@ -263,76 +263,76 @@
 283  ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpModuleAnalysis
 284  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 285  ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpModuleAnalysis
 286 -; CHECK-INVALIDATE-ALL-CG: Finished llvm::Module pass manager run
 287 +; CHECK-INVALIDATE-ALL-CG: Finished Module pass manager run
 288  ; CHECK-INVALIDATE-ALL-CG-NOT: Invalidating analysis: NoOpModuleAnalysis
 289  ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass
 290  ; CHECK-INVALIDATE-ALL-CG-NOT: Running analysis: NoOpModuleAnalysis
 291 -; CHECK-INVALIDATE-ALL-CG: Finished llvm::Module pass manager run
 292 +; CHECK-INVALIDATE-ALL-CG: Finished Module pass manager run
 293
 294  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 295  ; RUN:     -passes='require<targetlibinfo>,invalidate<all>,require<targetlibinfo>' \
 296  ; RUN:     | FileCheck %s --check-prefix=CHECK-TLI
 297 -; CHECK-TLI: Starting llvm::Module pass manager run
 298 +; CHECK-TLI: Starting Module pass manager run
 299  ; CHECK-TLI: Running pass: RequireAnalysisPass
 300  ; CHECK-TLI: Running analysis: TargetLibraryAnalysis
 301  ; CHECK-TLI: Running pass: InvalidateAllAnalysesPass
 302  ; CHECK-TLI-NOT: Invalidating analysis: TargetLibraryAnalysis
 303  ; CHECK-TLI: Running pass: RequireAnalysisPass
 304  ; CHECK-TLI-NOT: Running analysis: TargetLibraryAnalysis
 305 -; CHECK-TLI: Finished llvm::Module pass manager run
 306 +; CHECK-TLI: Finished Module pass manager run
 307
 308  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 309  ; RUN:     -passes='require<targetir>,invalidate<all>,require<targetir>' \
 310  ; RUN:     | FileCheck %s --check-prefix=CHECK-TIRA
 311 -; CHECK-TIRA: Starting llvm::Module pass manager run
 312 +; CHECK-TIRA: Starting Module pass manager run
 313  ; CHECK-TIRA: Running pass: RequireAnalysisPass
 314  ; CHECK-TIRA: Running analysis: TargetIRAnalysis
 315  ; CHECK-TIRA: Running pass: InvalidateAllAnalysesPass
 316  ; CHECK-TIRA-NOT: Invalidating analysis: TargetIRAnalysis
 317  ; CHECK-TIRA: Running pass: RequireAnalysisPass
 318  ; CHECK-TIRA-NOT: Running analysis: TargetIRAnalysis
 319 -; CHECK-TIRA: Finished llvm::Module pass manager run
 320 +; CHECK-TIRA: Finished Module pass manager run
 321
 322  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 323  ; RUN:     -passes='require<domtree>' \
 324  ; RUN:     | FileCheck %s --check-prefix=CHECK-DT
 325 -; CHECK-DT: Starting llvm::Module pass manager run
 326 +; CHECK-DT: Starting Module pass manager run
 327  ; CHECK-DT: Running pass: RequireAnalysisPass
 328  ; CHECK-DT: Running analysis: DominatorTreeAnalysis
 329 -; CHECK-DT: Finished llvm::Module pass manager run
 330 +; CHECK-DT: Finished Module pass manager run
 331
 332  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 333  ; RUN:     -passes='require<basic-aa>' \
 334  ; RUN:     | FileCheck %s --check-prefix=CHECK-BASIC-AA
 335 -; CHECK-BASIC-AA: Starting llvm::Module pass manager run
 336 +; CHECK-BASIC-AA: Starting Module pass manager run
 337  ; CHECK-BASIC-AA: Running pass: RequireAnalysisPass
 338  ; CHECK-BASIC-AA: Running analysis: BasicAA
 339 -; CHECK-BASIC-AA: Finished llvm::Module pass manager run
 340 +; CHECK-BASIC-AA: Finished Module pass manager run
 341
 342  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 343  ; RUN:     -passes='require<aa>' -aa-pipeline='basic-aa' \
 344  ; RUN:     | FileCheck %s --check-prefix=CHECK-AA
 345 -; CHECK-AA: Starting llvm::Module pass manager run
 346 +; CHECK-AA: Starting Module pass manager run
 347  ; CHECK-AA: Running pass: RequireAnalysisPass
 348  ; CHECK-AA: Running analysis: AAManager
 349  ; CHECK-AA: Running analysis: BasicAA
 350 -; CHECK-AA: Finished llvm::Module pass manager run
 351 +; CHECK-AA: Finished Module pass manager run
 352
 353  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 354  ; RUN:     -passes='require<aa>' -aa-pipeline='default' \
 355  ; RUN:     | FileCheck %s --check-prefix=CHECK-AA-DEFAULT
 356 -; CHECK-AA-DEFAULT: Starting llvm::Module pass manager run
 357 +; CHECK-AA-DEFAULT: Starting Module pass manager run
 358  ; CHECK-AA-DEFAULT: Running pass: RequireAnalysisPass
 359  ; CHECK-AA-DEFAULT: Running analysis: AAManager
 360  ; CHECK-AA-DEFAULT: Running analysis: BasicAA
 361  ; CHECK-AA-DEFAULT: Running analysis: ScopedNoAliasAA
 362  ; CHECK-AA-DEFAULT: Running analysis: TypeBasedAA
 363 -; CHECK-AA-DEFAULT: Finished llvm::Module pass manager run
 364 +; CHECK-AA-DEFAULT: Finished Module pass manager run
 365
 366  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 367  ; RUN:     -passes='require<aa>,invalidate<domtree>,aa-eval' -aa-pipeline='basic-aa' \
 368  ; RUN:     | FileCheck %s --check-prefix=CHECK-AA-FUNCTION-INVALIDATE
 369 -; CHECK-AA-FUNCTION-INVALIDATE: Starting llvm::Function pass manager run
 370 +; CHECK-AA-FUNCTION-INVALIDATE: Starting Function pass manager run
 371  ; CHECK-AA-FUNCTION-INVALIDATE: Running pass: RequireAnalysisPass
 372  ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: AAManager
 373  ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: BasicAA
 374 @@ -343,69 +343,69 @@
 375  ; CHECK-AA-FUNCTION-INVALIDATE: Running pass: AAEvaluator
 376  ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: AAManager
 377  ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: BasicAA
 378 -; CHECK-AA-FUNCTION-INVALIDATE: Finished llvm::Function pass manager run
 379 +; CHECK-AA-FUNCTION-INVALIDATE: Finished Function pass manager run
 380
 381  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 382  ; RUN:     -passes='require<globals-aa>,function(require<aa>),invalidate<globals-aa>,require<globals-aa>,function(aa-eval)' -aa-pipeline='globals-aa' \
 383  ; RUN:     | FileCheck %s --check-prefix=CHECK-AA-MODULE-INVALIDATE
 384 -; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Module pass manager run
 385 +; CHECK-AA-MODULE-INVALIDATE: Starting Module pass manager run
 386  ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass
 387  ; CHECK-AA-MODULE-INVALIDATE: Running analysis: GlobalsAA
 388 -; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Function pass manager run
 389 +; CHECK-AA-MODULE-INVALIDATE: Starting Function pass manager run
 390  ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass
 391  ; CHECK-AA-MODULE-INVALIDATE: Running analysis: AAManager
 392 -; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run
 393 +; CHECK-AA-MODULE-INVALIDATE: Finished Function pass manager run
 394  ; CHECK-AA-MODULE-INVALIDATE: Running pass: InvalidateAnalysisPass
 395  ; CHECK-AA-MODULE-INVALIDATE: Invalidating analysis: GlobalsAA
 396  ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass
 397  ; CHECK-AA-MODULE-INVALIDATE: Running analysis: GlobalsAA
 398 -; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Function pass manager run
 399 +; CHECK-AA-MODULE-INVALIDATE: Starting Function pass manager run
 400  ; CHECK-AA-MODULE-INVALIDATE: Running pass: AAEvaluator
 401 -; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run
 402 -; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Module pass manager run
 403 +; CHECK-AA-MODULE-INVALIDATE: Finished Function pass manager run
 404 +; CHECK-AA-MODULE-INVALIDATE: Finished Module pass manager run
 405
 406  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 407  ; RUN:     -passes='require<memdep>' \
 408  ; RUN:     | FileCheck %s --check-prefix=CHECK-MEMDEP
 409 -; CHECK-MEMDEP: Starting llvm::Module pass manager run
 410 +; CHECK-MEMDEP: Starting Module pass manager run
 411  ; CHECK-MEMDEP: Running pass: RequireAnalysisPass
 412  ; CHECK-MEMDEP: Running analysis: MemoryDependenceAnalysis
 413 -; CHECK-MEMDEP: Finished llvm::Module pass manager run
 414 +; CHECK-MEMDEP: Finished Module pass manager run
 415
 416  ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
 417  ; RUN:     -passes='require<callgraph>' \
 418  ; RUN:     | FileCheck %s --check-prefix=CHECK-CALLGRAPH
 419 -; CHECK-CALLGRAPH: Starting llvm::Module pass manager run
 420 +; CHECK-CALLGRAPH: Starting Module pass manager run
 421  ; CHECK-CALLGRAPH: Running pass: RequireAnalysisPass
 422  ; CHECK-CALLGRAPH: Running analysis: CallGraphAnalysis
 423 -; CHECK-CALLGRAPH: Finished llvm::Module pass manager run
 424 +; CHECK-CALLGRAPH: Finished Module pass manager run
 425
 426  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 427  ; RUN:     -passes='default<O0>' %s 2>&1 \
 428  ; RUN:     | FileCheck %s --check-prefix=CHECK-O0
 429 -; CHECK-O0: Starting llvm::Module pass manager run
 430 -; CHECK-O0-NEXT: Finished llvm::Module pass manager run
 431 +; CHECK-O0: Starting Module pass manager run
 432 +; CHECK-O0-NEXT: Finished Module pass manager run
 433
 434  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 435  ; RUN:     -passes='repeat<3>(no-op-module)' %s 2>&1 \
 436  ; RUN:     | FileCheck %s --check-prefix=CHECK-REPEAT-MODULE-PASS
 437 -; CHECK-REPEAT-MODULE-PASS: Starting llvm::Module pass manager run
 438 +; CHECK-REPEAT-MODULE-PASS: Starting Module pass manager run
 439  ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: RepeatedPass
 440 -; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run
 441 +; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run
 442  ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass
 443 -; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run
 444 -; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run
 445 +; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run
 446 +; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run
 447  ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass
 448 -; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run
 449 -; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run
 450 +; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run
 451 +; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run
 452  ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass
 453 -; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run
 454 -; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run
 455 +; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run
 456 +; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run
 457
 458  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 459  ; RUN:     -passes='cgscc(repeat<3>(no-op-cgscc))' %s 2>&1 \
 460  ; RUN:     | FileCheck %s --check-prefix=CHECK-REPEAT-CGSCC-PASS
 461 -; CHECK-REPEAT-CGSCC-PASS: Starting llvm::Module pass manager run
 462 +; CHECK-REPEAT-CGSCC-PASS: Starting Module pass manager run
 463  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor
 464  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(CGSCCAnalysisManager|AnalysisManager<.*LazyCallGraph::SCC.*>).*}},{{.*}}Module>
 465  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(FunctionAnalysisManager|AnalysisManager<.*Function.*>).*}},{{.*}}Module>
 466 @@ -427,46 +427,46 @@
 467  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running pass: NoOpCGSCCPass
 468  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished CGSCC pass manager run
 469  ; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished CGSCC pass manager run
 470 -; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished llvm::Module pass manager run
 471 +; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished Module pass manager run
 472
 473  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 474  ; RUN:     -passes='function(repeat<3>(no-op-function))' %s 2>&1 \
 475  ; RUN:     | FileCheck %s --check-prefix=CHECK-REPEAT-FUNCTION-PASS
 476 -; CHECK-REPEAT-FUNCTION-PASS: Starting llvm::Module pass manager run
 477 +; CHECK-REPEAT-FUNCTION-PASS: Starting Module pass manager run
 478  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: ModuleToFunctionPassAdaptor
 479  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
 480  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running analysis: PassInstrumentationAnalysis
 481 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run
 482 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run
 483  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: RepeatedPass
 484 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run
 485 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run
 486  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass
 487 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run
 488 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run
 489 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run
 490 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run
 491  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass
 492 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run
 493 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run
 494 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run
 495 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run
 496  ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass
 497 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run
 498 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run
 499 -; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Module pass manager run
 500 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run
 501 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run
 502 +; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Module pass manager run
 503
 504  ; RUN: opt -disable-output -disable-verify -debug-pass-manager \
 505  ; RUN:     -passes='loop(repeat<3>(no-op-loop))' %s 2>&1 \
 506  ; RUN:     | FileCheck %s --check-prefix=CHECK-REPEAT-LOOP-PASS
 507 -; CHECK-REPEAT-LOOP-PASS: Starting llvm::Module pass manager run
 508 +; CHECK-REPEAT-LOOP-PASS: Starting Module pass manager run
 509  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: ModuleToFunctionPassAdaptor
 510  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>
 511  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: PassInstrumentationAnalysis
 512 -; CHECK-REPEAT-LOOP-PASS-NEXT: Starting llvm::Function pass manager run
 513 +; CHECK-REPEAT-LOOP-PASS-NEXT: Starting Function pass manager run
 514  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: FunctionToLoopPassAdaptor
 515 -; CHECK-REPEAT-LOOP-PASS-NEXT: Starting llvm::Function pass manager run
 516 +; CHECK-REPEAT-LOOP-PASS-NEXT: Starting Function pass manager run
 517  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: LoopSimplify
 518  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: LoopAnalysis
 519  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: DominatorTreeAnalysis
 520  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: AssumptionAnalysis
 521  ; CHECK-REPEAT-LOOP-PASS-NEXT: Invalidating all non-preserved analyses
 522  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: LCSSAPass
 523 -; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Function pass manager run
 524 +; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Function pass manager run
 525  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: AAManager
 526  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: TargetLibraryAnalysis
 527  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: ScalarEvolutionAnalysis
 528 @@ -485,9 +485,9 @@
 529  ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: NoOpLoopPass
 530  ; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Loop pass manager run
 531  ; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Loop pass manager run
 532 -; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Function pass manager run
 533 +; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Function pass manager run
 534  ; CHECK-REPEAT-LOOP-PASS-NEXT: Invalidating all non-preserved analyses
 535 -; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Module pass manager run
 536 +; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Module pass manager run
 537
 538  define void @foo(i1 %x, i8* %p1, i8* %p2) {
 539  entry:
 540 diff --git a/llvm/test/Other/new-pm-defaults.ll b/llvm/test/Other/new-pm-defaults.ll
 541 index 56679e6a8e43..5c7d98e88e85 100644
 542 --- a/llvm/test/Other/new-pm-defaults.ll
 543 +++ b/llvm/test/Other/new-pm-defaults.ll
 544 @@ -89,20 +89,20 @@
 545  ; RUN:     --check-prefix=CHECK-EP-OPTIMIZER-LAST --check-prefix=CHECK-O23SZ
 546
 547  ; CHECK-O: Running analysis: PassInstrumentationAnalysis
 548 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 549 +; CHECK-O-NEXT: Starting Module pass manager run.
 550  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 551 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 552 +; CHECK-O-NEXT: Starting Module pass manager run.
 553  ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass
 554  ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass
 555  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 556 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 557 +; CHECK-O-NEXT: Starting Module pass manager run.
 558  ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass
 559  ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy
 560  ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis
 561  ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis
 562  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 563  ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis
 564 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 565 +; CHECK-O-NEXT: Starting Function pass manager run.
 566  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 567  ; CHECK-O-NEXT: Running analysis: TargetIRAnalysis
 568  ; CHECK-O-NEXT: Running analysis: AssumptionAnalysis
 569 @@ -112,24 +112,24 @@
 570  ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis
 571  ; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
 572  ; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
 573 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 574 +; CHECK-O-NEXT: Finished Function pass manager run.
 575  ; CHECK-O-NEXT: Running pass: IPSCCPPass
 576  ; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
 577  ; CHECK-O-NEXT: Running pass: GlobalOptPass
 578  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PromotePass>
 579  ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass
 580  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 581 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 582 +; CHECK-O-NEXT: Starting Function pass manager run.
 583  ; CHECK-O-NEXT: Running pass: InstCombinePass
 584  ; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
 585  ; CHECK-O-NEXT: Running analysis: AAManager
 586  ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
 587  ; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass
 588  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 589 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 590 +; CHECK-O-NEXT: Finished Function pass manager run.
 591  ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass
 592  ; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis
 593 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 594 +; CHECK-O-NEXT: Starting Module pass manager run.
 595  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
 596  ; CHECK-O-NEXT: Running analysis: GlobalsAA
 597  ; CHECK-O-NEXT: Running analysis: CallGraphAnalysis
 598 @@ -148,7 +148,7 @@
 599  ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo)
 600  ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo)
 601  ; CHECK-O-NEXT: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 602 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 603 +; CHECK-O-NEXT: Starting Function pass manager run.
 604  ; CHECK-O-NEXT: Running pass: SROA
 605  ; CHECK-O-NEXT: Running pass: EarlyCSEPass
 606  ; CHECK-O-NEXT: Running analysis: MemorySSAAnalysis
 607 @@ -168,11 +168,11 @@
 608  ; CHECK-O-NEXT: Running pass: ReassociatePass
 609  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
 610  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}>
 611 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 612 +; CHECK-O-NEXT: Starting Function pass manager run.
 613  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 614  ; CHECK-O-NEXT: Running analysis: LoopAnalysis
 615  ; CHECK-O-NEXT: Running pass: LCSSAPass
 616 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 617 +; CHECK-O-NEXT: Finished Function pass manager run.
 618  ; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis
 619  ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy
 620  ; CHECK-O-NEXT: Starting Loop pass manager run.
 621 @@ -186,10 +186,10 @@
 622  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 623  ; CHECK-O-NEXT: Running pass: InstCombinePass
 624  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}>
 625 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 626 +; CHECK-O-NEXT: Starting Function pass manager run.
 627  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 628  ; CHECK-O-NEXT: Running pass: LCSSAPass
 629 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 630 +; CHECK-O-NEXT: Finished Function pass manager run.
 631  ; CHECK-O-NEXT: Starting Loop pass manager run.
 632  ; CHECK-O-NEXT: Running pass: IndVarSimplifyPass
 633  ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass
 634 @@ -215,39 +215,39 @@
 635  ; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
 636  ; CHECK-O23SZ-NEXT: Running pass: DSEPass
 637  ; CHECK-O23SZ-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass{{.*}}>
 638 -; CHECK-O23SZ-NEXT: Starting llvm::Function pass manager run.
 639 +; CHECK-O23SZ-NEXT: Starting Function pass manager run.
 640  ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass
 641  ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass
 642 -; CHECK-O23SZ-NEXT: Finished llvm::Function pass manager run.
 643 +; CHECK-O23SZ-NEXT: Finished Function pass manager run.
 644  ; CHECK-EP-SCALAR-LATE-NEXT: Running pass: NoOpFunctionPass
 645  ; CHECK-O-NEXT: Running pass: ADCEPass
 646  ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis
 647  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 648  ; CHECK-O-NEXT: Running pass: InstCombinePass
 649  ; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass
 650 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 651 +; CHECK-O-NEXT: Finished Function pass manager run.
 652  ; CHECK-EP-CGSCC-LATE-NEXT: Running pass: NoOpCGSCCPass
 653  ; CHECK-O-NEXT: Finished CGSCC pass manager run.
 654 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 655 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 656 +; CHECK-O-NEXT: Finished Module pass manager run.
 657 +; CHECK-O-NEXT: Finished Module pass manager run.
 658  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 659 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 660 +; CHECK-O-NEXT: Starting Module pass manager run.
 661  ; CHECK-O-NEXT: Running pass: GlobalOptPass
 662  ; CHECK-O-NEXT: Running pass: GlobalDCEPass
 663  ; CHECK-O2-LTO-NOT: Running pass: EliminateAvailableExternallyPass
 664  ; CHECK-O: Running pass: ReversePostOrderFunctionAttrsPass
 665  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
 666  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 667 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 668 +; CHECK-O-NEXT: Starting Function pass manager run.
 669  ; CHECK-O-NEXT: Running pass: Float2IntPass
 670  ; CHECK-O-NEXT: Running pass: LowerConstantIntrinsicsPass on foo
 671  ; CHECK-EP-VECTORIZER-START-NEXT: Running pass: NoOpFunctionPass
 672  ; CHECK-EXT: Running pass: {{.*}}::Bye on foo
 673  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopRotatePass
 674 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 675 +; CHECK-O-NEXT: Starting Function pass manager run.
 676  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 677  ; CHECK-O-NEXT: Running pass: LCSSAPass
 678 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 679 +; CHECK-O-NEXT: Finished Function pass manager run.
 680  ; CHECK-O-NEXT: Running pass: LoopDistributePass
 681  ; CHECK-O-NEXT: Running pass: InjectTLIMappings
 682  ; CHECK-O-NEXT: Running pass: LoopVectorizePass
 683 @@ -267,10 +267,10 @@
 684  ; CHECK-O-NEXT: Running pass: InstCombinePass
 685  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
 686  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass
 687 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 688 +; CHECK-O-NEXT: Starting Function pass manager run.
 689  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 690  ; CHECK-O-NEXT: Running pass: LCSSAPass
 691 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 692 +; CHECK-O-NEXT: Finished Function pass manager run.
 693  ; CHECK-O-NEXT: Running pass: AlignmentFromAssumptionsPass
 694  ; CHECK-O-NEXT: Running pass: LoopSinkPass
 695  ; CHECK-O-NEXT: Running pass: InstSimplifyPass
 696 @@ -278,12 +278,12 @@
 697  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 698  ; CHECK-O-NEXT: Running pass: SpeculateAroundPHIsPass
 699  ; CHECK-EP-OPTIMIZER-LAST: Running pass: NoOpFunctionPass
 700 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 701 +; CHECK-O-NEXT: Finished Function pass manager run.
 702  ; CHECK-O-NEXT: Running pass: CGProfilePass
 703  ; CHECK-O-NEXT: Running pass: GlobalDCEPass
 704  ; CHECK-O-NEXT: Running pass: ConstantMergePass
 705 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 706 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 707 +; CHECK-O-NEXT: Finished Module pass manager run.
 708 +; CHECK-O-NEXT: Finished Module pass manager run.
 709  ; CHECK-O-NEXT: Running pass: PrintModulePass
 710  ;
 711  ; Make sure we get the IR back out without changes when we print the module.
 712 @@ -300,7 +300,7 @@
 713  ; CHECK-O-NEXT:   ret void
 714  ; CHECK-O-NEXT: }
 715  ;
 716 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 717 +; CHECK-O-NEXT: Finished Module pass manager run.
 718
 719  declare void @bar() local_unnamed_addr
 720
 721 diff --git a/llvm/test/Other/new-pm-lto-defaults.ll b/llvm/test/Other/new-pm-lto-defaults.ll
 722 index 0283bc8d0a10..b0a4ae91641c 100644
 723 --- a/llvm/test/Other/new-pm-lto-defaults.ll
 724 +++ b/llvm/test/Other/new-pm-lto-defaults.ll
 725 @@ -24,9 +24,9 @@
 726  ; RUN:     --check-prefix=CHECK-O3 --check-prefix=CHECK-EP-Peephole
 727
 728  ; CHECK-O: Running analysis: PassInstrumentationAnalysis
 729 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 730 +; CHECK-O-NEXT: Starting Module pass manager run.
 731  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module
 732 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 733 +; CHECK-O-NEXT: Starting Module pass manager run.
 734  ; CHECK-O-NEXT: Running pass: GlobalDCEPass
 735  ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass
 736  ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass
 737 @@ -36,12 +36,12 @@
 738  ; CHECK-O1-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PostOrderFunctionAttrsPass>
 739  ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 740  ; CHECK-O2-NEXT: Running analysis: PassInstrumentationAnalysis
 741 -; CHECK-O2-NEXT: Starting llvm::Function pass manager run.
 742 +; CHECK-O2-NEXT: Starting Function pass manager run.
 743  ; CHECK-O2-NEXT: Running pass: CallSiteSplittingPass on foo
 744  ; CHECK-O2-NEXT: Running analysis: TargetLibraryAnalysis on foo
 745  ; CHECK-O2-NEXT: Running analysis: TargetIRAnalysis on foo
 746  ; CHECK-O2-NEXT: Running analysis: DominatorTreeAnalysis on foo
 747 -; CHECK-O2-NEXT: Finished llvm::Function pass manager run.
 748 +; CHECK-O2-NEXT: Finished Function pass manager run.
 749  ; CHECK-O2-NEXT: PGOIndirectCallPromotion
 750  ; CHECK-O2-NEXT: Running analysis: ProfileSummaryAnalysis
 751  ; CHECK-O2-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
 752 @@ -67,31 +67,31 @@
 753  ; CHECK-O2-NEXT: Running pass: ConstantMergePass
 754  ; CHECK-O2-NEXT: Running pass: DeadArgumentEliminationPass
 755  ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 756 -; CHECK-O2-NEXT: Starting llvm::Function pass manager run.
 757 +; CHECK-O2-NEXT: Starting Function pass manager run.
 758  ; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass
 759  ; CHECK-O2-NEXT: Running pass: InstCombinePass
 760  ; CHECK-O2-NEXT: Running analysis: OuterAnalysisManagerProxy
 761  ; CHECK-EP-Peephole-NEXT: Running pass: NoOpFunctionPass
 762 -; CHECK-O2-NEXT: Finished llvm::Function pass manager run.
 763 +; CHECK-O2-NEXT: Finished Function pass manager run.
 764  ; CHECK-O2-NEXT: Running pass: ModuleInlinerWrapperPass
 765  ; CHECK-O2-NEXT: Running analysis: InlineAdvisorAnalysis
 766 -; CHECK-O2-NEXT: Starting llvm::Module pass manager run.
 767 +; CHECK-O2-NEXT: Starting Module pass manager run.
 768  ; CHECK-O2-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PassManager{{.*}}>
 769  ; CHECK-O2-NEXT: Starting CGSCC pass manager run.
 770  ; CHECK-O2-NEXT: Running pass: InlinerPass
 771  ; CHECK-O2-NEXT: Finished CGSCC pass manager run.
 772 -; CHECK-O2-NEXT: Finished llvm::Module pass manager run.
 773 +; CHECK-O2-NEXT: Finished Module pass manager run.
 774  ; CHECK-O2-NEXT: Running pass: GlobalOptPass
 775  ; CHECK-O2-NEXT: Running pass: GlobalDCEPass
 776  ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 777 -; CHECK-O2-NEXT: Starting llvm::Function pass manager run.
 778 +; CHECK-O2-NEXT: Starting Function pass manager run.
 779  ; CHECK-O2-NEXT: Running pass: InstCombinePass
 780  ; CHECK-EP-Peephole-NEXT: Running pass: NoOpFunctionPass
 781  ; CHECK-O2-NEXT: Running pass: JumpThreadingPass
 782  ; CHECK-O2-NEXT: Running analysis: LazyValueAnalysis
 783  ; CHECK-O2-NEXT: Running pass: SROA on foo
 784  ; CHECK-O2-NEXT: Running pass: TailCallElimPass on foo
 785 -; CHECK-O2-NEXT: Finished llvm::Function pass manager run.
 786 +; CHECK-O2-NEXT: Finished Function pass manager run.
 787  ; CHECK-O2-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PostOrderFunctionAttrsPass>
 788  ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 789  ; CHECK-O2-NEXT: Running analysis: MemoryDependenceAnalysis
 790 @@ -103,7 +103,7 @@
 791  ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}SimplifyCFGPass>
 792  ; CHECK-O2-NEXT: Running pass: EliminateAvailableExternallyPass
 793  ; CHECK-O2-NEXT: Running pass: GlobalDCEPass
 794 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 795 +; CHECK-O-NEXT: Finished Module pass manager run.
 796  ; CHECK-O-NEXT: Running pass: PrintModulePass
 797
 798  ; Make sure we get the IR back out without changes when we print the module.
 799 @@ -120,7 +120,7 @@
 800  ; CHECK-O-NEXT:   ret void
 801  ; CHECK-O-NEXT: }
 802  ;
 803 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 804 +; CHECK-O-NEXT: Finished Module pass manager run.
 805
 806  declare void @bar() local_unnamed_addr
 807
 808 diff --git a/llvm/test/Other/new-pm-thinlto-defaults.ll b/llvm/test/Other/new-pm-thinlto-defaults.ll
 809 index 78f9022c741d..d041e3a26040 100644
 810 --- a/llvm/test/Other/new-pm-thinlto-defaults.ll
 811 +++ b/llvm/test/Other/new-pm-thinlto-defaults.ll
 812 @@ -48,15 +48,15 @@
 813  ; RUN:     | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,CHECK-POSTLINK-O,%llvmcheckext,CHECK-POSTLINK-O2
 814  ;
 815  ; CHECK-O: Running analysis: PassInstrumentationAnalysis
 816 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 817 +; CHECK-O-NEXT: Starting Module pass manager run.
 818  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 819 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 820 +; CHECK-O-NEXT: Starting Module pass manager run.
 821  ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass
 822  ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass
 823  ; CHECK-DIS-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}AddDiscriminatorsPass{{.*}}>
 824  ; CHECK-DIS-NEXT: Running analysis: InnerAnalysisManagerProxy
 825  ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 826 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 827 +; CHECK-O-NEXT: Starting Module pass manager run.
 828  ; CHECK-POSTLINK-O-NEXT: Running pass: PGOIndirectCallPromotion
 829  ; CHECK-POSTLINK-O-NEXT: Running analysis: ProfileSummaryAnalysis
 830  ; CHECK-POSTLINK-O-NEXT: Running analysis: InnerAnalysisManagerProxy
 831 @@ -68,7 +68,7 @@
 832  ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis
 833  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 834  ; CHECK-PRELINK-O-NEXT: Running analysis: PassInstrumentationAnalysis
 835 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 836 +; CHECK-O-NEXT: Starting Function pass manager run.
 837  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 838  ; CHECK-O-NEXT: Running analysis: TargetIRAnalysis
 839  ; CHECK-O-NEXT: Running analysis: AssumptionAnalysis
 840 @@ -78,7 +78,7 @@
 841  ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis
 842  ; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
 843  ; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
 844 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 845 +; CHECK-O-NEXT: Finished Function pass manager run.
 846  ; CHECK-POSTLINK-O-NEXT: Running pass: LowerTypeTestsPass
 847  ; CHECK-O-NEXT: Running pass: IPSCCPPass
 848  ; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
 849 @@ -86,16 +86,16 @@
 850  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PromotePass>
 851  ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass
 852  ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 853 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 854 +; CHECK-O-NEXT: Starting Function pass manager run.
 855  ; CHECK-O-NEXT: Running pass: InstCombinePass
 856  ; CHECK-PRELINK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
 857  ; CHECK-O-NEXT: Running analysis: AAManager
 858  ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
 859  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 860 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 861 +; CHECK-O-NEXT: Finished Function pass manager run.
 862  ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass
 863  ; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis
 864 -; CHECK-O-NEXT: Starting llvm::Module pass manager run.
 865 +; CHECK-O-NEXT: Starting Module pass manager run.
 866  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
 867  ; CHECK-O-NEXT: Running analysis: GlobalsAA
 868  ; CHECK-O-NEXT: Running analysis: CallGraphAnalysis
 869 @@ -114,7 +114,7 @@
 870  ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo)
 871  ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo)
 872  ; CHECK-O-NEXT: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 873 -; CHECK-O-NEXT: Starting llvm::Function pass manager run.
 874 +; CHECK-O-NEXT: Starting Function pass manager run.
 875  ; CHECK-O-NEXT: Running pass: SROA
 876  ; CHECK-O-NEXT: Running pass: EarlyCSEPass
 877  ; CHECK-O-NEXT: Running analysis: MemorySSAAnalysis
 878 @@ -133,11 +133,11 @@
 879  ; CHECK-O-NEXT: Running pass: ReassociatePass
 880  ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
 881  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}>
 882 -; CHECK-O-NEXT: Starting llvm::Function pass manager run
 883 +; CHECK-O-NEXT: Starting Function pass manager run
 884  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 885  ; CHECK-O-NEXT: Running analysis: LoopAnalysis
 886  ; CHECK-O-NEXT: Running pass: LCSSAPass
 887 -; CHECK-O-NEXT: Finished llvm::Function pass manager run
 888 +; CHECK-O-NEXT: Finished Function pass manager run
 889  ; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis
 890  ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy
 891  ; CHECK-O-NEXT: Starting Loop pass manager run.
 892 @@ -151,10 +151,10 @@
 893  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 894  ; CHECK-O-NEXT: Running pass: InstCombinePass
 895  ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}>
 896 -; CHECK-O-NEXT: Starting llvm::Function pass manager run
 897 +; CHECK-O-NEXT: Starting Function pass manager run
 898  ; CHECK-O-NEXT: Running pass: LoopSimplifyPass
 899  ; CHECK-O-NEXT: Running pass: LCSSAPass
 900 -; CHECK-O-NEXT: Finished llvm::Function pass manager run
 901 +; CHECK-O-NEXT: Finished Function pass manager run
 902  ; CHECK-O-NEXT: Starting Loop pass manager run.
 903  ; CHECK-O-NEXT: Running pass: IndVarSimplifyPass
 904  ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass
 905 @@ -189,36 +189,36 @@
 906  ; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
 907  ; CHECK-O23SZ-NEXT: Running pass: DSEPass
 908  ; CHECK-O23SZ-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass{{.*}}>
 909 -; CHECK-O23SZ-NEXT: Starting llvm::Function pass manager run
 910 +; CHECK-O23SZ-NEXT: Starting Function pass manager run
 911  ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass
 912  ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass
 913 -; CHECK-O23SZ-NEXT: Finished llvm::Function pass manager run
 914 +; CHECK-O23SZ-NEXT: Finished Function pass manager run
 915  ; CHECK-O-NEXT: Running pass: ADCEPass
 916  ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis
 917  ; CHECK-O-NEXT: Running pass: SimplifyCFGPass
 918  ; CHECK-O-NEXT: Running pass: InstCombinePass
 919 -; CHECK-O-NEXT: Finished llvm::Function pass manager run.
 920 +; CHECK-O-NEXT: Finished Function pass manager run.
 921  ; CHECK-O-NEXT: Finished CGSCC pass manager run.
 922 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 923 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 924 +; CHECK-O-NEXT: Finished Module pass manager run.
 925 +; CHECK-O-NEXT: Finished Module pass manager run.
 926  ; CHECK-PRELINK-O-NEXT: Running pass: GlobalOptPass
 927  ; CHECK-POSTLINK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}>
 928 -; CHECK-POSTLINK-O-NEXT: Starting llvm::Module pass manager run.
 929 +; CHECK-POSTLINK-O-NEXT: Starting Module pass manager run.
 930  ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalOptPass
 931  ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalDCEPass
 932  ; CHECK-POSTLINK-O-NEXT: Running pass: EliminateAvailableExternallyPass
 933  ; CHECK-POSTLINK-O-NEXT: Running pass: ReversePostOrderFunctionAttrsPass
 934  ; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
 935  ; CHECK-POSTLINK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}>
 936 -; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run.
 937 +; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run.
 938  ; CHECK-POSTLINK-O-NEXT: Running pass: Float2IntPass
 939  ; CHECK-POSTLINK-O-NEXT: Running pass: LowerConstantIntrinsicsPass
 940  ; CHECK-EXT: Running pass: {{.*}}::Bye
 941  ; CHECK-POSTLINK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopRotatePass
 942 -; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run
 943 +; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run
 944  ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSimplifyPass
 945  ; CHECK-POSTLINK-O-NEXT: Running pass: LCSSAPass
 946 -; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run
 947 +; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run
 948  ; CHECK-POSTLINK-O-NEXT: Running pass: LoopDistributePass
 949  ; CHECK-POSTLINK-O-NEXT: Running pass: InjectTLIMappings
 950  ; CHECK-POSTLINK-O-NEXT: Running pass: LoopVectorizePass
 951 @@ -238,22 +238,22 @@
 952  ; CHECK-POSTLINK-O-NEXT: Running pass: InstCombinePass
 953  ; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
 954  ; CHECK-POSTLINK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass
 955 -; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run
 956 +; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run
 957  ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSimplifyPass
 958  ; CHECK-POSTLINK-O-NEXT: Running pass: LCSSAPass
 959 -; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run
 960 +; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run
 961  ; CHECK-POSTLINK-O-NEXT: Running pass: AlignmentFromAssumptionsPass
 962  ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSinkPass
 963  ; CHECK-POSTLINK-O-NEXT: Running pass: InstSimplifyPass
 964  ; CHECK-POSTLINK-O-NEXT: Running pass: DivRemPairsPass
 965  ; CHECK-POSTLINK-O-NEXT: Running pass: SimplifyCFGPass
 966  ; CHECK-POSTLINK-O-NEXT: Running pass: SpeculateAroundPHIsPass
 967 -; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run.
 968 +; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run.
 969  ; CHECK-POSTLINK-O-NEXT: Running pass: CGProfilePass
 970  ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalDCEPass
 971  ; CHECK-POSTLINK-O-NEXT: Running pass: ConstantMergePass
 972 -; CHECK-POSTLINK-O-NEXT: Finished llvm::Module pass manager run.
 973 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 974 +; CHECK-POSTLINK-O-NEXT: Finished Module pass manager run.
 975 +; CHECK-O-NEXT: Finished Module pass manager run.
 976  ; CHECK-PRELINK-O-NEXT: Running pass: NameAnonGlobalPass
 977  ; CHECK-O-NEXT: Running pass: PrintModulePass
 978
 979 @@ -271,7 +271,7 @@
 980  ; CHECK-O-NEXT:   ret void
 981  ; CHECK-O-NEXT: }
 982  ;
 983 -; CHECK-O-NEXT: Finished llvm::Module pass manager run.
 984 +; CHECK-O-NEXT: Finished Module pass manager run.
 985
 986  declare void @bar() local_unnamed_addr
 987
 988 diff --git a/llvm/test/Other/pass-pipeline-parsing.ll b/llvm/test/Other/pass-pipeline-parsing.ll
 989 index 2e8bc7c87302..621d8b12a6f8 100644
 990 --- a/llvm/test/Other/pass-pipeline-parsing.ll
 991 +++ b/llvm/test/Other/pass-pipeline-parsing.ll
 992 @@ -1,55 +1,55 @@
 993  ; RUN: opt -disable-output -debug-pass-manager \
 994  ; RUN:     -passes=no-op-module,no-op-module %s 2>&1 \
 995  ; RUN:     | FileCheck %s --check-prefix=CHECK-TWO-NOOP-MP
 996 -; CHECK-TWO-NOOP-MP: Starting llvm::Module pass manager run
 997 +; CHECK-TWO-NOOP-MP: Starting Module pass manager run
 998  ; CHECK-TWO-NOOP-MP: Running pass: NoOpModulePass
 999  ; CHECK-TWO-NOOP-MP: Running pass: NoOpModulePass
1000 -; CHECK-TWO-NOOP-MP: Finished llvm::Module pass manager run
1001 +; CHECK-TWO-NOOP-MP: Finished Module pass manager run
1002
1003  ; RUN: opt -disable-output -debug-pass-manager \
1004  ; RUN:     -passes='module(no-op-module,no-op-module)' %s 2>&1 \
1005  ; RUN:     | FileCheck %s --check-prefix=CHECK-NESTED-TWO-NOOP-MP
1006 -; CHECK-NESTED-TWO-NOOP-MP: Starting llvm::Module pass manager run
1007 -; CHECK-NESTED-TWO-NOOP-MP: Starting llvm::Module pass manager run
1008 +; CHECK-NESTED-TWO-NOOP-MP: Starting Module pass manager run
1009 +; CHECK-NESTED-TWO-NOOP-MP: Starting Module pass manager run
1010  ; CHECK-NESTED-TWO-NOOP-MP: Running pass: NoOpModulePass
1011  ; CHECK-NESTED-TWO-NOOP-MP: Running pass: NoOpModulePass
1012 -; CHECK-NESTED-TWO-NOOP-MP: Finished llvm::Module pass manager run
1013 -; CHECK-NESTED-TWO-NOOP-MP: Finished llvm::Module pass manager run
1014 +; CHECK-NESTED-TWO-NOOP-MP: Finished Module pass manager run
1015 +; CHECK-NESTED-TWO-NOOP-MP: Finished Module pass manager run
1016
1017  ; RUN: opt -disable-output -debug-pass-manager \
1018  ; RUN:     -passes=no-op-function,no-op-function %s 2>&1 \
1019  ; RUN:     | FileCheck %s --check-prefix=CHECK-TWO-NOOP-FP
1020 -; CHECK-TWO-NOOP-FP: Starting llvm::Module pass manager run
1021 +; CHECK-TWO-NOOP-FP: Starting Module pass manager run
1022  ; CHECK-TWO-NOOP-FP: Running pass: ModuleToFunctionPassAdaptor
1023 -; CHECK-TWO-NOOP-FP: Starting llvm::Function pass manager run
1024 +; CHECK-TWO-NOOP-FP: Starting Function pass manager run
1025  ; CHECK-TWO-NOOP-FP: Running pass: NoOpFunctionPass
1026  ; CHECK-TWO-NOOP-FP: Running pass: NoOpFunctionPass
1027 -; CHECK-TWO-NOOP-FP: Finished llvm::Function pass manager run
1028 -; CHECK-TWO-NOOP-FP: Finished llvm::Module pass manager run
1029 +; CHECK-TWO-NOOP-FP: Finished Function pass manager run
1030 +; CHECK-TWO-NOOP-FP: Finished Module pass manager run
1031
1032  ; RUN: opt -disable-output -debug-pass-manager \
1033  ; RUN:     -passes='function(no-op-function,no-op-function)' %s 2>&1 \
1034  ; RUN:     | FileCheck %s --check-prefix=CHECK-NESTED-TWO-NOOP-FP
1035 -; CHECK-NESTED-TWO-NOOP-FP: Starting llvm::Module pass manager run
1036 +; CHECK-NESTED-TWO-NOOP-FP: Starting Module pass manager run
1037  ; CHECK-NESTED-TWO-NOOP-FP: Running pass: ModuleToFunctionPassAdaptor
1038 -; CHECK-NESTED-TWO-NOOP-FP: Starting llvm::Function pass manager run
1039 +; CHECK-NESTED-TWO-NOOP-FP: Starting Function pass manager run
1040  ; CHECK-NESTED-TWO-NOOP-FP: Running pass: NoOpFunctionPass
1041  ; CHECK-NESTED-TWO-NOOP-FP: Running pass: NoOpFunctionPass
1042 -; CHECK-NESTED-TWO-NOOP-FP: Finished llvm::Function pass manager run
1043 -; CHECK-NESTED-TWO-NOOP-FP: Finished llvm::Module pass manager run
1044 +; CHECK-NESTED-TWO-NOOP-FP: Finished Function pass manager run
1045 +; CHECK-NESTED-TWO-NOOP-FP: Finished Module pass manager run
1046
1047  ; RUN: opt -disable-output -debug-pass-manager \
1048  ; RUN:     -passes='no-op-module,function(no-op-function,no-op-function),no-op-module' %s 2>&1 \
1049  ; RUN:     | FileCheck %s --check-prefix=CHECK-MIXED-FP-AND-MP
1050 -; CHECK-MIXED-FP-AND-MP: Starting llvm::Module pass manager run
1051 +; CHECK-MIXED-FP-AND-MP: Starting Module pass manager run
1052  ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpModulePass
1053  ; CHECK-MIXED-FP-AND-MP: Running pass: ModuleToFunctionPassAdaptor
1054 -; CHECK-MIXED-FP-AND-MP: Starting llvm::Function pass manager run
1055 +; CHECK-MIXED-FP-AND-MP: Starting Function pass manager run
1056  ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpFunctionPass
1057  ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpFunctionPass
1058 -; CHECK-MIXED-FP-AND-MP: Finished llvm::Function pass manager run
1059 +; CHECK-MIXED-FP-AND-MP: Finished Function pass manager run
1060  ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpModulePass
1061 -; CHECK-MIXED-FP-AND-MP: Finished llvm::Module pass manager run
1062 +; CHECK-MIXED-FP-AND-MP: Finished Module pass manager run
1063
1064  ; RUN: not opt -disable-output -debug-pass-manager \
1065  ; RUN:     -passes='no-op-module)' %s 2>&1 \
1066 @@ -104,52 +104,52 @@
1067  ; RUN: opt -disable-output -debug-pass-manager \
1068  ; RUN:     -passes=no-op-cgscc,no-op-cgscc %s 2>&1 \
1069  ; RUN:     | FileCheck %s --check-prefix=CHECK-TWO-NOOP-CG
1070 -; CHECK-TWO-NOOP-CG: Starting llvm::Module pass manager run
1071 +; CHECK-TWO-NOOP-CG: Starting Module pass manager run
1072  ; CHECK-TWO-NOOP-CG: Running pass: ModuleToPostOrderCGSCCPassAdaptor
1073  ; CHECK-TWO-NOOP-CG: Starting CGSCC pass manager run
1074  ; CHECK-TWO-NOOP-CG: Running pass: NoOpCGSCCPass
1075  ; CHECK-TWO-NOOP-CG: Running pass: NoOpCGSCCPass
1076  ; CHECK-TWO-NOOP-CG: Finished CGSCC pass manager run
1077 -; CHECK-TWO-NOOP-CG: Finished llvm::Module pass manager run
1078 +; CHECK-TWO-NOOP-CG: Finished Module pass manager run
1079
1080  ; RUN: opt -disable-output -debug-pass-manager \
1081  ; RUN:     -passes='module(function(no-op-function),cgscc(no-op-cgscc,function(no-op-function),no-op-cgscc),function(no-op-function))' %s 2>&1 \
1082  ; RUN:     | FileCheck %s --check-prefix=CHECK-NESTED-MP-CG-FP
1083 -; CHECK-NESTED-MP-CG-FP: Starting llvm::Module pass manager run
1084 -; CHECK-NESTED-MP-CG-FP: Starting llvm::Module pass manager run
1085 +; CHECK-NESTED-MP-CG-FP: Starting Module pass manager run
1086 +; CHECK-NESTED-MP-CG-FP: Starting Module pass manager run
1087  ; CHECK-NESTED-MP-CG-FP: Running pass: ModuleToFunctionPassAdaptor
1088 -; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run
1089 +; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run
1090  ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass
1091 -; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run
1092 +; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run
1093  ; CHECK-NESTED-MP-CG-FP: Running pass: ModuleToPostOrderCGSCCPassAdaptor
1094  ; CHECK-NESTED-MP-CG-FP: Starting CGSCC pass manager run
1095  ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpCGSCCPass
1096  ; CHECK-NESTED-MP-CG-FP: Running pass: CGSCCToFunctionPassAdaptor
1097 -; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run
1098 +; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run
1099  ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass
1100 -; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run
1101 +; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run
1102  ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpCGSCCPass
1103  ; CHECK-NESTED-MP-CG-FP: Finished CGSCC pass manager run
1104  ; CHECK-NESTED-MP-CG-FP: Running pass: ModuleToFunctionPassAdaptor
1105 -; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run
1106 +; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run
1107  ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass
1108 -; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run
1109 -; CHECK-NESTED-MP-CG-FP: Finished llvm::Module pass manager run
1110 -; CHECK-NESTED-MP-CG-FP: Finished llvm::Module pass manager run
1111 +; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run
1112 +; CHECK-NESTED-MP-CG-FP: Finished Module pass manager run
1113 +; CHECK-NESTED-MP-CG-FP: Finished Module pass manager run
1114
1115  ; RUN: opt -disable-output -debug-pass-manager \
1116  ; RUN:     -passes='no-op-loop,no-op-loop' %s 2>&1 \
1117  ; RUN:     | FileCheck %s --check-prefix=CHECK-TWO-NOOP-LOOP
1118 -; CHECK-TWO-NOOP-LOOP: Starting llvm::Module pass manager run
1119 +; CHECK-TWO-NOOP-LOOP: Starting Module pass manager run
1120  ; CHECK-TWO-NOOP-LOOP: Running pass: ModuleToFunctionPassAdaptor
1121 -; CHECK-TWO-NOOP-LOOP: Starting llvm::Function pass manager run
1122 +; CHECK-TWO-NOOP-LOOP: Starting Function pass manager run
1123  ; CHECK-TWO-NOOP-LOOP: Running pass: FunctionToLoopPassAdaptor
1124  ; CHECK-TWO-NOOP-LOOP: Starting Loop pass manager run
1125  ; CHECK-TWO-NOOP-LOOP: Running pass: NoOpLoopPass
1126  ; CHECK-TWO-NOOP-LOOP: Running pass: NoOpLoopPass
1127  ; CHECK-TWO-NOOP-LOOP: Finished Loop pass manager run
1128 -; CHECK-TWO-NOOP-LOOP: Finished llvm::Function pass manager run
1129 -; CHECK-TWO-NOOP-LOOP: Finished llvm::Module pass manager run
1130 +; CHECK-TWO-NOOP-LOOP: Finished Function pass manager run
1131 +; CHECK-TWO-NOOP-LOOP: Finished Module pass manager run
1132
1133  ; RUN: opt -disable-output -debug-pass-manager \
1134  ; RUN:     -passes='module(function(loop(no-op-loop)))' %s 2>&1 \
1135 @@ -163,15 +163,15 @@
1136  ; RUN: opt -disable-output -debug-pass-manager \
1137  ; RUN:     -passes='no-op-loop' %s 2>&1 \
1138  ; RUN:     | FileCheck %s --check-prefix=CHECK-NESTED-FP-LP
1139 -; CHECK-NESTED-FP-LP: Starting llvm::Module pass manager run
1140 +; CHECK-NESTED-FP-LP: Starting Module pass manager run
1141  ; CHECK-NESTED-FP-LP: Running pass: ModuleToFunctionPassAdaptor
1142 -; CHECK-NESTED-FP-LP: Starting llvm::Function pass manager run
1143 +; CHECK-NESTED-FP-LP: Starting Function pass manager run
1144  ; CHECK-NESTED-FP-LP: Running pass: FunctionToLoopPassAdaptor
1145  ; CHECK-NESTED-FP-LP: Starting Loop pass manager run
1146  ; CHECK-NESTED-FP-LP: Running pass: NoOpLoopPass
1147  ; CHECK-NESTED-FP-LP: Finished Loop pass manager run
1148 -; CHECK-NESTED-FP-LP: Finished llvm::Function pass manager run
1149 -; CHECK-NESTED-FP-LP: Finished llvm::Module pass manager run
1150 +; CHECK-NESTED-FP-LP: Finished Function pass manager run
1151 +; CHECK-NESTED-FP-LP: Finished Module pass manager run
1152
1153  ; RUN: not opt -disable-output -debug-pass-manager \
1154  ; RUN:     -passes='function(no-op-function)function(no-op-function)' %s 2>&1 \
1155 diff --git a/llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll b/llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll
1156 index 5a429bc3a4f0..aa3329432fc0 100644
1157 --- a/llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll
1158 +++ b/llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll
1159 @@ -6,7 +6,7 @@
1160  ; First we check that the passes run in the way we expect. Otherwise this test
1161  ; may stop testing anything.
1162  ;
1163 -; CHECK-LABEL: Starting llvm::Module pass manager run.
1164 +; CHECK-LABEL: Starting Module pass manager run.
1165  ; CHECK: Running pass: InlinerPass on (test1_f, test1_g, test1_h)
1166  ; CHECK: Running analysis: DominatorTreeAnalysis on test1_f
1167  ; CHECK: Running analysis: DominatorTreeAnalysis on test1_g
1168 @@ -28,15 +28,15 @@
1169  ; CHECK: Invalidating analysis: BranchProbabilityAnalysis on test1_h
1170  ; CHECK: Invalidating analysis: BlockFrequencyAnalysis on test1_h
1171  ; CHECK-NOT: Invalidating analysis:
1172 -; CHECK: Starting llvm::Function pass manager run.
1173 +; CHECK: Starting Function pass manager run.
1174  ; CHECK-NEXT: Running pass: DominatorTreeVerifierPass on test1_g
1175  ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_g
1176 -; CHECK-NEXT: Finished llvm::Function pass manager run.
1177 +; CHECK-NEXT: Finished Function pass manager run.
1178  ; CHECK-NOT: Invalidating analysis:
1179 -; CHECK: Starting llvm::Function pass manager run.
1180 +; CHECK: Starting Function pass manager run.
1181  ; CHECK-NEXT: Running pass: DominatorTreeVerifierPass on test1_h
1182  ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_h
1183 -; CHECK-NEXT: Finished llvm::Function pass manager run.
1184 +; CHECK-NEXT: Finished Function pass manager run.
1185  ; CHECK-NOT: Invalidating analysis:
1186  ; CHECK: Running pass: DominatorTreeVerifierPass on test1_f
1187  ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_f
1188 diff --git a/llvm/test/Transforms/Inline/clear-analyses.ll b/llvm/test/Transforms/Inline/clear-analyses.ll
1189 index 4b1d37ca29a9..dd163f71f933 100644
1190 --- a/llvm/test/Transforms/Inline/clear-analyses.ll
1191 +++ b/llvm/test/Transforms/Inline/clear-analyses.ll
1192 @@ -7,7 +7,7 @@
1193  ; RUN:     -passes='cgscc(inline,function(correlated-propagation))' \
1194  ; RUN:     | FileCheck %s
1195  ;
1196 -; CHECK-LABEL: Starting llvm::Module pass manager run.
1197 +; CHECK-LABEL: Starting Module pass manager run.
1198  ; CHECK: Running pass: InlinerPass on (callee)
1199  ; CHECK: Running pass: CorrelatedValuePropagationPass on callee
1200  ; CHECK: Running analysis: LazyValueAnalysis
1201 diff --git a/llvm/test/Transforms/LoopRotate/pr35210.ll b/llvm/test/Transforms/LoopRotate/pr35210.ll
1202 index 6fddeeeb9089..1b2e366c9193 100644
1203 --- a/llvm/test/Transforms/LoopRotate/pr35210.ll
1204 +++ b/llvm/test/Transforms/LoopRotate/pr35210.ll
1205 @@ -5,17 +5,17 @@
1206  ; This test is to make sure we invalidate the post dominator pass after loop rotate simplifies the loop latch.
1207  ; The adce passes are here to make sure post dominator analysis is required.
1208
1209 -; CHECK: Starting llvm::Function pass manager run.
1210 +; CHECK: Starting Function pass manager run.
1211  ; CHECK-NEXT: Running pass: ADCEPass on f
1212  ; CHECK-NEXT: Running analysis: PostDominatorTreeAnalysis on f
1213  ; CHECK-NEXT: Running pass: FunctionToLoopPassAdaptor{{.*}} on f
1214 -; CHECK-NEXT: Starting llvm::Function pass manager run.
1215 +; CHECK-NEXT: Starting Function pass manager run.
1216  ; CHECK-NEXT: Running pass: LoopSimplifyPass on f
1217  ; CHECK-NEXT: Running analysis: LoopAnalysis on f
1218  ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on f
1219  ; CHECK-NEXT: Running analysis: AssumptionAnalysis on f
1220  ; CHECK-NEXT: Running pass: LCSSAPass on f
1221 -; CHECK-NEXT: Finished llvm::Function pass manager run.
1222 +; CHECK-NEXT: Finished Function pass manager run.
1223  ; CHECK-NEXT: Running analysis: AAManager on f
1224  ; CHECK-NEXT: Running analysis: TargetLibraryAnalysis on f
1225  ; CHECK-NEXT: Running analysis: ScalarEvolutionAnalysis on f
1226 @@ -31,19 +31,19 @@
1227  ; CHECK-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on f
1228  ; CHECK-NEXT: Running pass: ADCEPass on f
1229  ; CHECK-NEXT: Running analysis: PostDominatorTreeAnalysis on f
1230 -; CHECK-NEXT: Finished llvm::Function pass manager run.
1231 +; CHECK-NEXT: Finished Function pass manager run.
1232
1233 -; MSSA: Starting llvm::Function pass manager run.
1234 +; MSSA: Starting Function pass manager run.
1235  ; MSSA-NEXT: Running pass: ADCEPass on f
1236  ; MSSA-NEXT: Running analysis: PostDominatorTreeAnalysis on f
1237  ; MSSA-NEXT: Running pass: FunctionToLoopPassAdaptor{{.*}} on f
1238 -; MSSA-NEXT: Starting llvm::Function pass manager run.
1239 +; MSSA-NEXT: Starting Function pass manager run.
1240  ; MSSA-NEXT: Running pass: LoopSimplifyPass on f
1241  ; MSSA-NEXT: Running analysis: LoopAnalysis on f
1242  ; MSSA-NEXT: Running analysis: DominatorTreeAnalysis on f
1243  ; MSSA-NEXT: Running analysis: AssumptionAnalysis on f
1244  ; MSSA-NEXT: Running pass: LCSSAPass on f
1245 -; MSSA-NEXT: Finished llvm::Function pass manager run.
1246 +; MSSA-NEXT: Finished Function pass manager run.
1247  ; MSSA-NEXT: Running analysis: MemorySSAAnalysis on f
1248  ; MSSA-NEXT: Running analysis: AAManager on f
1249  ; MSSA-NEXT: Running analysis: TargetLibraryAnalysis on f
1250 @@ -60,7 +60,7 @@
1251  ; MSSA-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on f
1252  ; MSSA-NEXT: Running pass: ADCEPass on f
1253  ; MSSA-NEXT: Running analysis: PostDominatorTreeAnalysis on f
1254 -; MSSA-NEXT: Finished llvm::Function pass manager run.
1255 +; MSSA-NEXT: Finished Function pass manager run.
1256
1257  ; CHECK-LABEL: define i8 @f() {
1258  ; CHECK-NEXT:  entry:
1259 diff --git a/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll b/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll
1260 index ec377ffb2235..e6683b9b5c89 100644
1261 --- a/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll
1262 +++ b/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll
1263 @@ -5,7 +5,7 @@
1264  ;
1265  ; RUN: opt -S -passes='loop(require<access-info>),loop-unroll,loop(print-access-info)' -debug-pass-manager < %s 2>&1 | FileCheck %s
1266  ;
1267 -; CHECK: Starting llvm::Function pass manager run.
1268 +; CHECK: Starting Function pass manager run.
1269  ; CHECK: Running pass: FunctionToLoopPassAdaptor
1270  ; CHECK: Running analysis: LoopAnalysis
1271  ; CHECK: Running analysis: InnerAnalysisManagerProxy<
1272 diff --git a/llvm/test/Transforms/SCCP/ipsccp-preserve-analysis.ll b/llvm/test/Transforms/SCCP/ipsccp-preserve-analysis.ll
1273 index b840e5e09fdc..fd990dbfeee7 100644
1274 --- a/llvm/test/Transforms/SCCP/ipsccp-preserve-analysis.ll
1275 +++ b/llvm/test/Transforms/SCCP/ipsccp-preserve-analysis.ll
1276 @@ -8,7 +8,7 @@
1277
1278  ; RUN: opt -passes='function(require<postdomtree>),ipsccp,function(verify<domtree>)' -S  %s | FileCheck -check-prefixes='IR' %s
1279
1280 -; NEW-PM: Starting llvm::Module pass manager run.
1281 +; NEW-PM: Starting Module pass manager run.
1282  ; NEW-PM: Running analysis: DominatorTreeAnalysis on f1
1283  ; NEW-PM: Running analysis: PostDominatorTreeAnalysis on f1
1284  ; NEW-PM: Running analysis: DominatorTreeAnalysis on f2
1285 diff --git a/llvm/test/Transforms/SCCP/preserve-analysis.ll b/llvm/test/Transforms/SCCP/preserve-analysis.ll
1286 index ab68be771e2a..8fed0b8fbf33 100644
1287 --- a/llvm/test/Transforms/SCCP/preserve-analysis.ll
1288 +++ b/llvm/test/Transforms/SCCP/preserve-analysis.ll
1289 @@ -25,7 +25,7 @@
1290  ; NEW-PM-NOT: Running analysis: AssumptionAnalysis on test
1291  ; NEW-PM-NOT: Running analysis: TargetLibraryAnalysis on test
1292  ; NEW-PM-NOT: Running analysis: TargetIRAnalysis on test
1293 -; NEW-PM: Finished llvm::Function pass manager run.
1294 +; NEW-PM: Finished Function pass manager run.
1295
1296
1297  define i32 @test() {
1298 diff --git a/llvm/test/Transforms/SROA/dead-inst.ll b/llvm/test/Transforms/SROA/dead-inst.ll
1299 index b1d106df3e68..801438a9a64a 100644
1300 --- a/llvm/test/Transforms/SROA/dead-inst.ll
1301 +++ b/llvm/test/Transforms/SROA/dead-inst.ll
1302 @@ -9,7 +9,7 @@
1303  ; CHECK: Invalidating analysis: DemandedBitsAnalysis on H
1304  ; CHECK: Running pass: BDCEPass on H
1305  ; CHECK: Running analysis: DemandedBitsAnalysis on H
1306 -; CHECK: Finished llvm::Function pass manager run.
1307 +; CHECK: Finished Function pass manager run.
1308
1309  target datalayout = "e-m:e-i64:64-n32:64"
1310  target triple = "powerpc64le-grtev4-linux-gnu"
1311 diff --git a/llvm/test/tools/gold/X86/new-pm.ll b/llvm/test/tools/gold/X86/new-pm.ll
1312 index ee5e6ed53b13..4812f2696d7e 100644
1313 --- a/llvm/test/tools/gold/X86/new-pm.ll
1314 +++ b/llvm/test/tools/gold/X86/new-pm.ll
1315 @@ -8,7 +8,7 @@
1316  ; RUN:     --plugin-opt=cache-dir=%t.cache \
1317  ; RUN:     -o %t2.o %t.o 2>&1 | FileCheck %s
1318
1319 -; CHECK: Starting llvm::Module pass manager run
1320 +; CHECK: Starting Module pass manager run
1321
1322  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
1323  target triple = "x86_64-unknown-linux-gnu"