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/llvm11.spec b/llvm11.spec index 2614808..ac0fe4b 100644 --- a/llvm11.spec +++ b/llvm11.spec @@ -11,7 +11,7 @@ %global llvm_libdir %{_libdir}/%{name} %global build_llvm_libdir %{buildroot}%{llvm_libdir} #global rc_ver 2 -%global baserelease 1 +%global baserelease 16 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src %global maj_ver 11 %global min_ver 1 @@ -32,7 +32,9 @@ %global pkg_name llvm %global install_prefix /usr %global install_libdir %{_libdir} +%global pkg_bindir %{_bindir} %global pkg_libdir %{install_libdir} +%global exec_suffix %{nil} %endif %global targets_to_build "all" @@ -58,9 +60,12 @@ Source4: lit.fedora.cfg.py # Fix coreos-installer test crash on s390x (rhbz#1883457), https://reviews.llvm.org/D89034 Patch1: 0001-SystemZ-Use-LA-instead-of-AGR-in-eliminateFrameIndex.patch -Patch2: 0001-gcc11.patch +Patch2: 0001-gcc11.patch Patch3: 0001-SystemZ-Assign-the-full-space-for-promoted-and-split.patch Patch4: 0001-MemCpyOpt-Correctly-merge-alias-scopes-during-call-s.patch +Patch5: gcc12.patch +Patch6: typename.patch +Patch7: test-go-py-pipes.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -83,6 +88,7 @@ BuildRequires: valgrind-devel BuildRequires: libedit-devel # We need python3-devel for pathfix.py. BuildRequires: python3-devel +BuildRequires: python3-setuptools # For origin certification BuildRequires: gnupg2 @@ -144,6 +150,8 @@ Shared libraries for the LLVM compiler infrastructure. Summary: LLVM static libraries Conflicts: %{name}-devel < 8 +Provides: llvm-static(major) = %{maj_ver} + %description static Static libraries for the LLVM compiler infrastructure. @@ -179,7 +187,7 @@ LLVM's modified googletest sources. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{llvm_srcdir} -p2 -pathfix.py -i %{__python3} -pn \ +%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -i %{__python3} -pn \ test/BugPoint/compile-custom.ll.py \ tools/opt-viewer/*.py \ utils/update_cc_test_checks.py @@ -277,17 +285,13 @@ pathfix.py -i %{__python3} -pn \ %install %cmake_install +mkdir -p %{buildroot}/%{_bindir} %if %{without compat_build} -mkdir -p %{buildroot}/%{_bindir} -mv %{buildroot}/%{_bindir}/llvm-config %{buildroot}/%{_bindir}/llvm-config-%{__isa_bits} - -# ghost presence -touch %{buildroot}%{_bindir}/llvm-config # Fix some man pages -ln -s llvm-config.1 %{buildroot}%{_mandir}/man1/llvm-config-%{__isa_bits}.1 -mv %{buildroot}%{_mandir}/man1/tblgen.1 %{buildroot}%{_mandir}/man1/llvm-tblgen.1 +ln -s llvm-config.1 %{buildroot}%{_mandir}/man1/llvm-config%{exec_suffix}-%{__isa_bits}.1 +mv %{buildroot}%{_mandir}/man1/*tblgen.1 %{buildroot}%{_mandir}/man1/llvm-tblgen.1 # Install binaries needed for lit tests %global test_binaries llvm-isel-fuzzer llvm-opt-fuzzer @@ -378,7 +382,6 @@ ln -s %{_libdir}/LLVMgold.so %{buildroot}%{_libdir}/bfd-plugins/ %else # Add version suffix to binaries -mkdir -p %{buildroot}/%{_bindir} for f in %{buildroot}/%{install_bindir}/*; do filename=`basename $f` ln -s ../../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix} @@ -390,7 +393,6 @@ ln -s ../../../%{install_includedir}/llvm %{buildroot}/%{pkg_includedir}/llvm ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/llvm-c # Fix multi-lib -mv %{buildroot}%{_bindir}/llvm-config{%{exec_suffix},%{exec_suffix}-%{__isa_bits}} %multilib_fix_c_header --file %{install_includedir}/llvm/Config/llvm-config.h # Create ld.so.conf.d entry @@ -411,6 +413,26 @@ rm -Rf %{build_install_prefix}/share/opt-viewer %endif +# llvm-config special casing. llvm-config is managed by update-alternatives. +# the original file must remain available for compatibility with the CMake +# infrastructure. Without compat, cmake points to the symlink, with compat it +# points to the original file. + +%if %{without compat_build} + +mv %{buildroot}/%{pkg_bindir}/llvm-config %{buildroot}/%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} + +%else + +rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix} +(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} ) + +%endif + +# ghost presence +touch %{buildroot}%{_bindir}/llvm-config%{exec_suffix} + + %check # TODO: Fix the failures below @@ -426,27 +448,24 @@ LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir} %{__ninja} check-all -C %{_vpath_bui %ldconfig_scriptlets libs -%if %{without compat_build} - %post devel -%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config llvm-config %{_bindir}/llvm-config-%{__isa_bits} %{__isa_bits} +%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} %postun devel if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove llvm-config %{_bindir}/llvm-config-%{__isa_bits} + %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} fi -%endif - %files %license LICENSE.TXT %exclude %{_mandir}/man1/llvm-config* %{_mandir}/man1/* %{_bindir}/* +%exclude %{_bindir}/llvm-config%{exec_suffix} +%exclude %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} + %if %{without compat_build} -%exclude %{_bindir}/llvm-config -%exclude %{_bindir}/llvm-config-%{__isa_bits} %exclude %{_bindir}/not %exclude %{_bindir}/count %exclude %{_bindir}/yaml-bench @@ -455,7 +474,6 @@ fi %exclude %{_bindir}/llvm-opt-fuzzer %{_datadir}/opt-viewer %else -%exclude %{pkg_bindir}/llvm-config %{pkg_bindir} %endif @@ -482,18 +500,17 @@ fi %files devel %license LICENSE.TXT -%if %{without compat_build} -%ghost %{_bindir}/llvm-config -%{_bindir}/llvm-config-%{__isa_bits} + +%ghost %{_bindir}/llvm-config%{exec_suffix} +%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{_mandir}/man1/llvm-config* + +%if %{without compat_build} %{_includedir}/llvm %{_includedir}/llvm-c %{_libdir}/libLLVM.so %{_libdir}/cmake/llvm %else -%{_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} -%{pkg_bindir}/llvm-config -%{_mandir}/man1/llvm-config%{exec_suffix}.1.gz %{install_includedir}/llvm %{install_includedir}/llvm-c %{pkg_includedir}/llvm @@ -545,6 +562,55 @@ fi %endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 11.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 11.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 11.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 11.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 11.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 11.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jan 30 2023 Jerry James - 11.1.0-10 +- Add gcc12 patch to add includes needed for GCC 12 +- Add typename patch to fix test failures + +* Thu Jan 19 2023 Fedora Release Engineering - 11.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 11.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 11.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Miro Hrončok - 11.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + +* Thu Jul 22 2021 Fedora Release Engineering - 11.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed May 19 2021 sguelton@redhat.com - 11.1.0-5 +- Fix handling of llvm-config + +* Thu May 06 2021 sguelton@redhat.com - 11.1.0-4 +- Harmonize llvm-config handling with non-compat version + +* Tue Apr 27 2021 sguelton@redhat.com - 11.1.0-3 +- Fix llvm-config11 install path + +* Tue Apr 13 2021 sguelton@redhat.com - 11.1.0-2 +- Fix llvm-config-11 handling, see rhbz#1937816 + * Tue Mar 23 2021 Josh Stone - 11.1.0-1 - Update to 11.1.0 final - Add fixes for rustc codegen 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/tests/llvm-config/runtest.sh b/tests/llvm-config/runtest.sh new file mode 100755 index 0000000..9ac594f --- /dev/null +++ b/tests/llvm-config/runtest.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -ex + +echo '#include "llvm/Support/Error.h"' | clang++ -x c++ -E `llvm-config-11 --cxxflags` - diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..df40e5e --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,9 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - clang + tests: + - llvm-config diff --git a/typename.patch b/typename.patch new file mode 100644 index 0000000..a63366d --- /dev/null +++ b/typename.patch @@ -0,0 +1,1241 @@ +--- a/llvm-11.1.0.src/test/Other/new-pass-manager.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Other/new-pass-manager.ll 2023-01-30 13:24:35.062933071 -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 pass: ModuleToPostOrderCGSCCPassAdaptor + ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(CGSCCAnalysisManager|AnalysisManager<.*LazyCallGraph::SCC.*>).*}},{{.*}}Module> + ; CHECK-CGSCC-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*(FunctionAnalysisManager|AnalysisManager<.*Function.*>).*}},{{.*}}Module> +@@ -31,7 +31,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 \ +@@ -39,58 +39,58 @@ + ; 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 pass: ModuleToFunctionPassAdaptor + ; CHECK-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> + ; CHECK-FUNCTION-PASS-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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 pass: ModuleToFunctionPassAdaptor + ; 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 +@@ -112,40 +112,40 @@ + + ; RUN: opt -disable-output -debug-pass-manager -verify-each -passes='no-op-module,function(no-op-function)' %s 2>&1 \ + ; RUN: | FileCheck %s --check-prefix=CHECK-VERIFY-EACH +-; CHECK-VERIFY-EACH: Starting llvm::Module pass manager run ++; CHECK-VERIFY-EACH: Starting Module pass manager run + ; CHECK-VERIFY-EACH: Running pass: VerifierPass + ; CHECK-VERIFY-EACH: Running pass: NoOpModulePass + ; CHECK-VERIFY-EACH: Running pass: VerifierPass +-; CHECK-VERIFY-EACH: Starting llvm::Function pass manager run ++; CHECK-VERIFY-EACH: Starting Function pass manager run + ; CHECK-VERIFY-EACH: Running pass: NoOpFunctionPass + ; CHECK-VERIFY-EACH: Running pass: VerifierPass +-; CHECK-VERIFY-EACH: Finished llvm::Function pass manager run ++; CHECK-VERIFY-EACH: Finished Function pass manager run + ; CHECK-VERIFY-EACH: Running pass: VerifierPass +-; CHECK-VERIFY-EACH: Finished llvm::Module pass manager run ++; CHECK-VERIFY-EACH: Finished Module pass manager run + + ; 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 + +@@ -154,13 +154,13 @@ + ; 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 + ; CHECK-NO-OP-INVALIDATION-NOT: Invalidating all non-preserved analyses + + ; 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 +@@ -168,7 +168,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 +@@ -177,7 +177,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 +@@ -185,7 +185,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 +@@ -194,7 +194,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 +@@ -202,7 +202,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 +@@ -211,49 +211,49 @@ + ; 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: Starting llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL: Starting Module pass manager run + ; 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: Finished llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL: Finished Module pass manager run + ; 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: 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-NOT: Running analysis: NoOpModuleAnalysis + ; 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 +@@ -263,76 +263,76 @@ + ; CHECK-INVALIDATE-ALL-CG: Invalidating analysis: NoOpModuleAnalysis + ; CHECK-INVALIDATE-ALL-CG: Running pass: RequireAnalysisPass + ; CHECK-INVALIDATE-ALL-CG: Running analysis: NoOpModuleAnalysis +-; CHECK-INVALIDATE-ALL-CG: Finished llvm::Module pass manager run ++; CHECK-INVALIDATE-ALL-CG: Finished Module pass manager run + ; 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 +@@ -343,69 +343,69 @@ + ; 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-O0: Starting llvm::Module pass manager run +-; CHECK-O0-NEXT: Finished llvm::Module pass manager run ++; CHECK-O0: Starting 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 pass: ModuleToPostOrderCGSCCPassAdaptor + ; 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> +@@ -427,46 +427,46 @@ + ; 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 pass: ModuleToFunctionPassAdaptor + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> + ; CHECK-REPEAT-FUNCTION-PASS-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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 pass: ModuleToFunctionPassAdaptor + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> + ; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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: Running pass: FunctionToLoopPassAdaptor +-; 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: 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: Invalidating all non-preserved analyses + ; 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: ScalarEvolutionAnalysis +@@ -485,9 +485,9 @@ + ; 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 Function pass manager run + ; CHECK-REPEAT-LOOP-PASS-NEXT: Invalidating all non-preserved analyses +-; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Module pass manager run ++; CHECK-REPEAT-LOOP-PASS-NEXT: Finished Module pass manager run + + define void @foo(i1 %x, i8* %p1, i8* %p2) { + entry: +--- a/llvm-11.1.0.src/test/Other/new-pm-defaults.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Other/new-pm-defaults.ll 2023-01-30 13:24:40.029791656 -0700 +@@ -89,20 +89,20 @@ + ; RUN: --check-prefix=CHECK-EP-OPTIMIZER-LAST --check-prefix=CHECK-O23SZ + + ; CHECK-O: Running analysis: PassInstrumentationAnalysis +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}> +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}> +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass + ; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis + ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> + ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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 +@@ -112,24 +112,24 @@ + ; 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-O-NEXT: Running pass: IPSCCPPass + ; CHECK-O-NEXT: Running pass: CalledValuePropagationPass + ; CHECK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PromotePass> + ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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 + ; 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 +@@ -148,7 +148,7 @@ + ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O-NEXT: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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 +@@ -168,11 +168,11 @@ + ; CHECK-O-NEXT: Running pass: ReassociatePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis + ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}> +-; 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. +@@ -186,10 +186,10 @@ + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}> +-; 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: IndVarSimplifyPass + ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass +@@ -215,39 +215,39 @@ + ; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass + ; CHECK-O23SZ-NEXT: Running pass: DSEPass + ; CHECK-O23SZ-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass{{.*}}> +-; 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-EP-SCALAR-LATE-NEXT: Running pass: NoOpFunctionPass + ; CHECK-O-NEXT: Running pass: ADCEPass + ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis + ; 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-EP-CGSCC-LATE-NEXT: Running pass: NoOpCGSCCPass + ; CHECK-O-NEXT: Finished CGSCC pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}> +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: GlobalOptPass + ; CHECK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-O2-LTO-NOT: Running pass: EliminateAvailableExternallyPass + ; CHECK-O: Running pass: ReversePostOrderFunctionAttrsPass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopRotatePass +-; 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: LoopDistributePass + ; CHECK-O-NEXT: Running pass: InjectTLIMappings + ; CHECK-O-NEXT: Running pass: LoopVectorizePass +@@ -267,10 +267,10 @@ + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis + ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass +-; 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: AlignmentFromAssumptionsPass + ; CHECK-O-NEXT: Running pass: LoopSinkPass + ; CHECK-O-NEXT: Running pass: InstSimplifyPass +@@ -278,12 +278,12 @@ + ; 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 +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-O-NEXT: Running pass: PrintModulePass + ; + ; Make sure we get the IR back out without changes when we print the module. +@@ -300,7 +300,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 + +--- a/llvm-11.1.0.src/test/Other/new-pm-lto-defaults.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Other/new-pm-lto-defaults.ll 2023-01-30 13:24:44.607661317 -0700 +@@ -24,9 +24,9 @@ + ; RUN: --check-prefix=CHECK-O3 --check-prefix=CHECK-EP-Peephole + + ; CHECK-O: Running analysis: PassInstrumentationAnalysis +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: GlobalDCEPass + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass +@@ -36,12 +36,12 @@ + ; CHECK-O1-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PostOrderFunctionAttrsPass> + ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> + ; CHECK-O2-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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 +@@ -67,31 +67,31 @@ + ; CHECK-O2-NEXT: Running pass: ConstantMergePass + ; CHECK-O2-NEXT: Running pass: DeadArgumentEliminationPass + ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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-O2-NEXT: Running analysis: OuterAnalysisManagerProxy + ; 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: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PassManager{{.*}}> + ; CHECK-O2-NEXT: Starting CGSCC pass manager run. + ; 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: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}PostOrderFunctionAttrsPass> + ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> + ; CHECK-O2-NEXT: Running analysis: MemoryDependenceAnalysis +@@ -103,7 +103,7 @@ + ; CHECK-O2-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}SimplifyCFGPass> + ; CHECK-O2-NEXT: Running pass: EliminateAvailableExternallyPass + ; CHECK-O2-NEXT: Running pass: GlobalDCEPass +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-O-NEXT: Running pass: PrintModulePass + + ; Make sure we get the IR back out without changes when we print the module. +@@ -120,7 +120,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 + +--- a/llvm-11.1.0.src/test/Other/new-pm-thinlto-defaults.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Other/new-pm-thinlto-defaults.ll 2023-01-30 13:24:53.647403940 -0700 +@@ -48,15 +48,15 @@ + ; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,CHECK-POSTLINK-O,%llvmcheckext,CHECK-POSTLINK-O2 + ; + ; CHECK-O: Running analysis: PassInstrumentationAnalysis +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}> +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-O-NEXT: Running pass: ForceFunctionAttrsPass + ; CHECK-EP-PIPELINE-START-NEXT: Running pass: NoOpModulePass + ; CHECK-DIS-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}AddDiscriminatorsPass{{.*}}> + ; CHECK-DIS-NEXT: Running analysis: InnerAnalysisManagerProxy + ; CHECK-O-NEXT: Running pass: PassManager<{{.*}}Module{{.*}}> +-; CHECK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-O-NEXT: Starting Module pass manager run. + ; CHECK-POSTLINK-O-NEXT: Running pass: PGOIndirectCallPromotion + ; CHECK-POSTLINK-O-NEXT: Running analysis: ProfileSummaryAnalysis + ; CHECK-POSTLINK-O-NEXT: Running analysis: InnerAnalysisManagerProxy +@@ -68,7 +68,7 @@ + ; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> + ; CHECK-PRELINK-O-NEXT: Running analysis: PassInstrumentationAnalysis +-; 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 +@@ -78,7 +78,7 @@ + ; 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 +@@ -86,16 +86,16 @@ + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PromotePass> + ; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass + ; CHECK-O-NEXT: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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 + ; 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 +@@ -114,7 +114,7 @@ + ; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O3-NEXT: Running pass: OpenMPOptPass on (foo) + ; CHECK-O-NEXT: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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 +@@ -133,11 +133,11 @@ + ; CHECK-O-NEXT: Running pass: ReassociatePass + ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis + ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}> +-; 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. +@@ -151,10 +151,10 @@ + ; CHECK-O-NEXT: Running pass: SimplifyCFGPass + ; CHECK-O-NEXT: Running pass: InstCombinePass + ; CHECK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopStandardAnalysisResults{{.*}}> +-; 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: IndVarSimplifyPass + ; CHECK-O-NEXT: Running pass: LoopIdiomRecognizePass +@@ -189,36 +189,36 @@ + ; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass + ; CHECK-O23SZ-NEXT: Running pass: DSEPass + ; CHECK-O23SZ-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass{{.*}}> +-; 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-O-NEXT: Running pass: ADCEPass + ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis + ; 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 llvm::Module pass manager run. ++; CHECK-O-NEXT: Finished 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: PassManager<{{.*}}Module{{.*}}> +-; CHECK-POSTLINK-O-NEXT: Starting llvm::Module pass manager run. ++; CHECK-POSTLINK-O-NEXT: Starting Module pass manager run. + ; 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: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager{{.*}}> +-; 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: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopRotatePass +-; 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: LoopDistributePass + ; CHECK-POSTLINK-O-NEXT: Running pass: InjectTLIMappings + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopVectorizePass +@@ -238,22 +238,22 @@ + ; CHECK-POSTLINK-O-NEXT: Running pass: InstCombinePass + ; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis + ; CHECK-POSTLINK-O-NEXT: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass +-; 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: AlignmentFromAssumptionsPass + ; CHECK-POSTLINK-O-NEXT: Running pass: LoopSinkPass + ; CHECK-POSTLINK-O-NEXT: Running pass: InstSimplifyPass + ; 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 +-; CHECK-POSTLINK-O-NEXT: Finished llvm::Module pass manager run. +-; CHECK-O-NEXT: Finished llvm::Module pass manager run. ++; CHECK-POSTLINK-O-NEXT: Finished Module pass manager run. ++; CHECK-O-NEXT: Finished Module pass manager run. + ; CHECK-PRELINK-O-NEXT: Running pass: NameAnonGlobalPass + ; CHECK-O-NEXT: Running pass: PrintModulePass + +@@ -271,7 +271,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 + +--- a/llvm-11.1.0.src/test/Other/pass-pipeline-parsing.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Other/pass-pipeline-parsing.ll 2023-01-30 13:24:58.487266141 -0700 +@@ -1,55 +1,55 @@ + ; 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 llvm::Module pass manager run ++; CHECK-NESTED-TWO-NOOP-MP: Starting 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 llvm::Module pass manager run ++; CHECK-NESTED-TWO-NOOP-MP: Finished 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 Module pass manager run + ; CHECK-TWO-NOOP-FP: Running pass: ModuleToFunctionPassAdaptor +-; CHECK-TWO-NOOP-FP: Starting llvm::Function 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 Module pass manager run + ; CHECK-NESTED-TWO-NOOP-FP: Running pass: ModuleToFunctionPassAdaptor +-; CHECK-NESTED-TWO-NOOP-FP: Starting llvm::Function 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: Running pass: ModuleToFunctionPassAdaptor +-; 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: not opt -disable-output -debug-pass-manager \ + ; RUN: -passes='no-op-module)' %s 2>&1 \ +@@ -104,52 +104,52 @@ + ; 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: Running pass: ModuleToPostOrderCGSCCPassAdaptor + ; 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::Module pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Module pass manager run ++; CHECK-NESTED-MP-CG-FP: Starting Module pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: ModuleToFunctionPassAdaptor +-; 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: ModuleToPostOrderCGSCCPassAdaptor + ; CHECK-NESTED-MP-CG-FP: Starting CGSCC pass manager run + ; CHECK-NESTED-MP-CG-FP: Running pass: NoOpCGSCCPass + ; CHECK-NESTED-MP-CG-FP: Running pass: CGSCCToFunctionPassAdaptor +-; 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: Running pass: ModuleToFunctionPassAdaptor +-; 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 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 ++; 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 Module pass manager run + ; CHECK-TWO-NOOP-LOOP: Running pass: ModuleToFunctionPassAdaptor +-; CHECK-TWO-NOOP-LOOP: Starting llvm::Function pass manager run ++; CHECK-TWO-NOOP-LOOP: Starting Function pass manager run + ; CHECK-TWO-NOOP-LOOP: Running pass: FunctionToLoopPassAdaptor + ; 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 \ +@@ -163,15 +163,15 @@ + ; 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 Module pass manager run + ; CHECK-NESTED-FP-LP: Running pass: ModuleToFunctionPassAdaptor +-; CHECK-NESTED-FP-LP: Starting llvm::Function pass manager run ++; CHECK-NESTED-FP-LP: Starting Function pass manager run + ; CHECK-NESTED-FP-LP: Running pass: FunctionToLoopPassAdaptor + ; 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: not opt -disable-output -debug-pass-manager \ + ; RUN: -passes='function(no-op-function)function(no-op-function)' %s 2>&1 \ +--- a/llvm-11.1.0.src/test/tools/gold/X86/new-pm.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/tools/gold/X86/new-pm.ll 2023-01-30 12:37:32.440587840 -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 + + target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" + target triple = "x86_64-unknown-linux-gnu" +--- a/llvm-11.1.0.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/Inline/cgscc-incremental-invalidate.ll 2023-01-30 13:25:17.525724085 -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 +@@ -28,15 +28,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 +--- a/llvm-11.1.0.src/test/Transforms/Inline/clear-analyses.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/Inline/clear-analyses.ll 2023-01-30 12:36:39.834962017 -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 +--- a/llvm-11.1.0.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll 2023-01-30 13:25:30.614351430 -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 pass: FunctionToLoopPassAdaptor + ; CHECK: Running analysis: LoopAnalysis + ; CHECK: Running analysis: InnerAnalysisManagerProxy< +--- a/llvm-11.1.0.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/SCCP/ipsccp-preserve-analysis.ll 2023-01-30 12:37:07.353243177 -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 +--- a/llvm-11.1.0.src/test/Transforms/SCCP/preserve-analysis.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/SCCP/preserve-analysis.ll 2023-01-30 13:25:40.277076316 -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() { +--- a/llvm-11.1.0.src/test/Transforms/SROA/dead-inst.ll 2021-02-03 14:51:10.000000000 -0700 ++++ b/llvm-11.1.0.src/test/Transforms/SROA/dead-inst.ll 2023-01-30 13:25:45.916915740 -0700 +@@ -9,7 +9,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"