diff --git a/0001-Deactivate-markdown-doc.patch b/0001-Deactivate-markdown-doc.patch new file mode 100644 index 0000000..92e048d --- /dev/null +++ b/0001-Deactivate-markdown-doc.patch @@ -0,0 +1,25 @@ +diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py +--- a/llvm/docs/conf.py 2020-09-15 09:12:24.318287611 +0000 ++++ b/llvm/docs/conf.py 2020-09-15 15:01:00.025893199 +0000 +@@ -36,20 +36,7 @@ + '.rst': 'restructuredtext', + } + +-try: +- import recommonmark +-except ImportError: +- # manpages do not use any .md sources +- if not tags.has('builder-man'): +- raise +-else: +- import sphinx +- if sphinx.version_info >= (3, 0): +- # This requires 0.5 or later. +- extensions.append('recommonmark') +- else: +- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'} +- source_suffix['.md'] = 'markdown' ++import sphinx + + # The encoding of source files. + #source_encoding = 'utf-8-sig' diff --git a/gcc12.patch b/gcc12.patch new file mode 100644 index 0000000..3523d47 --- /dev/null +++ b/gcc12.patch @@ -0,0 +1,20 @@ +--- a/llvm-11.1.0.src/include/llvm/Support/Base64.h 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/include/llvm/Support/Base64.h 2023-01-30 10:58:39.424270016 -0700 +@@ -13,6 +13,7 @@ + #ifndef LLVM_SUPPORT_BASE64_H + #define LLVM_SUPPORT_BASE64_H + ++#include + #include + + namespace llvm { +--- a/llvm-11.1.0.src/include/llvm/Support/Signals.h 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/include/llvm/Support/Signals.h 2023-01-30 09:51:35.823901524 -0700 +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { diff --git a/llvm12-ReleaseNotes-sphinx-7.2.6-wrap.patch b/llvm12-ReleaseNotes-sphinx-7.2.6-wrap.patch new file mode 100644 index 0000000..52c7333 --- /dev/null +++ b/llvm12-ReleaseNotes-sphinx-7.2.6-wrap.patch @@ -0,0 +1,229 @@ +--- llvm-12.0.1.src/docs/ReleaseNotes.rst~ 2021-06-29 00:23:38.000000000 +0800 ++++ llvm-12.0.1.src/docs/ReleaseNotes.rst 2025-04-26 17:03:03.640319913 +0800 +@@ -40,8 +40,7 @@ + functionality, or simply have a lot to talk about), see the `NOTE` below + for adding a new subsection. + +-* The ConstantPropagation pass was removed. Users should use the InstSimplify +- pass instead. ++* The ConstantPropagation pass was removed. Users should use the InstSimplify pass instead. + + + .. NOTE +@@ -60,60 +59,37 @@ + + * ... + +-* Added the ``byref`` attribute to better represent argument passing +- for the `amdgpu_kernel` calling convention. ++* Added the ``byref`` attribute to better represent argument passing for the `amdgpu_kernel` calling convention. + +-* Added type parameter to the ``sret`` attribute to continue work on +- removing pointer element types. ++* Added type parameter to the ``sret`` attribute to continue work on removing pointer element types. + +-* The ``llvm.experimental.vector.reduce`` family of intrinsics have been renamed +- to drop the "experimental" from the name, reflecting their now fully supported +- status in the IR. ++* The ``llvm.experimental.vector.reduce`` family of intrinsics have been renamed to drop the "experimental" from the name, reflecting their now fully supported status in the IR. + + + Changes to building LLVM + ------------------------ + +-* The internal ``llvm-build`` Python script and the associated ``LLVMBuild.txt`` +- files used to describe the LLVM component structure have been removed and +- replaced by a pure ``CMake`` approach, where each component stores extra +- properties in the created targets. These properties are processed once all +- components are defined to resolve library dependencies and produce the header +- expected by llvm-config. ++* The internal ``llvm-build`` Python script and the associated ``LLVMBuild.txt`` files used to describe the LLVM component structure have been removed and replaced by a pure ``CMake`` approach, where each component stores extra properties in the created targets. These properties are processed once all components are defined to resolve library dependencies and produce the header expected by llvm-config. + + Changes to TableGen + ------------------- + +-* The new "TableGen Programmer's Reference" replaces the "TableGen Language +- Introduction" and "TableGen Language Reference" documents. ++* The new "TableGen Programmer's Reference" replaces the "TableGen Language Introduction" and "TableGen Language Reference" documents. + +-* The syntax for specifying an integer range in a range list has changed. +- The old syntax used a hyphen in the range (e.g., ``{0-9}``). The new syntax +- uses the "`...`" range punctuation (e.g., ``{0...9}``). The hyphen syntax +- is deprecated. ++* The syntax for specifying an integer range in a range list has changed. The old syntax used a hyphen in the range (e.g., ``{0-9}``). The new syntax uses the "`...`" range punctuation (e.g., ``{0...9}``). The hyphen syntax is deprecated. + + Changes to the AArch64 Backend + -------------------------- + + During this release ... + +-* Lots of improvements to generation of Windows unwind data; the unwind +- data is optimized and written in packed form where possible, reducing +- the size of unwind data (pdata and xdata sections) by around 60% +- compared with LLVM 11. The generation of prologs/epilogs is tweaked +- when targeting Windows, to increase the chances of being able to use +- the packed unwind info format. +- +-* Support for creating Windows unwind data using ``.seh_*`` assembler +- directives. +- +-* Produce proper assembly output for the Windows target, including +- ``:lo12:`` relocation specifiers, to allow the assembly output +- to actually be assembled. +- +-* Changed the assembly comment string for MSVC targets to ``//`` (consistent +- with the MinGW and ELF targets), freeing up ``;`` to be used as +- statement separator. ++* Lots of improvements to generation of Windows unwind data; the unwind data is optimized and written in packed form where possible, reducing the size of unwind data (pdata and xdata sections) by around 60% compared with LLVM 11. The generation of prologs/epilogs is tweaked when targeting Windows, to increase the chances of being able to use the packed unwind info format. ++ ++* Support for creating Windows unwind data using ``.seh_*`` assembler directives. ++ ++* Produce proper assembly output for the Windows target, including ``:lo12:`` relocation specifiers, to allow the assembly output to actually be assembled. ++ ++* Changed the assembly comment string for MSVC targets to ``//`` (consistent with the MinGW and ELF targets), freeing up ``;`` to be used as statement separator. + + Changes to the ARM Backend + -------------------------- +@@ -131,51 +107,39 @@ + + Optimization: + +-* Made improvements to loop unroll-and-jam including fix to respect user +- provided #pragma unroll-and-jam for loops on targets other than ARM. +-* Improved PartialInliner allowing it to handle code regions in a switch +- statements. +-* Improved PGO support on AIX by building and linking with compiler-rt profile +- library. ++* Made improvements to loop unroll-and-jam including fix to respect user provided #pragma unroll-and-jam for loops on targets other than ARM. ++* Improved PartialInliner allowing it to handle code regions in a switch statements. ++* Improved PGO support on AIX by building and linking with compiler-rt profile library. + * Add support for Epilogue Vectorization and enabled it by default. + + CodeGen: + + * POWER10 support +- * Implementation of PC Relative addressing in LLD including the associated +- linker optimizations. +- * Add support for the new matrix multiplication (MMA) instructions to Clang +- and LLVM. ++ * Implementation of PC Relative addressing in LLD including the associated linker optimizations. ++ * Add support for the new matrix multiplication (MMA) instructions to Clang and LLVM. + * Implementation of Power10 builtins. + + * Scheduling enhancements +- * Add a new algorithm to cluster more loads/stores if the DAG is not too +- complicated. ++ * Add a new algorithm to cluster more loads/stores if the DAG is not too complicated. + * Enable the PowerPC scheduling heuristic for Power10. + + * Target dependent passes tuning +- * Enhance LoopStrengthReduce/PPCLoopInstrFormPrep pass for PowerPC, +- especially for P10 intrinsics. ++ * Enhance LoopStrengthReduce/PPCLoopInstrFormPrep pass for PowerPC, especially for P10 intrinsics. + * Enhance machine combiner pass to reduce register pressure for PowerPC. +- * Improve MachineSink to do more sinking based on register pressure and alias +- analysis. ++ * Improve MachineSink to do more sinking based on register pressure and alias analysis. + + * General improvements + * Complete the constrained floating point operations support. + * Improve the llvm-exegesis support. +- * Improve the stack clash protection to probe the gap between stackptr and +- realigned stackptr. ++ * Improve the stack clash protection to probe the gap between stackptr and realigned stackptr. + * Improve the IEEE long double support for Power8. + * Enable MemorySSA for LoopSink. +- * Enhance LLVM debugging functionality via options such as -print-changed and +- -print-before-changed. ++ * Enhance LLVM debugging functionality via options such as -print-changed and -print-before-changed. + * Add builtins for Power9 (i.e. darn, xvtdiv, xvtsqrt etc). + * Add options to disable all or part of LoopIdiomRecognizePass. +- * Add support for printing the DDG in DOT form allowing for visual inspection +- of the Data Dependence Graph. ++ * Add support for printing the DDG in DOT form allowing for visual inspection of the Data Dependence Graph. + * Remove the QPX support. +- * Significant number of bug fixes including all the fixes necessary to +- achieve a clean test run for Julia. ++ * Significant number of bug fixes including all the fixes necessary to achieve a clean test run for Julia. + + AIX Support: + +@@ -186,14 +150,11 @@ + * General Improvements + * Enable the AIX extended AltiVec ABI under option -mabi=vec-extabi. + * Add partial C99 complex type support. +- * Implemente traceback table for functions (encodes vector information, +- emits exception handling). +- * Implemente code generation for C++ dynamic initialization and finalization. +- of non-local variables for use with the -bcdtors option of the AIX linker. ++ * Implemente traceback table for functions (encodes vector information, emits exception handling). ++ * Implemente code generation for C++ dynamic initialization and finalization of non-local variables for use with the -bcdtors option of the AIX linker. + * Add new option -mignore-xcoff-visibility. + * Enable explicit sections on AIX. +- * Enable -f[no-]data-sections on AIX and set -fdata-sections to be the default +- on AIX. ++ * Enable -f[no-]data-sections on AIX and set -fdata-sections to be the default on AIX. + * Enable -f[no-]function-sections. + * Add support for relocation generation using the large code model. + * Add pragma align natural and sorted out pragma pack stack effect. +@@ -204,19 +165,10 @@ + + During this release ... + +-* The 'mpx' feature was removed from the backend. It had been removed from clang +- frontend in 10.0. Mention of the 'mpx' feature in an IR file will print a +- message to stderr, but IR should still compile. +-* Support for ``-march=alderlake``, ``-march=sapphirerapids``, +- ``-march=znver3`` and ``-march=x86-64-v[234]`` has been added. +-* The assembler now has support for {disp32} and {disp8} pseudo prefixes for +- controlling displacement size for memory operands and jump displacements. The +- assembler also supports the .d32 and .d8 mnemonic suffixes to do the same. +-* A new function attribute "tune-cpu" has been added to support -mtune like gcc. +- This allows microarchitectural optimizations to be applied independent from +- the "target-cpu" attribute or TargetMachine CPU which will be used to select +- Instruction Set. If the attribute is not present, the tune CPU will follow +- the target CPU. ++* The 'mpx' feature was removed from the backend. It had been removed from clang frontend in 10.0. Mention of the 'mpx' feature in an IR file will print a message to stderr, but IR should still compile. ++* Support for ``-march=alderlake``, ``-march=sapphirerapids``, ``-march=znver3`` and ``-march=x86-64-v[234]`` has been added. ++* The assembler now has support for {disp32} and {disp8} pseudo prefixes for controlling displacement size for memory operands and jump displacements. The assembler also supports the .d32 and .d8 mnemonic suffixes to do the same. ++* A new function attribute "tune-cpu" has been added to support -mtune like gcc. This allows microarchitectural optimizations to be applied independent from the "target-cpu" attribute or TargetMachine CPU which will be used to select Instruction Set. If the attribute is not present, the tune CPU will follow the target CPU. + * Support for ``HRESET`` instructions has been added. + * Support for ``UINTR`` instructions has been added. + * Support for ``AVXVNNI`` instructions has been added. +@@ -226,8 +178,7 @@ + + During this release ... + +-* The new ``byref`` attribute is now the preferred method for +- representing aggregate kernel arguments. ++* The new ``byref`` attribute is now the preferred method for representing aggregate kernel arguments. + + Changes to the AVR Target + ----------------------------- +@@ -260,22 +211,14 @@ + + During this release ... + +-* The DIModule metadata is extended with a field to indicate if it is a +- module declaration. This extension enables the emission of debug info +- for a Fortran 'use ' statement. For more information +- on what the debug info entries should look like and how the debugger +- can use them, please see test/DebugInfo/X86/dimodule-external-fortran.ll. ++* The DIModule metadata is extended with a field to indicate if it is a module declaration. This extension enables the emission of debug info for a Fortran 'use ' statement. For more information on what the debug info entries should look like and how the debugger can use them, please see test/DebugInfo/X86/dimodule-external-fortran.ll. + + Changes to the LLVM tools + --------------------------------- + +-* llvm-readobj and llvm-readelf behavior has changed to report an error when +- executed with no input files instead of reading an input from stdin. +- Reading from stdin can still be achieved by specifying `-` as an input file. +- +-* llvm-mca supports serialization of the timeline and summary views. +- The `--json` command line option prints a JSON representation of +- these views to stdout. ++* llvm-readobj and llvm-readelf behavior has changed to report an error when executed with no input files instead of reading an input from stdin. Reading from stdin can still be achieved by specifying `-` as an input file. ++ ++* llvm-mca supports serialization of the timeline and summary views. The `--json` command line option prints a JSON representation of these views to stdout. + + Changes to LLDB + --------------------------------- diff --git a/llvm12.spec b/llvm12.spec index a7d92c2..80161e2 100644 --- a/llvm12.spec +++ b/llvm12.spec @@ -48,7 +48,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 14%{?dist} Summary: The Low Level Virtual Machine License: NCSA @@ -63,6 +63,12 @@ Source4: lit.fedora.cfg.py %endif Patch0: 0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch +Patch1: gcc12.patch +Patch2: typename.patch +Patch3: test-go-py-pipes.patch + +Patch101: 0001-Deactivate-markdown-doc.patch +Patch102: llvm12-ReleaseNotes-sphinx-7.2.6-wrap.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -73,7 +79,9 @@ BuildRequires: libffi-devel BuildRequires: ncurses-devel BuildRequires: python3-psutil BuildRequires: python3-sphinx +%if %{defined fedora} || 0%{?rhel} >= 10 BuildRequires: python3-recommonmark +%endif BuildRequires: multilib-rpm-config %if %{with gold} BuildRequires: binutils-devel @@ -175,9 +183,14 @@ LLVM's modified googletest sources. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -n %{llvm_srcdir} -p2 +%setup -q -n %{llvm_srcdir} +%autopatch -M 99 -p2 +%if %{defined el9} +%patch -P101 -p2 -b .orig +%endif +%patch -P102 -p1 -b .orig -pathfix.py -i %{__python3} -pn \ +%py3_shebang_fix \ test/BugPoint/compile-custom.ll.py \ tools/opt-viewer/*.py \ utils/update_cc_test_checks.py @@ -387,6 +400,13 @@ touch %{buildroot}%{_bindir}/llvm-config%{exec_suffix} rm test/tools/llvm-readobj/ELF/dependent-libraries.test %endif +%if %{defined el9} +%ifarch s390x +rm test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test +rm test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test +%endif +%endif + # non reproducible errors rm test/tools/dsymutil/X86/swift-interface.test @@ -499,6 +519,43 @@ fi %endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 12.0.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 12.0.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 12.0.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 12.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 12.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 12.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jan 31 2023 Jens Petersen - 12.0.1-8 +- Add gcc12 patch to add includes needed for GCC 12 (Jerry James) +- Add typename patch to fix test failures (Jerry James) + +* Thu Jan 19 2023 Fedora Release Engineering - 12.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Sep 5 2022 Jens Petersen - 12.0.1-6 +- python3-recommonmark is only in Fedora + +* Thu Jul 21 2022 Fedora Release Engineering - 12.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 12.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Miro Hrončok - 12.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Thu Jul 22 2021 Fedora Release Engineering - 12.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/test-go-py-pipes.patch b/test-go-py-pipes.patch new file mode 100644 index 0000000..d7b2c37 --- /dev/null +++ b/test-go-py-pipes.patch @@ -0,0 +1,18 @@ +--- a/llvm-13.0.1.src/test/Bindings/Go/lit.local.cfg 2022-01-21 05:31:59.000000000 +0800 ++++ b/llvm-13.0.1.src/test/Bindings/Go/lit.local.cfg 2024-07-19 21:33:42.775023065 +0800 +@@ -1,5 +1,4 @@ + import os +-import pipes + import shlex + import sys + +@@ -56,7 +55,7 @@ + except (AttributeError, OSError): + pass + +- return ' '.join([pipes.quote(arg) for arg in args]) ++ return ' '.join([shlex.quote(arg) for arg in args]) + + config.environment['CC'] = fixup_compiler_path(config.host_cc) + config.environment['CXX'] = fixup_compiler_path(config.host_cxx) + diff --git a/typename.patch b/typename.patch new file mode 100644 index 0000000..8b34a23 --- /dev/null +++ b/typename.patch @@ -0,0 +1,1222 @@ +diff -up llvm-12.0.1.src/test/Other/new-pass-manager.ll~ llvm-12.0.1.src/test/Other/new-pass-manager.ll +--- a/llvm-12.0.1.src/test/Other/new-pass-manager.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/new-pass-manager.ll 2023-01-31 20:59:51.606099368 -0700 +@@ -8,9 +8,9 @@ + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes=no-op-module %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-MODULE-PASS +-; CHECK-MODULE-PASS: Starting llvm::Module pass manager run ++; CHECK-MODULE-PASS: Starting Module pass manager run + ; CHECK-MODULE-PASS-NEXT: Running pass: NoOpModulePass +-; CHECK-MODULE-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-MODULE-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes=no-op-cgscc %s 2>&1 \ +@@ -18,7 +18,7 @@ + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='cgscc(no-op-cgscc)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-CGSCC-PASS +-; CHECK-CGSCC-PASS: Starting llvm::Module pass manager run ++; CHECK-CGSCC-PASS: Starting Module pass manager run + ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(CGSCCAnalysisManager|AnalysisManager<.*LazyCallGraph::SCC.*>).*}},{{.*}}Module> + ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(FunctionAnalysisManager|AnalysisManager<.*Function.*>).*}},{{.*}}Module> + ; CHECK-CGSCC-PASS-NEXT: Running analysis: LazyCallGraphAnalysis +@@ -28,7 +28,7 @@ + ; CHECK-CGSCC-PASS-NEXT: Starting CGSCC pass manager run + ; CHECK-CGSCC-PASS-NEXT: Running pass: NoOpCGSCCPass + ; CHECK-CGSCC-PASS-NEXT: Finished CGSCC pass manager run +-; CHECK-CGSCC-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-CGSCC-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes=no-op-function %s 2>&1 \ +@@ -36,55 +36,55 @@ + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='function(no-op-function)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-PASS +-; CHECK-FUNCTION-PASS: Starting llvm::Module pass manager run ++; CHECK-FUNCTION-PASS: Starting Module pass manager run + ; CHECK-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> +-; CHECK-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-FUNCTION-PASS-NEXT: Starting Function pass manager run + ; CHECK-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass +-; CHECK-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-FUNCTION-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-FUNCTION-PASS-NEXT: Finished Function pass manager run ++; CHECK-FUNCTION-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager -passes=print %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-MODULE-PRINT +-; CHECK-MODULE-PRINT: Starting llvm::Module pass manager run ++; CHECK-MODULE-PRINT: Starting Module pass manager run + ; CHECK-MODULE-PRINT: Running pass: VerifierPass + ; CHECK-MODULE-PRINT: Running pass: PrintModulePass + ; CHECK-MODULE-PRINT: ModuleID + ; CHECK-MODULE-PRINT: define void @foo(i1 %x, i8* %p1, i8* %p2) + ; CHECK-MODULE-PRINT: Running pass: VerifierPass +-; CHECK-MODULE-PRINT: Finished llvm::Module pass manager run ++; CHECK-MODULE-PRINT: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='print,verify' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-MODULE-VERIFY +-; CHECK-MODULE-VERIFY: Starting llvm::Module pass manager run ++; CHECK-MODULE-VERIFY: Starting Module pass manager run + ; CHECK-MODULE-VERIFY: Running pass: PrintModulePass + ; CHECK-MODULE-VERIFY: ModuleID + ; CHECK-MODULE-VERIFY: define void @foo(i1 %x, i8* %p1, i8* %p2) + ; CHECK-MODULE-VERIFY: Running pass: VerifierPass +-; CHECK-MODULE-VERIFY: Finished llvm::Module pass manager run ++; CHECK-MODULE-VERIFY: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager -passes='function(print)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-PRINT +-; CHECK-FUNCTION-PRINT: Starting llvm::Module pass manager run ++; CHECK-FUNCTION-PRINT: Starting Module pass manager run + ; CHECK-FUNCTION-PRINT: Running pass: VerifierPass + ; CHECK-FUNCTION-PRINT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> +-; CHECK-FUNCTION-PRINT: Starting llvm::Function pass manager run ++; CHECK-FUNCTION-PRINT: Starting Function pass manager run + ; CHECK-FUNCTION-PRINT: Running pass: PrintFunctionPass + ; CHECK-FUNCTION-PRINT-NOT: ModuleID + ; CHECK-FUNCTION-PRINT: define void @foo(i1 %x, i8* %p1, i8* %p2) +-; CHECK-FUNCTION-PRINT: Finished llvm::Function pass manager run ++; CHECK-FUNCTION-PRINT: Finished Function pass manager run + ; CHECK-FUNCTION-PRINT: Running pass: VerifierPass +-; CHECK-FUNCTION-PRINT: Finished llvm::Module pass manager run ++; CHECK-FUNCTION-PRINT: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='function(print,verify)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-VERIFY +-; CHECK-FUNCTION-VERIFY: Starting llvm::Module pass manager run +-; CHECK-FUNCTION-VERIFY: Starting llvm::Function pass manager run ++; CHECK-FUNCTION-VERIFY: Starting Module pass manager run ++; CHECK-FUNCTION-VERIFY: Starting Function pass manager run + ; CHECK-FUNCTION-VERIFY: Running pass: PrintFunctionPass + ; CHECK-FUNCTION-VERIFY-NOT: ModuleID + ; CHECK-FUNCTION-VERIFY: define void @foo(i1 %x, i8* %p1, i8* %p2) + ; CHECK-FUNCTION-VERIFY: Running pass: VerifierPass +-; CHECK-FUNCTION-VERIFY: Finished llvm::Function pass manager run +-; CHECK-FUNCTION-VERIFY: Finished llvm::Module pass manager run ++; CHECK-FUNCTION-VERIFY: Finished Function pass manager run ++; CHECK-FUNCTION-VERIFY: Finished Module pass manager run + + ; RUN: opt -S -o - -passes='no-op-module,no-op-module' %s \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NOOP +@@ -106,27 +106,27 @@ + + ; RUN: opt -disable-output -debug-pass-manager -disable-verify -passes='no-op-module,function(no-op-function)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NO-VERIFY +-; CHECK-NO-VERIFY: Starting llvm::Module pass manager run ++; CHECK-NO-VERIFY: Starting Module pass manager run + ; CHECK-NO-VERIFY-NOT: VerifierPass + ; CHECK-NO-VERIFY: Running pass: NoOpModulePass + ; CHECK-NO-VERIFY-NOT: VerifierPass +-; CHECK-NO-VERIFY: Starting llvm::Function pass manager run ++; CHECK-NO-VERIFY: Starting Function pass manager run + ; CHECK-NO-VERIFY: Running pass: NoOpFunctionPass + ; CHECK-NO-VERIFY-NOT: VerifierPass +-; CHECK-NO-VERIFY: Finished llvm::Function pass manager run ++; CHECK-NO-VERIFY: Finished Function pass manager run + ; CHECK-NO-VERIFY-NOT: VerifierPass +-; CHECK-NO-VERIFY: Finished llvm::Module pass manager run ++; CHECK-NO-VERIFY: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-ANALYSES +-; CHECK-ANALYSES: Starting llvm::Module pass manager run ++; CHECK-ANALYSES: Starting Module pass manager run + ; CHECK-ANALYSES: Running pass: RequireAnalysisPass + ; CHECK-ANALYSES: Running analysis: NoOpModuleAnalysis + ; CHECK-ANALYSES: Starting CGSCC pass manager run + ; CHECK-ANALYSES: Running pass: RequireAnalysisPass + ; CHECK-ANALYSES: Running analysis: NoOpCGSCCAnalysis +-; CHECK-ANALYSES: Starting llvm::Function pass manager run ++; CHECK-ANALYSES: Starting Function pass manager run + ; CHECK-ANALYSES: Running pass: RequireAnalysisPass + ; CHECK-ANALYSES: Running analysis: NoOpFunctionAnalysis + +@@ -135,12 +135,12 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NO-OP-INVALIDATION +-; CHECK-NO-OP-INVALIDATION: Starting llvm::Module pass manager run ++; CHECK-NO-OP-INVALIDATION: Starting Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='require,require,require' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS +-; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis + ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS-NOT: Running analysis: NoOpModuleAnalysis +@@ -148,7 +148,7 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='require,invalidate,require' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS +-; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running analysis: NoOpModuleAnalysis + ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Invalidating analysis: NoOpModuleAnalysis +@@ -157,7 +157,7 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='cgscc(require,require,require)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS +-; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis + ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS-NOT: Running analysis: NoOpCGSCCAnalysis +@@ -165,7 +165,7 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='cgscc(require,invalidate,require)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS +-; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running analysis: NoOpCGSCCAnalysis + ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Invalidating analysis: NoOpCGSCCAnalysis +@@ -174,7 +174,7 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='function(require,require,require)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS +-; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis + ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS-NOT: Running analysis: NoOpFunctionAnalysis +@@ -182,7 +182,7 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='function(require,invalidate,require)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS +-; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting llvm::Module pass manager run ++; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting Module pass manager run + ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running pass: RequireAnalysisPass + ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running analysis: NoOpFunctionAnalysis + ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Invalidating analysis: NoOpFunctionAnalysis +@@ -191,31 +191,31 @@ + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='require,module(require,function(require,invalidate,require),require),require' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL +-; CHECK-INVALIDATE-ALL: Starting llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL: Starting Module pass manager run + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL: Running analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-NOT: Running analysis: NoOpModuleAnalysis +-; CHECK-INVALIDATE-ALL: Starting llvm::Function pass manager run ++; CHECK-INVALIDATE-ALL: Starting Function pass manager run + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL: Running analysis: NoOpFunctionAnalysis + ; CHECK-INVALIDATE-ALL: Running pass: InvalidateAllAnalysesPass + ; CHECK-INVALIDATE-ALL: Invalidating analysis: NoOpFunctionAnalysis + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL: Running analysis: NoOpFunctionAnalysis +-; CHECK-INVALIDATE-ALL: Finished llvm::Function pass manager run ++; CHECK-INVALIDATE-ALL: Finished Function pass manager run + ; CHECK-INVALIDATE-ALL: Invalidating analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL: Running analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL-NOT: Invalidating analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-NOT: Running analysis: NoOpModuleAnalysis +-; CHECK-INVALIDATE-ALL: Finished llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='require,module(require,cgscc(require,function(require,invalidate,require),require),require),require' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL-CG +-; CHECK-INVALIDATE-ALL-CG: Starting llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL-CG: Starting Module pass manager run + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass +@@ -223,14 +223,14 @@ + ; CHECK-INVALIDATE-ALL-CG: Starting CGSCC pass manager run + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpCGSCCAnalysis +-; CHECK-INVALIDATE-ALL-CG: Starting llvm::Function pass manager run ++; CHECK-INVALIDATE-ALL-CG: Starting Function pass manager run + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpFunctionAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: InvalidateAllAnalysesPass + ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpFunctionAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpFunctionAnalysis +-; CHECK-INVALIDATE-ALL-CG: Finished llvm::Function pass manager run ++; CHECK-INVALIDATE-ALL-CG: Finished Function pass manager run + ; CHECK-INVALIDATE-ALL-CG-NOT: Running analysis: NoOpFunctionAnalysis + ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpCGSCCAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass +@@ -243,72 +243,72 @@ + ; CHECK-INVALIDATE-ALL-CG-NOT: Invalidating analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG-NOT: Running analysis: NoOpModuleAnalysis +-; CHECK-INVALIDATE-ALL-CG: Finished llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL-CG: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require,invalidate,require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TLI +-; CHECK-TLI: Starting llvm::Module pass manager run ++; CHECK-TLI: Starting Module pass manager run + ; CHECK-TLI: Running pass: RequireAnalysisPass + ; CHECK-TLI: Running analysis: TargetLibraryAnalysis + ; CHECK-TLI: Running pass: InvalidateAllAnalysesPass + ; CHECK-TLI-NOT: Invalidating analysis: TargetLibraryAnalysis + ; CHECK-TLI: Running pass: RequireAnalysisPass + ; CHECK-TLI-NOT: Running analysis: TargetLibraryAnalysis +-; CHECK-TLI: Finished llvm::Module pass manager run ++; CHECK-TLI: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require,invalidate,require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TIRA +-; CHECK-TIRA: Starting llvm::Module pass manager run ++; CHECK-TIRA: Starting Module pass manager run + ; CHECK-TIRA: Running pass: RequireAnalysisPass + ; CHECK-TIRA: Running analysis: TargetIRAnalysis + ; CHECK-TIRA: Running pass: InvalidateAllAnalysesPass + ; CHECK-TIRA-NOT: Invalidating analysis: TargetIRAnalysis + ; CHECK-TIRA: Running pass: RequireAnalysisPass + ; CHECK-TIRA-NOT: Running analysis: TargetIRAnalysis +-; CHECK-TIRA: Finished llvm::Module pass manager run ++; CHECK-TIRA: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-DT +-; CHECK-DT: Starting llvm::Module pass manager run ++; CHECK-DT: Starting Module pass manager run + ; CHECK-DT: Running pass: RequireAnalysisPass + ; CHECK-DT: Running analysis: DominatorTreeAnalysis +-; CHECK-DT: Finished llvm::Module pass manager run ++; CHECK-DT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-BASIC-AA +-; CHECK-BASIC-AA: Starting llvm::Module pass manager run ++; CHECK-BASIC-AA: Starting Module pass manager run + ; CHECK-BASIC-AA: Running pass: RequireAnalysisPass + ; CHECK-BASIC-AA: Running analysis: BasicAA +-; CHECK-BASIC-AA: Finished llvm::Module pass manager run ++; CHECK-BASIC-AA: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' -aa-pipeline='basic-aa' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-AA +-; CHECK-AA: Starting llvm::Module pass manager run ++; CHECK-AA: Starting Module pass manager run + ; CHECK-AA: Running pass: RequireAnalysisPass + ; CHECK-AA: Running analysis: AAManager + ; CHECK-AA: Running analysis: BasicAA +-; CHECK-AA: Finished llvm::Module pass manager run ++; CHECK-AA: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' -aa-pipeline='default' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-AA-DEFAULT +-; CHECK-AA-DEFAULT: Starting llvm::Module pass manager run ++; CHECK-AA-DEFAULT: Starting Module pass manager run + ; CHECK-AA-DEFAULT: Running pass: RequireAnalysisPass + ; CHECK-AA-DEFAULT: Running analysis: AAManager + ; CHECK-AA-DEFAULT: Running analysis: BasicAA + ; CHECK-AA-DEFAULT: Running analysis: ScopedNoAliasAA + ; CHECK-AA-DEFAULT: Running analysis: TypeBasedAA +-; CHECK-AA-DEFAULT: Finished llvm::Module pass manager run ++; CHECK-AA-DEFAULT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require,invalidate,aa-eval' -aa-pipeline='basic-aa' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-AA-FUNCTION-INVALIDATE +-; CHECK-AA-FUNCTION-INVALIDATE: Starting llvm::Function pass manager run ++; CHECK-AA-FUNCTION-INVALIDATE: Starting Function pass manager run + ; CHECK-AA-FUNCTION-INVALIDATE: Running pass: RequireAnalysisPass + ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: AAManager + ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: BasicAA +@@ -319,78 +319,78 @@ + ; CHECK-AA-FUNCTION-INVALIDATE: Running pass: AAEvaluator + ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: AAManager + ; CHECK-AA-FUNCTION-INVALIDATE: Running analysis: BasicAA +-; CHECK-AA-FUNCTION-INVALIDATE: Finished llvm::Function pass manager run ++; CHECK-AA-FUNCTION-INVALIDATE: Finished Function pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require,function(require),invalidate,require,function(aa-eval)' -aa-pipeline='globals-aa' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-AA-MODULE-INVALIDATE +-; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Module pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Starting Module pass manager run + ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass + ; CHECK-AA-MODULE-INVALIDATE: Running analysis: GlobalsAA +-; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Function pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Starting Function pass manager run + ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass + ; CHECK-AA-MODULE-INVALIDATE: Running analysis: AAManager +-; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Finished Function pass manager run + ; CHECK-AA-MODULE-INVALIDATE: Running pass: InvalidateAnalysisPass + ; CHECK-AA-MODULE-INVALIDATE: Invalidating analysis: GlobalsAA + ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass + ; CHECK-AA-MODULE-INVALIDATE: Running analysis: GlobalsAA +-; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Function pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Starting Function pass manager run + ; CHECK-AA-MODULE-INVALIDATE: Running pass: AAEvaluator +-; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run +-; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Module pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Finished Function pass manager run ++; CHECK-AA-MODULE-INVALIDATE: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-MEMDEP +-; CHECK-MEMDEP: Starting llvm::Module pass manager run ++; CHECK-MEMDEP: Starting Module pass manager run + ; CHECK-MEMDEP: Running pass: RequireAnalysisPass + ; CHECK-MEMDEP: Running analysis: MemoryDependenceAnalysis +-; CHECK-MEMDEP: Finished llvm::Module pass manager run ++; CHECK-MEMDEP: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \ + ; RUN: -passes='require' \ + ; RUN: | FileCheck %s --check-prefix=CHECK-CALLGRAPH +-; CHECK-CALLGRAPH: Starting llvm::Module pass manager run ++; CHECK-CALLGRAPH: Starting Module pass manager run + ; CHECK-CALLGRAPH: Running pass: RequireAnalysisPass + ; CHECK-CALLGRAPH: Running analysis: CallGraphAnalysis +-; CHECK-CALLGRAPH: Finished llvm::Module pass manager run ++; CHECK-CALLGRAPH: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='default' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-O0 --check-prefix=%llvmcheckext +-; CHECK-O0: Starting llvm::Module pass manager run ++; CHECK-O0: Starting Module pass manager run + ; CHECK-O0-NEXT: Running pass: AlwaysInlinerPass + ; CHECK-O0-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> + ; CHECK-O0-NEXT: Running analysis: ProfileSummaryAnalysis +-; CHECK-EXT-NEXT: Starting llvm::Function pass manager run. ++; CHECK-EXT-NEXT: Starting Function pass manager run. + ; CHECK-EXT-NEXT: Running pass: {{.*}}Bye +-; CHECK-EXT-NEXT: Finished llvm::Function pass manager run. ++; CHECK-EXT-NEXT: Finished Function pass manager run. + ; We don't have checks for CHECK-NOEXT here, but this simplifies the test, while + ; avoiding FileCheck complaining about the unused prefix. + ; CHECK-NOEXT: {{.*}} +-; CHECK-O0-NEXT: Finished llvm::Module pass manager run ++; CHECK-O0-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='repeat<3>(no-op-module)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-REPEAT-MODULE-PASS +-; CHECK-REPEAT-MODULE-PASS: Starting llvm::Module pass manager run ++; CHECK-REPEAT-MODULE-PASS: Starting Module pass manager run + ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: RepeatedPass +-; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run + ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass +-; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run +-; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run + ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass +-; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run +-; CHECK-REPEAT-MODULE-PASS-NEXT: Starting llvm::Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Starting Module pass manager run + ; CHECK-REPEAT-MODULE-PASS-NEXT: Running pass: NoOpModulePass +-; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run +-; CHECK-REPEAT-MODULE-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run ++; CHECK-REPEAT-MODULE-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='cgscc(repeat<3>(no-op-cgscc))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-REPEAT-CGSCC-PASS +-; CHECK-REPEAT-CGSCC-PASS: Starting llvm::Module pass manager run ++; CHECK-REPEAT-CGSCC-PASS: Starting Module pass manager run + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(CGSCCAnalysisManager|AnalysisManager<.*LazyCallGraph::SCC.*>).*}},{{.*}}Module> + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(FunctionAnalysisManager|AnalysisManager<.*Function.*>).*}},{{.*}}Module> + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running analysis: LazyCallGraphAnalysis +@@ -409,40 +409,40 @@ + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Running pass: NoOpCGSCCPass + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished CGSCC pass manager run + ; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished CGSCC pass manager run +-; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-REPEAT-CGSCC-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='function(repeat<3>(no-op-function))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-REPEAT-FUNCTION-PASS +-; CHECK-REPEAT-FUNCTION-PASS: Starting llvm::Module pass manager run ++; CHECK-REPEAT-FUNCTION-PASS: Starting Module pass manager run + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: RepeatedPass +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Starting Function pass manager run + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running pass: NoOpFunctionPass +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Function pass manager run ++; CHECK-REPEAT-FUNCTION-PASS-NEXT: Finished Module pass manager run + + ; RUN: opt -disable-output -disable-verify -debug-pass-manager \ + ; RUN: -passes='loop(repeat<3>(no-op-loop))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-REPEAT-LOOP-PASS +-; CHECK-REPEAT-LOOP-PASS: Starting llvm::Module pass manager run ++; CHECK-REPEAT-LOOP-PASS: Starting Module pass manager run + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> +-; CHECK-REPEAT-LOOP-PASS-NEXT: Starting llvm::Function pass manager run +-; CHECK-REPEAT-LOOP-PASS-NEXT: Starting llvm::Function pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Starting Function pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Starting Function pass manager run + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: LoopSimplify + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: LoopAnalysis + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: DominatorTreeAnalysis + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: AssumptionAnalysis + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: LCSSAPass +-; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Function pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Function pass manager run + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: AAManager + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: TargetLibraryAnalysis + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: BasicAA +@@ -464,8 +464,8 @@ + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running pass: NoOpLoopPass + ; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Loop pass manager run + ; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Loop pass manager run +-; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Function pass manager run +-; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Function pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Module pass manager run + + define void @foo(i1 %x, i8* %p1, i8* %p2) { + entry: +diff -up llvm-12.0.1.src/test/Other/new-pm-defaults.ll~ llvm-12.0.1.src/test/Other/new-pm-defaults.ll +--- a/llvm-12.0.1.src/test/Other/new-pm-defaults.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/new-pm-defaults.ll 2023-01-31 21:00:54.693837282 -0700 +@@ -70,14 +70,14 @@ + ; Suppress FileCheck --allow-unused-prefixes=false diagnostics. + ; CHECK-Oz: {{^}} + +-; CHECK-O: Starting llvm::Module pass manager run. ++; CHECK-O: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: Annotation2Metadata + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass + ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass + ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running analysis: TargetIRAnalysis + ; CHECK-O-NEXT: Running analysis: AssumptionAnalysis +@@ -87,14 +87,14 @@ + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis + ; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass + ; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-EP-PIPELINE-EARLY-SIMPLIFICATION-NEXT: Running pass: NoOpModulePass + ; CHECK-O-NEXT: Running pass: IPSCCPPass + ; CHECK-O-NEXT: Running pass: CalledValuePropagationPass + ; CHECK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-O-NEXT: Running pass: PromotePass + ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis + ; CHECK-O-NEXT: Running analysis: AAManager +@@ -104,18 +104,18 @@ + ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy + ; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass + ; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA + ; CHECK-O-NEXT: Running analysis: GlobalsAA + ; CHECK-O-NEXT: Running analysis: CallGraphAnalysis + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ProfileSummaryAnalysis + ; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis +-; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy +-; CHECK-O-NEXT: Running analysis: LazyCallGraphAnalysis +-; CHECK-O-NEXT: Running analysis: FunctionAnalysisManagerCGSCCProxy ++; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy ++; CHECK-O-NEXT: Running analysis: LazyCallGraphAnalysis ++; CHECK-O-NEXT: Running analysis: FunctionAnalysisManagerCGSCCProxy + ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}> + ; CHECK-O-NEXT: Running pass: DevirtSCCRepeatedPass + ; CHECK-O-NEXT: Starting CGSCC pass manager run. +@@ -126,7 +126,7 @@ + ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-EP-CGSCC-LATE-NEXT: Running pass: NoOpCGSCCPass +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: SROA + ; CHECK-O-NEXT: Running pass: EarlyCSEPass + ; CHECK-O-NEXT: Running analysis: MemorySSAAnalysis +@@ -146,11 +146,11 @@ + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: ReassociatePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running analysis: LoopAnalysis + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis + ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Starting Loop pass manager run. +@@ -162,10 +162,10 @@ + ; CHECK-O-NEXT: Finished Loop pass manager run. + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Starting Loop pass manager run. + ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass + ; CHECK-O-NEXT: Running pass: IndVarSimplifyPass +@@ -194,34 +194,34 @@ + ; CHECK-O-NEXT: Running pass: ADCEPass + ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis + ; CHECK-O23SZ-NEXT: Running pass: DSEPass +-; CHECK-O23SZ-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O23SZ-NEXT: Starting Function pass manager run. + ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass +-; CHECK-O23SZ-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O23SZ-NEXT: Finished Function pass manager run. + ; CHECK-O23SZ-NEXT: Running pass: LICMPass + ; CHECK-EP-SCALAR-LATE-NEXT: Running pass: NoOpFunctionPass + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Finished CGSCC pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-DEFAULT-NEXT: Running pass: EliminateAvailableExternallyPass + ; CHECK-LTO-NOT: Running pass: EliminateAvailableExternallyPass + ; CHECK-O-NEXT: Running pass: ReversePostOrderFunctionAttrsPass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: Float2IntPass + ; CHECK-O-NEXT: Running pass: LowerConstantIntrinsicsPass on foo + ; CHECK-EP-VECTORIZER-START-NEXT: Running pass: NoOpFunctionPass + ; CHECK-EXT: Running pass: {{.*}}::Bye on foo + ; CHECK-NOEXT: {{^}} +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running pass: LoopRotatePass + ; CHECK-O-NEXT: Running pass: LoopDistributePass + ; CHECK-O-NEXT: Running pass: InjectTLIMappings +@@ -241,10 +241,10 @@ + ; CHECK-O-NEXT: Running pass: WarnMissedTransformationsPass + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running pass: LICMPass + ; CHECK-O-NEXT: Running pass: AlignmentFromAssumptionsPass + ; CHECK-O-NEXT: Running pass: LoopSinkPass +@@ -253,7 +253,7 @@ + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: SpeculateAroundPHIsPass + ; CHECK-EP-OPTIMIZER-LAST: Running pass: NoOpFunctionPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running pass: CGProfilePass + ; CHECK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-O-NEXT: Running pass: ConstantMergePass +@@ -276,7 +276,7 @@ + ; CHECK-O-NEXT: ret void + ; CHECK-O-NEXT: } + ; +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + + declare void @bar() local_unnamed_addr + +diff -up llvm-12.0.1.src/test/Other/new-pm-lto-defaults.ll~ llvm-12.0.1.src/test/Other/new-pm-lto-defaults.ll +--- a/llvm-12.0.1.src/test/Other/new-pm-lto-defaults.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/new-pm-lto-defaults.ll 2023-01-31 21:01:37.291980844 -0700 +@@ -23,19 +23,19 @@ + ; RUN: | FileCheck %s --check-prefix=CHECK-O --check-prefix=CHECK-O2 \ + ; RUN: --check-prefix=CHECK-O3 --check-prefix=CHECK-EP-Peephole + +-; CHECK-O: Starting llvm::Module pass manager run. ++; CHECK-O: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: Annotation2Metadata + ; CHECK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass + ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}Module + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis +-; CHECK-O2-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O2-NEXT: Starting Function pass manager run. + ; CHECK-O2-NEXT: Running pass: CallSiteSplittingPass on foo + ; CHECK-O2-NEXT: Running analysis: TargetLibraryAnalysis on foo + ; CHECK-O2-NEXT: Running analysis: TargetIRAnalysis on foo + ; CHECK-O2-NEXT: Running analysis: DominatorTreeAnalysis on foo +-; CHECK-O2-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O2-NEXT: Finished Function pass manager run. + ; CHECK-O2-NEXT: PGOIndirectCallPromotion + ; CHECK-O2-NEXT: Running analysis: ProfileSummaryAnalysis + ; CHECK-O2-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis +@@ -64,29 +64,29 @@ + ; CHECK-O2-NEXT: Running pass: PromotePass + ; CHECK-O2-NEXT: Running pass: ConstantMergePass + ; CHECK-O2-NEXT: Running pass: DeadArgumentEliminationPass +-; CHECK-O2-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O2-NEXT: Starting Function pass manager run. + ; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass + ; CHECK-O2-NEXT: Running pass: InstCombinePass + ; CHECK-EP-Peephole-NEXT: Running pass: NoOpFunctionPass +-; CHECK-O2-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O2-NEXT: Finished Function pass manager run. + ; CHECK-O2-NEXT: Running pass: ModuleInlinerWrapperPass + ; CHECK-O2-NEXT: Running analysis: InlineAdvisorAnalysis +-; CHECK-O2-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O2-NEXT: Starting Module pass manager run. + ; CHECK-O2-NEXT: Starting CGSCC pass manager run. + ; CHECK-O2-NEXT: Running pass: InlinerPass + ; CHECK-O2-NEXT: Running pass: InlinerPass + ; CHECK-O2-NEXT: Finished CGSCC pass manager run. +-; CHECK-O2-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O2-NEXT: Finished Module pass manager run. + ; CHECK-O2-NEXT: Running pass: GlobalOptPass + ; CHECK-O2-NEXT: Running pass: GlobalDCEPass +-; CHECK-O2-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O2-NEXT: Starting Function pass manager run. + ; CHECK-O2-NEXT: Running pass: InstCombinePass + ; CHECK-EP-Peephole-NEXT: Running pass: NoOpFunctionPass + ; CHECK-O2-NEXT: Running pass: JumpThreadingPass + ; CHECK-O2-NEXT: Running analysis: LazyValueAnalysis + ; CHECK-O2-NEXT: Running pass: SROA on foo + ; CHECK-O2-NEXT: Running pass: TailCallElimPass on foo +-; CHECK-O2-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O2-NEXT: Finished Function pass manager run. + ; CHECK-O2-NEXT: Running pass: PostOrderFunctionAttrsPass + ; CHECK-O2-NEXT: Running pass: GVN on foo + ; CHECK-O2-NEXT: Running analysis: MemoryDependenceAnalysis +@@ -127,7 +127,7 @@ + ; CHECK-O-NEXT: ret void + ; CHECK-O-NEXT: } + ; +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + + declare void @bar() local_unnamed_addr + +diff -up llvm-12.0.1.src/test/Other/new-pm-O0-defaults.ll~ llvm-12.0.1.src/test/Other/new-pm-O0-defaults.ll +--- a/llvm-12.0.1.src/test/Other/new-pm-O0-defaults.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/new-pm-O0-defaults.ll 2023-01-31 09:21:56.097327027 -0700 +@@ -26,7 +26,7 @@ + ; RUN: -passes='lto' -S %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-LTO + +-; CHECK: Starting llvm::Module pass manager run. ++; CHECK: Starting Module pass manager run. + ; CHECK-DEFAULT-NEXT: Running pass: AlwaysInlinerPass + ; CHECK-DEFAULT-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-DEFAULT-NEXT: Running analysis: ProfileSummaryAnalysis +@@ -57,7 +57,7 @@ + ; CHECK-NEXT: ret void + ; CHECK-NEXT: } + ; +-; CHECK-NEXT: Finished llvm::Module pass manager run. ++; CHECK-NEXT: Finished Module pass manager run. + + declare void @bar() local_unnamed_addr + +diff -up llvm-12.0.1.src/test/Other/new-pm-thinlto-defaults.ll~ llvm-12.0.1.src/test/Other/new-pm-thinlto-defaults.ll +--- a/llvm-12.0.1.src/test/Other/new-pm-thinlto-defaults.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/new-pm-thinlto-defaults.ll 2023-01-31 21:02:21.100100074 -0700 +@@ -50,7 +50,7 @@ + ; Suppress FileCheck --allow-unused-prefixes=false diagnostics. + ; CHECK-NOEXT: {{^}} + +-; CHECK-O: Starting llvm::Module pass manager run. ++; CHECK-O: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: Annotation2Metadata + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass +@@ -63,7 +63,7 @@ + ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass + ; CHECK-PRELINK-O-NODIS-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running analysis: TargetIRAnalysis + ; CHECK-O-NEXT: Running analysis: AssumptionAnalysis +@@ -73,14 +73,14 @@ + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis + ; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass + ; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-POSTLINK-O-NEXT: Running pass: LowerTypeTestsPass + ; CHECK-O-NEXT: Running pass: IPSCCPPass + ; CHECK-O-NEXT: Running pass: CalledValuePropagationPass + ; CHECK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-O-NEXT: Running pass: PromotePass + ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-PRELINK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis + ; CHECK-O-NEXT: Running analysis: AAManager +@@ -89,18 +89,18 @@ + ; CHECK-O-NEXT: Running analysis: TypeBasedAA + ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass + ; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA + ; CHECK-O-NEXT: Running analysis: GlobalsAA + ; CHECK-O-NEXT: Running analysis: CallGraphAnalysis + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ProfileSummaryAnalysis + ; CHECK-PRELINK-O-NEXT: Running analysis: ProfileSummaryAnalysis +-; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy +-; CHECK-O-NEXT: Running analysis: LazyCallGraphAnalysis +-; CHECK-O-NEXT: Running analysis: FunctionAnalysisManagerCGSCCProxy ++; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy ++; CHECK-O-NEXT: Running analysis: LazyCallGraphAnalysis ++; CHECK-O-NEXT: Running analysis: FunctionAnalysisManagerCGSCCProxy + ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy + ; CHECK-O-NEXT: Running pass: DevirtSCCRepeatedPass + ; CHECK-O-NEXT: Starting CGSCC pass manager run. +@@ -110,7 +110,7 @@ + ; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass + ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo) +-; CHECK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-O-NEXT: Starting Function pass manager run. + ; CHECK-O-NEXT: Running pass: SROA + ; CHECK-O-NEXT: Running pass: EarlyCSEPass + ; CHECK-O-NEXT: Running analysis: MemorySSAAnalysis +@@ -129,11 +129,11 @@ + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: ReassociatePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis +-; CHECK-O-NEXT: Starting llvm::Function pass manager run ++; CHECK-O-NEXT: Starting Function pass manager run + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running analysis: LoopAnalysis + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run ++; CHECK-O-NEXT: Finished Function pass manager run + ; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis + ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Starting Loop pass manager run. +@@ -145,10 +145,10 @@ + ; CHECK-O-NEXT: Finished Loop pass manager run. + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass +-; CHECK-O-NEXT: Starting llvm::Function pass manager run ++; CHECK-O-NEXT: Starting Function pass manager run + ; CHECK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O-NEXT: Running pass: LCSSAPass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run ++; CHECK-O-NEXT: Finished Function pass manager run + ; CHECK-O-NEXT: Starting Loop pass manager run. + ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass + ; CHECK-O-NEXT: Running pass: IndVarSimplifyPass +@@ -186,30 +186,30 @@ + ; CHECK-O-NEXT: Running pass: ADCEPass + ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis + ; CHECK-O23SZ-NEXT: Running pass: DSEPass +-; CHECK-O23SZ-NEXT: Starting llvm::Function pass manager run ++; CHECK-O23SZ-NEXT: Starting Function pass manager run + ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass + ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass +-; CHECK-O23SZ-NEXT: Finished llvm::Function pass manager run ++; CHECK-O23SZ-NEXT: Finished Function pass manager run + ; CHECK-O23SZ-NEXT: Running pass: LICMPass on Loop at depth 1 containing: %loop + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass +-; CHECK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-O-NEXT: Finished Function pass manager run. + ; CHECK-O-NEXT: Finished CGSCC pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-PRELINK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-POSTLINK-O-NEXT: Running pass: EliminateAvailableExternallyPass + ; CHECK-POSTLINK-O-NEXT: Running pass: ReversePostOrderFunctionAttrsPass + ; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA +-; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run. ++; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run. + ; CHECK-POSTLINK-O-NEXT: Running pass: Float2IntPass + ; CHECK-POSTLINK-O-NEXT: Running pass: LowerConstantIntrinsicsPass + ; CHECK-EXT: Running pass: {{.*}}::Bye +-; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run ++; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-POSTLINK-O-NEXT: Running pass: LCSSAPass +-; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run ++; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopRotatePass + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopDistributePass + ; CHECK-POSTLINK-O-NEXT: Running pass: InjectTLIMappings +@@ -229,10 +229,10 @@ + ; CHECK-POSTLINK-O-NEXT: Running pass: WarnMissedTransformationsPass + ; CHECK-POSTLINK-O-NEXT: Running pass: InstCombinePass + ; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis +-; CHECK-POSTLINK-O-NEXT: Starting llvm::Function pass manager run ++; CHECK-POSTLINK-O-NEXT: Starting Function pass manager run + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSimplifyPass + ; CHECK-POSTLINK-O-NEXT: Running pass: LCSSAPass +-; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run ++; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run + ; CHECK-POSTLINK-O-NEXT: Running pass: LICMPass + ; CHECK-POSTLINK-O-NEXT: Running pass: AlignmentFromAssumptionsPass + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSinkPass +@@ -240,7 +240,7 @@ + ; CHECK-POSTLINK-O-NEXT: Running pass: DivRemPairsPass + ; CHECK-POSTLINK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-POSTLINK-O-NEXT: Running pass: SpeculateAroundPHIsPass +-; CHECK-POSTLINK-O-NEXT: Finished llvm::Function pass manager run. ++; CHECK-POSTLINK-O-NEXT: Finished Function pass manager run. + ; CHECK-POSTLINK-O-NEXT: Running pass: CGProfilePass + ; CHECK-POSTLINK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-POSTLINK-O-NEXT: Running pass: ConstantMergePass +@@ -263,7 +263,7 @@ + ; CHECK-O-NEXT: ret void + ; CHECK-O-NEXT: } + ; +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + + declare void @bar() local_unnamed_addr + +diff -up llvm-12.0.1.src/test/Other/pass-pipeline-parsing.ll~ llvm-12.0.1.src/test/Other/pass-pipeline-parsing.ll +--- a/llvm-12.0.1.src/test/Other/pass-pipeline-parsing.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Other/pass-pipeline-parsing.ll 2023-01-31 21:03:07.091175412 -0700 +@@ -1,50 +1,50 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes=no-op-module,no-op-module %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TWO-NOOP-MP +-; CHECK-TWO-NOOP-MP: Starting llvm::Module pass manager run ++; CHECK-TWO-NOOP-MP: Starting Module pass manager run + ; CHECK-TWO-NOOP-MP: Running pass: NoOpModulePass + ; CHECK-TWO-NOOP-MP: Running pass: NoOpModulePass +-; CHECK-TWO-NOOP-MP: Finished llvm::Module pass manager run ++; CHECK-TWO-NOOP-MP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='module(no-op-module,no-op-module)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NESTED-TWO-NOOP-MP +-; CHECK-NESTED-TWO-NOOP-MP: Starting llvm::Module pass manager run ++; CHECK-NESTED-TWO-NOOP-MP: Starting Module pass manager run + ; CHECK-NESTED-TWO-NOOP-MP: Running pass: NoOpModulePass + ; CHECK-NESTED-TWO-NOOP-MP: Running pass: NoOpModulePass +-; CHECK-NESTED-TWO-NOOP-MP: Finished llvm::Module pass manager run ++; CHECK-NESTED-TWO-NOOP-MP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes=no-op-function,no-op-function %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TWO-NOOP-FP +-; CHECK-TWO-NOOP-FP: Starting llvm::Module pass manager run +-; CHECK-TWO-NOOP-FP: Starting llvm::Function pass manager run ++; CHECK-TWO-NOOP-FP: Starting Module pass manager run ++; CHECK-TWO-NOOP-FP: Starting Function pass manager run + ; CHECK-TWO-NOOP-FP: Running pass: NoOpFunctionPass + ; CHECK-TWO-NOOP-FP: Running pass: NoOpFunctionPass +-; CHECK-TWO-NOOP-FP: Finished llvm::Function pass manager run +-; CHECK-TWO-NOOP-FP: Finished llvm::Module pass manager run ++; CHECK-TWO-NOOP-FP: Finished Function pass manager run ++; CHECK-TWO-NOOP-FP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='function(no-op-function,no-op-function)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NESTED-TWO-NOOP-FP +-; CHECK-NESTED-TWO-NOOP-FP: Starting llvm::Module pass manager run +-; CHECK-NESTED-TWO-NOOP-FP: Starting llvm::Function pass manager run ++; CHECK-NESTED-TWO-NOOP-FP: Starting Module pass manager run ++; CHECK-NESTED-TWO-NOOP-FP: Starting Function pass manager run + ; CHECK-NESTED-TWO-NOOP-FP: Running pass: NoOpFunctionPass + ; CHECK-NESTED-TWO-NOOP-FP: Running pass: NoOpFunctionPass +-; CHECK-NESTED-TWO-NOOP-FP: Finished llvm::Function pass manager run +-; CHECK-NESTED-TWO-NOOP-FP: Finished llvm::Module pass manager run ++; CHECK-NESTED-TWO-NOOP-FP: Finished Function pass manager run ++; CHECK-NESTED-TWO-NOOP-FP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='no-op-module,function(no-op-function,no-op-function),no-op-module' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-MIXED-FP-AND-MP +-; CHECK-MIXED-FP-AND-MP: Starting llvm::Module pass manager run ++; CHECK-MIXED-FP-AND-MP: Starting Module pass manager run + ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpModulePass +-; CHECK-MIXED-FP-AND-MP: Starting llvm::Function pass manager run ++; CHECK-MIXED-FP-AND-MP: Starting Function pass manager run + ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpFunctionPass + ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpFunctionPass +-; CHECK-MIXED-FP-AND-MP: Finished llvm::Function pass manager run ++; CHECK-MIXED-FP-AND-MP: Finished Function pass manager run + ; CHECK-MIXED-FP-AND-MP: Running pass: NoOpModulePass +-; CHECK-MIXED-FP-AND-MP: Finished llvm::Module pass manager run ++; CHECK-MIXED-FP-AND-MP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -aa-pipeline= -passes='require' %s 2>&1 \ +@@ -126,43 +126,43 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes=no-op-cgscc,no-op-cgscc %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TWO-NOOP-CG +-; CHECK-TWO-NOOP-CG: Starting llvm::Module pass manager run ++; CHECK-TWO-NOOP-CG: Starting Module pass manager run + ; CHECK-TWO-NOOP-CG: Starting CGSCC pass manager run + ; CHECK-TWO-NOOP-CG: Running pass: NoOpCGSCCPass + ; CHECK-TWO-NOOP-CG: Running pass: NoOpCGSCCPass + ; CHECK-TWO-NOOP-CG: Finished CGSCC pass manager run +-; CHECK-TWO-NOOP-CG: Finished llvm::Module pass manager run ++; CHECK-TWO-NOOP-CG: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; 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 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NESTED-MP-CG-FP +-; CHECK-NESTED-MP-CG-FP: Starting llvm::Module pass manager run +-; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Module pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass +-; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run + ; CHECK-NESTED-MP-CG-FP: Starting CGSCC pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpCGSCCPass +-; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass +-; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpCGSCCPass + ; CHECK-NESTED-MP-CG-FP: Finished CGSCC pass manager run +-; CHECK-NESTED-MP-CG-FP: Starting llvm::Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Function pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpFunctionPass +-; CHECK-NESTED-MP-CG-FP: Finished llvm::Function pass manager run +-; CHECK-NESTED-MP-CG-FP: Finished llvm::Module pass manager run ++; CHECK-NESTED-MP-CG-FP: Finished Function pass manager run ++; CHECK-NESTED-MP-CG-FP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='no-op-loop,no-op-loop' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-TWO-NOOP-LOOP +-; CHECK-TWO-NOOP-LOOP: Starting llvm::Module pass manager run +-; CHECK-TWO-NOOP-LOOP: Starting llvm::Function pass manager run ++; CHECK-TWO-NOOP-LOOP: Starting Module pass manager run ++; CHECK-TWO-NOOP-LOOP: Starting Function pass manager run + ; CHECK-TWO-NOOP-LOOP: Starting Loop pass manager run + ; CHECK-TWO-NOOP-LOOP: Running pass: NoOpLoopPass + ; CHECK-TWO-NOOP-LOOP: Running pass: NoOpLoopPass + ; CHECK-TWO-NOOP-LOOP: Finished Loop pass manager run +-; CHECK-TWO-NOOP-LOOP: Finished llvm::Function pass manager run +-; CHECK-TWO-NOOP-LOOP: Finished llvm::Module pass manager run ++; CHECK-TWO-NOOP-LOOP: Finished Function pass manager run ++; CHECK-TWO-NOOP-LOOP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='module(function(loop(no-op-loop)))' %s 2>&1 \ +@@ -176,18 +176,18 @@ + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='no-op-loop' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-NESTED-FP-LP +-; CHECK-NESTED-FP-LP: Starting llvm::Module pass manager run +-; CHECK-NESTED-FP-LP: Starting llvm::Function pass manager run ++; CHECK-NESTED-FP-LP: Starting Module pass manager run ++; CHECK-NESTED-FP-LP: Starting Function pass manager run + ; CHECK-NESTED-FP-LP: Starting Loop pass manager run + ; CHECK-NESTED-FP-LP: Running pass: NoOpLoopPass + ; CHECK-NESTED-FP-LP: Finished Loop pass manager run +-; CHECK-NESTED-FP-LP: Finished llvm::Function pass manager run +-; CHECK-NESTED-FP-LP: Finished llvm::Module pass manager run ++; CHECK-NESTED-FP-LP: Finished Function pass manager run ++; CHECK-NESTED-FP-LP: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager -debug-pass-manager-verbose \ + ; RUN: -passes='module(no-op-function,no-op-loop,no-op-cgscc,cgscc(no-op-function,no-op-loop),function(no-op-loop))' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-ADAPTORS +-; CHECK-ADAPTORS: Starting llvm::Module pass manager run ++; CHECK-ADAPTORS: Starting Module pass manager run + ; CHECK-ADAPTORS: Running pass: ModuleToFunctionPassAdaptor + ; CHECK-ADAPTORS: Running pass: NoOpFunctionPass + ; CHECK-ADAPTORS: Running pass: ModuleToFunctionPassAdaptor +@@ -204,21 +204,21 @@ + ; CHECK-ADAPTORS: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop + ; CHECK-ADAPTORS: Finished CGSCC pass manager run + ; CHECK-ADAPTORS: Running pass: ModuleToFunctionPassAdaptor +-; CHECK-ADAPTORS: Starting llvm::Function pass manager run ++; CHECK-ADAPTORS: Starting Function pass manager run + ; CHECK-ADAPTORS: Running pass: FunctionToLoopPassAdaptor + ; CHECK-ADAPTORS: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop +-; CHECK-ADAPTORS: Finished llvm::Function pass manager run +-; CHECK-ADAPTORS: Finished llvm::Module pass manager run ++; CHECK-ADAPTORS: Finished Function pass manager run ++; CHECK-ADAPTORS: Finished Module pass manager run + + ; RUN: opt -disable-output -debug-pass-manager \ + ; RUN: -passes='cgscc(print)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-PRINT-IN-CGSCC +-; CHECK-PRINT-IN-CGSCC: Starting llvm::Module pass manager run ++; CHECK-PRINT-IN-CGSCC: Starting Module pass manager run + ; CHECK-PRINT-IN-CGSCC: Starting CGSCC pass manager run + ; CHECK-PRINT-IN-CGSCC: Running pass: PrintFunctionPass + ; CHECK-PRINT-IN-CGSCC: Finished CGSCC pass manager run + ; CHECK-PRINT-IN-CGSCC: Running pass: VerifierPass +-; CHECK-PRINT-IN-CGSCC: Finished llvm::Module pass manager run ++; CHECK-PRINT-IN-CGSCC: Finished Module pass manager run + + ; RUN: not opt -disable-output -debug-pass-manager \ + ; RUN: -passes='function(no-op-function)function(no-op-function)' %s 2>&1 \ +diff -up llvm-12.0.1.src/test/tools/gold/X86/new-pm.ll~ llvm-12.0.1.src/test/tools/gold/X86/new-pm.ll +--- a/llvm-12.0.1.src/test/tools/gold/X86/new-pm.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/tools/gold/X86/new-pm.ll 2023-01-31 09:23:47.508034774 -0700 +@@ -8,7 +8,7 @@ + ; RUN: --plugin-opt=cache-dir=%t.cache \ + ; RUN: -o %t2.o %t.o 2>&1 | FileCheck %s + +-; CHECK: Starting llvm::Module pass manager run ++; CHECK: Starting Module pass manager run + + ;; --plugin-opt=debug-pass-manager is a no-op for the legacy pass manager. + ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ +diff -up llvm-12.0.1.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll~ llvm-12.0.1.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll +--- a/llvm-12.0.1.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll 2023-01-31 21:03:56.347185129 -0700 +@@ -6,7 +6,7 @@ + ; First we check that the passes run in the way we expect. Otherwise this test + ; may stop testing anything. + ; +-; CHECK-LABEL: Starting llvm::Module pass manager run. ++; CHECK-LABEL: Starting Module pass manager run. + ; CHECK: Running pass: InlinerPass on (test1_f, test1_g, test1_h) + ; CHECK: Running analysis: DominatorTreeAnalysis on test1_f + ; CHECK: Running analysis: DominatorTreeAnalysis on test1_g +@@ -23,15 +23,15 @@ + ; CHECK: Invalidating analysis: BranchProbabilityAnalysis on test1_h + ; CHECK: Invalidating analysis: BlockFrequencyAnalysis on test1_h + ; CHECK-NOT: Invalidating analysis: +-; CHECK: Starting llvm::Function pass manager run. ++; CHECK: Starting Function pass manager run. + ; CHECK-NEXT: Running pass: DominatorTreeVerifierPass on test1_g + ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_g +-; CHECK-NEXT: Finished llvm::Function pass manager run. ++; CHECK-NEXT: Finished Function pass manager run. + ; CHECK-NOT: Invalidating analysis: +-; CHECK: Starting llvm::Function pass manager run. ++; CHECK: Starting Function pass manager run. + ; CHECK-NEXT: Running pass: DominatorTreeVerifierPass on test1_h + ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_h +-; CHECK-NEXT: Finished llvm::Function pass manager run. ++; CHECK-NEXT: Finished Function pass manager run. + ; CHECK-NOT: Invalidating analysis: + ; CHECK: Running pass: DominatorTreeVerifierPass on test1_f + ; CHECK-NEXT: Running analysis: DominatorTreeAnalysis on test1_f +diff -up llvm-12.0.1.src/test/Transforms/Inline/clear-analyses.ll~ llvm-12.0.1.src/test/Transforms/Inline/clear-analyses.ll +--- a/llvm-12.0.1.src/test/Transforms/Inline/clear-analyses.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/Inline/clear-analyses.ll 2023-01-31 09:23:37.442970831 -0700 +@@ -7,7 +7,7 @@ + ; RUN: -passes='cgscc(inline,function(correlated-propagation))' \ + ; RUN: | FileCheck %s + ; +-; CHECK-LABEL: Starting llvm::Module pass manager run. ++; CHECK-LABEL: Starting Module pass manager run. + ; CHECK: Running pass: InlinerPass on (callee) + ; CHECK: Running pass: CorrelatedValuePropagationPass on callee + ; CHECK: Running analysis: LazyValueAnalysis +diff -up llvm-12.0.1.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll~ llvm-12.0.1.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll +--- a/llvm-12.0.1.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll 2023-01-31 21:04:37.529357155 -0700 +@@ -5,7 +5,7 @@ + ; + ; RUN: opt -S -passes='loop(require),loop-unroll,loop(print-access-info)' -debug-pass-manager < %s 2>&1 | FileCheck %s + ; +-; CHECK: Starting llvm::Function pass manager run. ++; CHECK: Starting Function pass manager run. + ; CHECK: Running analysis: LoopAnalysis + ; CHECK: Running analysis: InnerAnalysisManagerProxy< + ; CHECK: Starting Loop pass manager run. +diff -up llvm-12.0.1.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll~ llvm-12.0.1.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll +--- a/llvm-12.0.1.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll 2023-01-31 09:23:42.613003676 -0700 +@@ -8,7 +8,7 @@ + + ; RUN: opt -passes='function(require),ipsccp,function(verify)' -S %s | FileCheck -check-prefixes='IR' %s + +-; NEW-PM: Starting llvm::Module pass manager run. ++; NEW-PM: Starting Module pass manager run. + ; NEW-PM: Running analysis: DominatorTreeAnalysis on f1 + ; NEW-PM: Running analysis: PostDominatorTreeAnalysis on f1 + ; NEW-PM: Running analysis: DominatorTreeAnalysis on f2 +diff -up llvm-12.0.1.src/test/Transforms/SCCP/preserve-analysis.ll~ llvm-12.0.1.src/test/Transforms/SCCP/preserve-analysis.ll +--- a/llvm-12.0.1.src/test/Transforms/SCCP/preserve-analysis.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/SCCP/preserve-analysis.ll 2023-01-31 21:05:21.240478345 -0700 +@@ -25,7 +25,7 @@ + ; NEW-PM-NOT: Running analysis: AssumptionAnalysis on test + ; NEW-PM-NOT: Running analysis: TargetLibraryAnalysis on test + ; NEW-PM-NOT: Running analysis: TargetIRAnalysis on test +-; NEW-PM: Finished llvm::Function pass manager run. ++; NEW-PM: Finished Function pass manager run. + + + define i32 @test() { +diff -up llvm-12.0.1.src/test/Transforms/SROA/dead-inst.ll~ llvm-12.0.1.src/test/Transforms/SROA/dead-inst.ll +--- a/llvm-12.0.1.src/test/Transforms/SROA/dead-inst.ll~ 2021-06-28 10:23:38.000000000 -0600 ++++ b/llvm-12.0.1.src/test/Transforms/SROA/dead-inst.ll 2023-01-31 21:05:58.128736685 -0700 +@@ -8,7 +8,7 @@ + ; CHECK: Invalidating analysis: DemandedBitsAnalysis on H + ; CHECK: Running pass: BDCEPass on H + ; CHECK: Running analysis: DemandedBitsAnalysis on H +-; CHECK: Finished llvm::Function pass manager run. ++; CHECK: Finished Function pass manager run. + + target datalayout = "e-m:e-i64:64-n32:64" + target triple = "powerpc64le-grtev4-linux-gnu"