[llvm-branch-commits] [llvm] 9f8de66 - [opt] Register only legacy-pinned pass names as options (#234529)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 11 01:51:54 PST 2026


Author: Fangrui Song
Date: 2026-11-10T19:10:47-08:00
New Revision: 9f8de66d127e144c0260edf2ec9ccac11a3c21f9

URL: https://github.com/llvm/llvm-project/commit/9f8de66d127e144c0260edf2ec9ccac11a3c21f9
DIFF: https://github.com/llvm/llvm-project/commit/9f8de66d127e144c0260edf2ec9ccac11a3c21f9.diff

LOG: [opt] Register only legacy-pinned pass names as options (#234529)

opt registers every legacy pass name as an option, but only names that
shouldPinPassToLegacyPM accepts can start the legacy pipeline. The other
206 of 600 still occupy option spellings; a library option with the same
spelling aborts opt at startup. Register only the pinned names.

```
Command                     Before                         After
opt -instcombine            "use -passes=" error           unknown argument
opt -arm-parallel-dsp -dce  runs both under the legacy PM  -dce is unknown
opt -codegenprepare         runs                           runs
opt -passes=instcombine     runs                           runs
```

Tests that ran an unpinned pass next to a pinned one now use -passes= or
pipe into a second opt.

LLM-aided

Added: 
    

Modified: 
    llvm/test/Analysis/ScalarEvolution/pr22856.ll
    llvm/test/CodeGen/AMDGPU/aa-points-to-constant-memory.ll
    llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll
    llvm/test/CodeGen/AMDGPU/infinite-loop.ll
    llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-unoptimized-debug-data.ll
    llvm/test/CodeGen/AMDGPU/multi-divergent-exit-region.ll
    llvm/test/CodeGen/AMDGPU/multilevel-break.ll
    llvm/test/CodeGen/AMDGPU/promote-kernel-arguments.ll
    llvm/test/CodeGen/AMDGPU/si-unify-exit-return-unreachable.ll
    llvm/test/CodeGen/AMDGPU/update-phi.ll
    llvm/test/CodeGen/ARM/ParallelDSP/aliasing.ll
    llvm/test/CodeGen/ARM/ParallelDSP/blocks.ll
    llvm/test/CodeGen/ARM/ParallelDSP/complex_dot_prod.ll
    llvm/test/CodeGen/ARM/ParallelDSP/inner-full-unroll.ll
    llvm/test/CodeGen/ARM/ParallelDSP/pr43073.ll
    llvm/test/CodeGen/ARM/ParallelDSP/self-ref-bug.ll
    llvm/test/CodeGen/ARM/ParallelDSP/sext-acc.ll
    llvm/test/CodeGen/ARM/ParallelDSP/squaring.ll
    llvm/test/CodeGen/DirectX/finalize-linkage-intrinsics.ll
    llvm/test/CodeGen/Hexagon/autohvx/vector-align-tbaa.ll
    llvm/test/CodeGen/NVPTX/lower-alloca.ll
    llvm/test/DebugInfo/X86/bitcast-di.ll
    llvm/test/DebugInfo/X86/codegenprepare-rollback.ll
    llvm/test/Other/opt-legacy-syntax-deprecation.ll
    llvm/test/Transforms/CodeGenPrepare/ARM/bitreverse-recognize.ll
    llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-hang.ll
    llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-recognize.ll
    llvm/test/Transforms/CodeGenPrepare/X86/fold-loop-of-urem.ll
    llvm/test/Transforms/CodeGenPrepare/X86/widen_switch.ll
    llvm/test/Transforms/CodeGenPrepare/dom-tree.ll
    llvm/test/Transforms/InstCombine/AMDGPU/memcpy-from-constant.ll
    llvm/test/Transforms/LoopStrengthReduce/hoist-parent-preheader.ll
    llvm/test/Transforms/LoopStrengthReduce/shl.ll
    llvm/test/Transforms/LoopUnroll/unroll-preserve-scev-lcssa.ll
    llvm/test/Transforms/SafeStack/X86/pointer-address-domtree.ll
    llvm/test/Transforms/StructurizeCFG/interleaved-loop-order.ll
    llvm/test/Transforms/StructurizeCFG/workarounds/needs-fr-ule.ll
    llvm/test/Transforms/StructurizeCFG/workarounds/needs-unified-loop-exits.ll
    llvm/tools/opt/optdriver.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/Analysis/ScalarEvolution/pr22856.ll b/llvm/test/Analysis/ScalarEvolution/pr22856.ll
index 52a67876487454..393cb4b4db3183 100644
--- a/llvm/test/Analysis/ScalarEvolution/pr22856.ll
+++ b/llvm/test/Analysis/ScalarEvolution/pr22856.ll
@@ -1,4 +1,4 @@
-; RUN: opt -loop-reduce -verify < %s
+; RUN: opt -loop-reduce -disable-output < %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64--linux-gnu"

diff  --git a/llvm/test/CodeGen/AMDGPU/aa-points-to-constant-memory.ll b/llvm/test/CodeGen/AMDGPU/aa-points-to-constant-memory.ll
index fce6105495a916..e8604fba6c593f 100644
--- a/llvm/test/CodeGen/AMDGPU/aa-points-to-constant-memory.ll
+++ b/llvm/test/CodeGen/AMDGPU/aa-points-to-constant-memory.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -amdgpu-aa-wrapper -amdgpu-aa -instcombine -o - %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=instcombine -o - %s | FileCheck %s
 ;
 ; Test AA::pointsToConstantMemory implementation. These should mostly
 ; turn out to be stores to constant memory, and will therefore be

diff  --git a/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll b/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll
index 972facac7f3131..d1afbc4a9c07db 100644
--- a/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll
+++ b/llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgpu-- -amdgpu-codegenprepare -amdgpu-codegenprepare-force-break-large-phis -verify %s | FileCheck  %s --check-prefixes=OPT
+; RUN: opt -S -mtriple=amdgpu-- -amdgpu-codegenprepare -amdgpu-codegenprepare-force-break-large-phis %s | FileCheck  %s --check-prefixes=OPT
 ; RUN: opt -S -mtriple=amdgpu-- -amdgpu-codegenprepare --global-isel %s | FileCheck  %s --check-prefixes=NOOPT
 ; RUN: opt -S -mtriple=amdgpu-- -amdgpu-codegenprepare -amdgpu-codegenprepare-break-large-phis=0 %s | FileCheck  %s --check-prefixes=NOOPT
 

diff  --git a/llvm/test/CodeGen/AMDGPU/infinite-loop.ll b/llvm/test/CodeGen/AMDGPU/infinite-loop.ll
index fea649f7efc6a5..d67c683000e902 100644
--- a/llvm/test/CodeGen/AMDGPU/infinite-loop.ll
+++ b/llvm/test/CodeGen/AMDGPU/infinite-loop.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
 ; RUN: llc -mtriple=amdgpu6.00 -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefix=SI %s
-; RUN: opt -mtriple=amdgpu6.00 -S -amdgpu-unify-divergent-exit-nodes -verify -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
+; RUN: opt -mtriple=amdgpu6.00 -S -amdgpu-unify-divergent-exit-nodes -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
 
 define amdgpu_kernel void @infinite_loop(ptr addrspace(1) %out) {
 ; SI-LABEL: infinite_loop:

diff  --git a/llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-unoptimized-debug-data.ll b/llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-unoptimized-debug-data.ll
index 38ba6d81e96a82..476d66ca1fece2 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-unoptimized-debug-data.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-buffer-fat-pointers-unoptimized-debug-data.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
-; RUN: opt -S -mattr=+unaligned-access-mode -amdgpu-lower-buffer-fat-pointers -check-debugify < %s | FileCheck %s
 ; RUN: opt -S -mattr=+unaligned-access-mode -passes=amdgpu-lower-buffer-fat-pointers,check-debugify < %s | FileCheck %s
+; RUN: opt -S -mattr=+unaligned-access-mode -amdgpu-lower-buffer-fat-pointers < %s | opt -S -passes=check-debugify | FileCheck %s
 
 target triple = "amdgpu9.00--"
 

diff  --git a/llvm/test/CodeGen/AMDGPU/multi-divergent-exit-region.ll b/llvm/test/CodeGen/AMDGPU/multi-divergent-exit-region.ll
index cac188ec5ba7fe..cf72432c21473d 100644
--- a/llvm/test/CodeGen/AMDGPU/multi-divergent-exit-region.ll
+++ b/llvm/test/CodeGen/AMDGPU/multi-divergent-exit-region.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mtriple=amdgpu6.00-- -S -lowerswitch -amdgpu-unify-divergent-exit-nodes -verify -structurizecfg -verify -si-annotate-control-flow -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
-; RUN: opt -mtriple=amdgpu11.00-- -mattr=+wavefrontsize64 -S -lowerswitch -amdgpu-unify-divergent-exit-nodes -verify -structurizecfg -verify -si-annotate-control-flow -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
+; RUN: opt -S -passes=lower-switch %s | opt -mtriple=amdgpu6.00-- -S -amdgpu-unify-divergent-exit-nodes -structurizecfg -si-annotate-control-flow -verify-each -simplifycfg-require-and-preserve-domtree=1 | FileCheck -check-prefix=IR %s
+; RUN: opt -S -passes=lower-switch %s | opt -mtriple=amdgpu11.00-- -mattr=+wavefrontsize64 -S -amdgpu-unify-divergent-exit-nodes -structurizecfg -si-annotate-control-flow -verify-each -simplifycfg-require-and-preserve-domtree=1 | FileCheck -check-prefix=IR %s
 ; RUN: llc -mtriple=amdgpu6.00 -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefix=GCN %s
 
 ; Add an extra verifier runs. There were some cases where invalid IR

diff  --git a/llvm/test/CodeGen/AMDGPU/multilevel-break.ll b/llvm/test/CodeGen/AMDGPU/multilevel-break.ll
index bedf9f01ab279c..abac4dec605e34 100644
--- a/llvm/test/CodeGen/AMDGPU/multilevel-break.ll
+++ b/llvm/test/CodeGen/AMDGPU/multilevel-break.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: opt -S -mtriple=amdgpu-- -lowerswitch -structurizecfg -si-annotate-control-flow < %s | FileCheck -check-prefix=OPT %s
+; RUN: opt -S -passes=lower-switch < %s | opt -S -mtriple=amdgpu-- -structurizecfg -si-annotate-control-flow | FileCheck -check-prefix=OPT %s
 ; RUN: llc -mtriple=amdgpu6.00 < %s | FileCheck -check-prefix=GCN %s
 
 ; Ensure two if.break calls, for both the inner and outer loops

diff  --git a/llvm/test/CodeGen/AMDGPU/promote-kernel-arguments.ll b/llvm/test/CodeGen/AMDGPU/promote-kernel-arguments.ll
index 60d6e55c70d008..d1b851845e8e0c 100644
--- a/llvm/test/CodeGen/AMDGPU/promote-kernel-arguments.ll
+++ b/llvm/test/CodeGen/AMDGPU/promote-kernel-arguments.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa < %s -amdgpu-promote-kernel-arguments -infer-address-spaces | FileCheck %s
 ; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa < %s -passes=amdgpu-promote-kernel-arguments,infer-address-spaces | FileCheck %s
-; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa < %s -amdgpu-promote-kernel-arguments -infer-address-spaces | llc | FileCheck -check-prefix=GCN %s
+; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa < %s -amdgpu-promote-kernel-arguments | opt -S -passes=infer-address-spaces | FileCheck %s
+; RUN: opt -S -mtriple=amdgpu9.00-amd-amdhsa < %s -amdgpu-promote-kernel-arguments | opt -S -passes=infer-address-spaces | llc | FileCheck -check-prefix=GCN %s
 
 ; GCN-LABEL: ptr_nest_3:
 ; GCN-COUNT-2: global_load_dwordx2

diff  --git a/llvm/test/CodeGen/AMDGPU/si-unify-exit-return-unreachable.ll b/llvm/test/CodeGen/AMDGPU/si-unify-exit-return-unreachable.ll
index e13bf977658a73..889782df48b644 100644
--- a/llvm/test/CodeGen/AMDGPU/si-unify-exit-return-unreachable.ll
+++ b/llvm/test/CodeGen/AMDGPU/si-unify-exit-return-unreachable.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
 ; RUN: llc -mtriple=amdgpu7.00-amd-amdhsa %s -o - | FileCheck -check-prefix=GCN %s
-; RUN: opt -mtriple=amdgpu7.00-amd-amdhsa -lowerswitch -amdgpu-unify-divergent-exit-nodes -verify -structurizecfg -verify -si-annotate-control-flow -verify -S %s -o - | FileCheck -check-prefix=IR %s
+; RUN: opt -passes=lower-switch -S -preserve-ll-uselistorder %s | opt -mtriple=amdgpu7.00-amd-amdhsa -amdgpu-unify-divergent-exit-nodes -structurizecfg -si-annotate-control-flow -verify-each -S -o - | FileCheck -check-prefix=IR %s
 
 ; A test with a divergent unreachable block and uniform return block. The
 ; compiler needs to create a regions that includes them so that

diff  --git a/llvm/test/CodeGen/AMDGPU/update-phi.ll b/llvm/test/CodeGen/AMDGPU/update-phi.ll
index 68e64b5824c67a..97e67b12533c40 100644
--- a/llvm/test/CodeGen/AMDGPU/update-phi.ll
+++ b/llvm/test/CodeGen/AMDGPU/update-phi.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgpu-- -S -amdgpu-unify-divergent-exit-nodes -verify -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
+; RUN: opt -mtriple=amdgpu-- -S -amdgpu-unify-divergent-exit-nodes -simplifycfg-require-and-preserve-domtree=1 %s | FileCheck -check-prefix=IR %s
 
 ; Make sure that the phi in n28 is updated when the block is split by unify
 ; divergent exit nodes.

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/aliasing.ll b/llvm/test/CodeGen/ARM/ParallelDSP/aliasing.ll
index 952696988f1762..4b2fe6e75275c5 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/aliasing.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/aliasing.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=armv8m.main-none-none-eabi -mattr=+dsp < %s -arm-parallel-dsp -verify -S | FileCheck %s
+; RUN: opt -mtriple=armv8m.main-none-none-eabi -mattr=+dsp < %s -arm-parallel-dsp -S | FileCheck %s
 ;
 ; Alias check: check that the rewrite isn't triggered when there's a store
 ; instruction possibly aliasing any mul load operands; arguments are passed

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/blocks.ll b/llvm/test/CodeGen/ARM/ParallelDSP/blocks.ll
index 5ca5fd61ce8dbc..23ffe9ad81a0fe 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/blocks.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/blocks.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -arm-parallel-dsp -dce -mtriple=armv7-a -S %s -o - | FileCheck %s
+; RUN: opt -arm-parallel-dsp -mtriple=armv7-a -S %s -o - | opt -S -passes=dce | FileCheck %s
 
 define i32 @single_block(ptr %a, ptr %b, i32 %acc) {
 ; CHECK-LABEL: @single_block(

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/complex_dot_prod.ll b/llvm/test/CodeGen/ARM/ParallelDSP/complex_dot_prod.ll
index 7d4be09cf2d939..c6efb51137c9ed 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/complex_dot_prod.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/complex_dot_prod.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -mtriple=thumbv7em -mcpu=cortex-m4 -O3 %s -o - | FileCheck %s --check-prefix=CHECK-LLC
-; RUN: opt -S -mtriple=armv7-a -arm-parallel-dsp -dce %s -o - | FileCheck %s --check-prefix=CHECK-OPT
+; RUN: opt -S -mtriple=armv7-a -arm-parallel-dsp %s -o - | opt -S -passes=dce | FileCheck %s --check-prefix=CHECK-OPT
 
 define dso_local arm_aapcscc void @complex_dot_prod(ptr nocapture readonly %pSrcA, ptr nocapture readonly %pSrcB, ptr nocapture %realResult, ptr nocapture %imagResult) {
 ; CHECK-LLC-LABEL: complex_dot_prod:

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/inner-full-unroll.ll b/llvm/test/CodeGen/ARM/ParallelDSP/inner-full-unroll.ll
index a6bff2685c9e89..ec322af241a264 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/inner-full-unroll.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/inner-full-unroll.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=thumbv7em -arm-parallel-dsp -dce -S %s -o - | FileCheck %s
+; RUN: opt -mtriple=thumbv7em -arm-parallel-dsp -S %s -o - | opt -S -passes=dce | FileCheck %s
 
 define void @full_unroll(ptr noalias nocapture %a, ptr noalias nocapture readonly %b, ptr noalias nocapture readonly %c, i32 %N) {
 ; CHECK-LABEL: @full_unroll(

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/pr43073.ll b/llvm/test/CodeGen/ARM/ParallelDSP/pr43073.ll
index 56aae8d197d508..5a6458a0c27d62 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/pr43073.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/pr43073.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=thumbv7-unknown-linux-gnueabihf -arm-parallel-dsp -dce %s -S -o - | FileCheck %s
+; RUN: opt -mtriple=thumbv7-unknown-linux-gnueabihf -arm-parallel-dsp %s -S -o - | opt -S -passes=dce | FileCheck %s
 
 define i32 @first_mul_invalid(ptr nocapture readonly %in, ptr nocapture readonly %b) {
 ; CHECK-LABEL: @first_mul_invalid(

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/self-ref-bug.ll b/llvm/test/CodeGen/ARM/ParallelDSP/self-ref-bug.ll
index aa410677b98f03..ad4766ba33e80c 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/self-ref-bug.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/self-ref-bug.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=thumbv7-unknown-linux-gnueabihf < %s -arm-parallel-dsp -verify -S | FileCheck %s
+; RUN: opt -mtriple=thumbv7-unknown-linux-gnueabihf < %s -arm-parallel-dsp -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
 

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/sext-acc.ll b/llvm/test/CodeGen/ARM/ParallelDSP/sext-acc.ll
index fdbe85b5b03956..3baca2feea1c71 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/sext-acc.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/sext-acc.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -arm-parallel-dsp -dce -mtriple=armv7-a -S %s -o - | FileCheck %s
+; RUN: opt -arm-parallel-dsp -mtriple=armv7-a -S %s -o - | opt -S -passes=dce | FileCheck %s
 
 define i64 @sext_acc_1(ptr %a, ptr %b, i32 %acc) {
 ; CHECK-LABEL: @sext_acc_1(

diff  --git a/llvm/test/CodeGen/ARM/ParallelDSP/squaring.ll b/llvm/test/CodeGen/ARM/ParallelDSP/squaring.ll
index 270d848e867c8a..c91fedd5444ca4 100644
--- a/llvm/test/CodeGen/ARM/ParallelDSP/squaring.ll
+++ b/llvm/test/CodeGen/ARM/ParallelDSP/squaring.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=armv8a-linux-gnueabihf -arm-parallel-dsp -dce --verify %s -S -o - | FileCheck %s
+; RUN: opt -mtriple=armv8a-linux-gnueabihf -arm-parallel-dsp %s -S -o - | opt -S -passes=dce | FileCheck %s
 
 define dso_local void @a() align 2 {
 ; CHECK-LABEL: @a(

diff  --git a/llvm/test/CodeGen/DirectX/finalize-linkage-intrinsics.ll b/llvm/test/CodeGen/DirectX/finalize-linkage-intrinsics.ll
index e2ac6094f0eb54..3567b3ef96bd9c 100644
--- a/llvm/test/CodeGen/DirectX/finalize-linkage-intrinsics.ll
+++ b/llvm/test/CodeGen/DirectX/finalize-linkage-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -dxil-finalize-linkage -verify -mtriple=dxil-unknown-shadermodel6.5-library %s
+; RUN: opt -S -dxil-finalize-linkage -mtriple=dxil-unknown-shadermodel6.5-library %s
 
 define float @f(float %f) "hlsl.export" {
   %x = call float @llvm.atan.f32(float %f)

diff  --git a/llvm/test/CodeGen/Hexagon/autohvx/vector-align-tbaa.ll b/llvm/test/CodeGen/Hexagon/autohvx/vector-align-tbaa.ll
index 4789ebcd7b25c0..6338e12c2e470f 100644
--- a/llvm/test/CodeGen/Hexagon/autohvx/vector-align-tbaa.ll
+++ b/llvm/test/CodeGen/Hexagon/autohvx/vector-align-tbaa.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=hexagon -S -hexagon-vc -instcombine -hvc-va-full-stores < %s | FileCheck %s
+; RUN: opt -mtriple=hexagon -S -hexagon-vc -hvc-va-full-stores < %s | opt -S -passes=instcombine | FileCheck %s
 
 ; Check that Hexagon Vector Combine propagates (TBAA) metadata to the
 ; generated output. (Use instcombine to clean the output up a bit.)

diff  --git a/llvm/test/CodeGen/NVPTX/lower-alloca.ll b/llvm/test/CodeGen/NVPTX/lower-alloca.ll
index 9261c3a99b17d8..66ff073e8aed50 100644
--- a/llvm/test/CodeGen/NVPTX/lower-alloca.ll
+++ b/llvm/test/CodeGen/NVPTX/lower-alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -nvptx-lower-alloca -infer-address-spaces | FileCheck %s
+; RUN: opt < %s -S -nvptx-lower-alloca | opt -S -passes=infer-address-spaces | FileCheck %s
 ; RUN: opt < %s -S -nvptx-lower-alloca | FileCheck %s --check-prefix LOWERALLOCAONLY
 ; RUN: llc < %s -mtriple=nvptx64 -mcpu=sm_35 | FileCheck %s --check-prefix PTX
 ; RUN: llc < %s -O0 -mtriple=nvptx64 -mcpu=sm_35 | FileCheck %s --check-prefix PTXO0

diff  --git a/llvm/test/DebugInfo/X86/bitcast-di.ll b/llvm/test/DebugInfo/X86/bitcast-di.ll
index f599cc9ca7db3e..99c6f41c4ed3da 100644
--- a/llvm/test/DebugInfo/X86/bitcast-di.ll
+++ b/llvm/test/DebugInfo/X86/bitcast-di.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=x86_64-unknown-linux-gnu -S -debugify -codegenprepare < %s | FileCheck %s
+; RUN: opt -S -passes=debugify < %s | opt -mtriple=x86_64-unknown-linux-gnu -S -codegenprepare | FileCheck %s
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
 target triple = "x86_64-unknown-linux-gnu"

diff  --git a/llvm/test/DebugInfo/X86/codegenprepare-rollback.ll b/llvm/test/DebugInfo/X86/codegenprepare-rollback.ll
index 7b2910ab18c2a8..af759e8c7009f1 100644
--- a/llvm/test/DebugInfo/X86/codegenprepare-rollback.ll
+++ b/llvm/test/DebugInfo/X86/codegenprepare-rollback.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -debugify -codegenprepare %s -o - | FileCheck %s --check-prefix=DEBUGIFY
+; RUN: opt -S -passes=debugify %s | opt -S -codegenprepare -o - | FileCheck %s --check-prefix=DEBUGIFY
 ;
 ; Copied from codegen-prepare-addrmode-sext.ll -- for the twoArgsNoPromotion
 ; function, CGP attempts a type promotion transaction on the sext to replace

diff  --git a/llvm/test/Other/opt-legacy-syntax-deprecation.ll b/llvm/test/Other/opt-legacy-syntax-deprecation.ll
index 50162b333524e0..164f6763a77bf3 100644
--- a/llvm/test/Other/opt-legacy-syntax-deprecation.ll
+++ b/llvm/test/Other/opt-legacy-syntax-deprecation.ll
@@ -2,10 +2,15 @@
 
 ; RUN: opt /dev/null -disable-output 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
 ; RUN: opt /dev/null -disable-output -passes=instcombine 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
-; RUN: not opt /dev/null -disable-output -instcombine 2>&1 | FileCheck %s --check-prefix=WARN
-; RUN: not opt /dev/null -disable-output -instcombine -always-inline 2>&1 | FileCheck %s --check-prefix=WARN
+; RUN: not opt /dev/null -disable-output -instcombine 2>&1 | FileCheck %s --check-prefixes=UNKNOWN,WARN
+; RUN: not opt /dev/null -disable-output -bogus 2>&1 | FileCheck %s --check-prefix=BOGUS --implicit-check-not='opt -passname'
+; RUN: not opt /dev/null -disable-output -passes=instcombine -codegenprepare -mtriple=x86_64-unknown-linux-gnu 2>&1 | FileCheck %s --check-prefix=WARN
 ; RUN: opt /dev/null -disable-output -codegenprepare -mtriple=x86_64-unknown-linux-gnu 2>&1 | FileCheck %s --check-prefix=OK --allow-empty
 
 ; OK-NOT: deprecated
 
+; UNKNOWN: Unknown command line argument '-instcombine'
+
+; BOGUS: Unknown command line argument '-bogus'
+
 ; WARN: The `opt -passname` syntax for the new pass manager is not supported, please use `opt -passes=<pipeline>` (or the `-p` alias for a more concise version).

diff  --git a/llvm/test/Transforms/CodeGenPrepare/ARM/bitreverse-recognize.ll b/llvm/test/Transforms/CodeGenPrepare/ARM/bitreverse-recognize.ll
index 189186ba9cf07d..b030bc8bfce25c 100644
--- a/llvm/test/Transforms/CodeGenPrepare/ARM/bitreverse-recognize.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/ARM/bitreverse-recognize.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -loop-unroll -codegenprepare < %s | FileCheck %s
+; RUN: opt -S -passes=loop-unroll < %s | opt -S -codegenprepare | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 target triple = "armv7--linux-gnueabihf"

diff  --git a/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-hang.ll b/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-hang.ll
index 35115cf0ba7bb5..200909d4da4924 100644
--- a/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-hang.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-hang.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-unroll -codegenprepare -S -mtriple=x86_64 | FileCheck %s
+; RUN: opt < %s -passes=loop-unroll -S -mtriple=x86_64 | opt -codegenprepare -S -mtriple=x86_64 | FileCheck %s
 
 ; This test is a worst-case scenario for bitreversal/byteswap detection.
 ; After loop unrolling (the unrolled loop is unreadably large so it has been kept

diff  --git a/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-recognize.ll b/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-recognize.ll
index 8db2cd3ff29526..43cc95a40406ad 100644
--- a/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-recognize.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/bitreverse-recognize.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -loop-unroll -codegenprepare -S -mtriple=x86_64-- -mattr=+xop | FileCheck %s
+; RUN: opt < %s -passes=loop-unroll -S -mtriple=x86_64-- -mattr=+xop | opt -codegenprepare -S -mtriple=x86_64-- -mattr=+xop | FileCheck %s
 
 define i32 @bitreverse_i32(i32 %a) {
 ; CHECK-LABEL: @bitreverse_i32(

diff  --git a/llvm/test/Transforms/CodeGenPrepare/X86/fold-loop-of-urem.ll b/llvm/test/Transforms/CodeGenPrepare/X86/fold-loop-of-urem.ll
index f53127f015391e..dddabf3260dea1 100644
--- a/llvm/test/Transforms/CodeGenPrepare/X86/fold-loop-of-urem.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/fold-loop-of-urem.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
-; RUN: opt < %s -mtriple=x86_64-unknown-unknown --loop-simplify -codegenprepare -S | FileCheck %s
+; RUN: opt < %s -passes=loop-simplify -S -preserve-ll-uselistorder | opt -mtriple=x86_64-unknown-unknown -codegenprepare -S | FileCheck %s
 
 declare void @use.i32(i32)
 declare void @use.2xi64(<2 x i64>)

diff  --git a/llvm/test/Transforms/CodeGenPrepare/X86/widen_switch.ll b/llvm/test/Transforms/CodeGenPrepare/X86/widen_switch.ll
index 9d04c4be49f4bf..e24b020b0acfe2 100644
--- a/llvm/test/Transforms/CodeGenPrepare/X86/widen_switch.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/widen_switch.ll
@@ -1,7 +1,7 @@
 ;; x86 is chosen to show the transform when 8-bit and 16-bit registers are available.
 
 ; RUN: opt < %s -codegenprepare -S -mtriple=x86_64-unknown-unknown    | FileCheck %s --check-prefix=X86
-; RUN: opt < %s -debugify -codegenprepare -S -mtriple=x86_64-unknown-unknown | FileCheck %s --check-prefix=DEBUG
+; RUN: opt < %s -passes=debugify -S | opt -codegenprepare -S -mtriple=x86_64-unknown-unknown | FileCheck %s --check-prefix=DEBUG
 
 ; X86 prefers i32 over i16 for address calculation.
 

diff  --git a/llvm/test/Transforms/CodeGenPrepare/dom-tree.ll b/llvm/test/Transforms/CodeGenPrepare/dom-tree.ll
index 14360feee8bc31..20102827670d11 100644
--- a/llvm/test/Transforms/CodeGenPrepare/dom-tree.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/dom-tree.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: arm-registered-target
-; RUN: opt -S -loop-unroll -codegenprepare < %s -domtree -verify-dom-info | FileCheck %s
+; RUN: opt -S -passes=loop-unroll < %s | opt -S -codegenprepare -verify-dom-info | FileCheck %s
 ;
 ; Checks that the dom tree is properly invalidated after an operation that will
 ; invalidate it in CodeGenPrepare. If the domtree isn't properly invalidated,

diff  --git a/llvm/test/Transforms/InstCombine/AMDGPU/memcpy-from-constant.ll b/llvm/test/Transforms/InstCombine/AMDGPU/memcpy-from-constant.ll
index dd02c80fe849e2..f29154665a07f3 100644
--- a/llvm/test/Transforms/InstCombine/AMDGPU/memcpy-from-constant.ll
+++ b/llvm/test/Transforms/InstCombine/AMDGPU/memcpy-from-constant.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -amdgpu-aa-wrapper -amdgpu-aa -instcombine -o - %s | FileCheck %s
+; RUN: opt -mtriple=amdgpu-amd-amdhsa -S -passes=instcombine -o - %s | FileCheck %s
 
 ; Make sure the optimization from memcpy-from-global.ll happens, but
 ; the constant source is not a global variable.

diff  --git a/llvm/test/Transforms/LoopStrengthReduce/hoist-parent-preheader.ll b/llvm/test/Transforms/LoopStrengthReduce/hoist-parent-preheader.ll
index fa8df738bfe0d9..e73ab1fb0ef7d8 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/hoist-parent-preheader.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/hoist-parent-preheader.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-reduce -verify
+; RUN: opt < %s -loop-reduce -disable-output
 target triple = "x86_64-apple-darwin10"
 
 define void @myquicksort(ptr %a, i1 %arg) nounwind ssp {

diff  --git a/llvm/test/Transforms/LoopStrengthReduce/shl.ll b/llvm/test/Transforms/LoopStrengthReduce/shl.ll
index 390dd8a0a89bfc..7dfd587447692e 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/shl.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/shl.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
-; RUN: opt < %s -loop-reduce -gvn -S | FileCheck %s
+; RUN: opt < %s -loop-reduce -S | opt -passes=gvn -S | FileCheck %s
 
 target datalayout = "e-i64:64-v16:16-v32:32-n16:32:64"
 

diff  --git a/llvm/test/Transforms/LoopUnroll/unroll-preserve-scev-lcssa.ll b/llvm/test/Transforms/LoopUnroll/unroll-preserve-scev-lcssa.ll
index 205a51ae3739a6..693b5c5dab0100 100644
--- a/llvm/test/Transforms/LoopUnroll/unroll-preserve-scev-lcssa.ll
+++ b/llvm/test/Transforms/LoopUnroll/unroll-preserve-scev-lcssa.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -loop-reduce -loop-unroll -unroll-runtime -verify-scev -verify-loop-lcssa < %s -S | FileCheck %s
+; RUN: opt -loop-reduce < %s -S | opt -passes='print<scalar-evolution>,loop-unroll' -unroll-runtime -verify-scev -verify-loop-lcssa -S | FileCheck %s
 
 ; Test case for PR43458. We check that we do properly invalidate LCSSA phi
-; users in SCEV. Run -loop-reduce first, so SCEV is already populated.
+; users in SCEV. Run print<scalar-evolution> first, so SCEV is already populated.
 
 define void @spam() {
 ; CHECK-LABEL: @spam(
@@ -23,11 +23,6 @@ define void @spam() {
 ; CHECK:       bb24.preheader:
 ; CHECK-NEXT:    br label [[BB24:%.*]]
 ; CHECK:       bb24:
-; CHECK-NEXT:    [[TMP25:%.*]] = phi i64 [ [[TMP26:%.*]], [[BB24]] ], [ 0, [[BB24_PREHEADER]] ]
-; CHECK-NEXT:    [[TMP26]] = add nuw nsw i64 [[TMP25]], 1
-; CHECK-NEXT:    [[TMP27:%.*]] = icmp slt i64 [[TMP26]], [[TMP21]]
-; CHECK-NEXT:    br i1 [[TMP27]], label [[BB24]], label [[BB29_LOOPEXIT:%.*]]
-; CHECK:       bb29.loopexit:
 ; CHECK-NEXT:    br label [[BB29]]
 ; CHECK:       bb29:
 ; CHECK-NEXT:    ret void

diff  --git a/llvm/test/Transforms/SafeStack/X86/pointer-address-domtree.ll b/llvm/test/Transforms/SafeStack/X86/pointer-address-domtree.ll
index 18610f1543ea40..d685883bcada8d 100644
--- a/llvm/test/Transforms/SafeStack/X86/pointer-address-domtree.ll
+++ b/llvm/test/Transforms/SafeStack/X86/pointer-address-domtree.ll
@@ -1,9 +1,6 @@
 ; RUN: opt -mtriple=x86_64-pc-linux-android -safestack-use-pointer-address \
 ; RUN:   -passes='require<libcall-lowering-info>,function(require<domtree>,safe-stack,verify<domtree>)' \
 ; RUN:   -disable-output < %s
-; RUN: opt -mtriple=x86_64-pc-linux-android -safestack-use-pointer-address \
-; RUN:   -domtree -safe-stack -loops -verify-dom-info \
-; RUN:   -disable-output < %s
 
 @unsafe_stack_pointer_a = thread_local global ptr null
 @unsafe_stack_pointer_b = thread_local global ptr null

diff  --git a/llvm/test/Transforms/StructurizeCFG/interleaved-loop-order.ll b/llvm/test/Transforms/StructurizeCFG/interleaved-loop-order.ll
index 0894ce90cb80ea..862c7f6e5ccd71 100644
--- a/llvm/test/Transforms/StructurizeCFG/interleaved-loop-order.ll
+++ b/llvm/test/Transforms/StructurizeCFG/interleaved-loop-order.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -lowerswitch -structurizecfg %s -o - | FileCheck %s
+; RUN: opt -S -passes=lower-switch %s | opt -S -structurizecfg -o - | FileCheck %s
 
 ; This test have an outer loop containing an inner loop,
 ; for which there is an interleaved post-order traversal.
@@ -13,11 +13,11 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[B3_INV:%.*]] = xor i1 [[B3:%.*]], true
 ; CHECK-NEXT:    br label [[OUTER_LOOP_HEADER:%.*]]
-; CHECK:       Flow12:
+; CHECK:       Flow10:
 ; CHECK-NEXT:    br i1 [[TMP3:%.*]], label [[EXIT_TRUE:%.*]], label [[FLOW13:%.*]]
 ; CHECK:       exit.true:
 ; CHECK-NEXT:    br label [[FLOW13]]
-; CHECK:       Flow13:
+; CHECK:       Flow11:
 ; CHECK-NEXT:    br i1 [[TMP2:%.*]], label [[EXIT_FALSE:%.*]], label [[EXIT:%.*]]
 ; CHECK:       exit.false:
 ; CHECK-NEXT:    br label [[EXIT]]
@@ -25,7 +25,7 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK-NEXT:    br i1 [[B1:%.*]], label [[OUTER_LOOP_BODY:%.*]], label [[FLOW3:%.*]]
 ; CHECK:       outer.loop.body:
 ; CHECK-NEXT:    br label [[INNER_LOOP_HEADER:%.*]]
-; CHECK:       Flow3:
+; CHECK:       Flow1:
 ; CHECK-NEXT:    [[TMP1:%.*]] = phi i1 [ [[TMP16:%.*]], [[FLOW11:%.*]] ], [ true, [[OUTER_LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[TMP2]] = phi i1 [ [[TMP12:%.*]], [[FLOW11]] ], [ false, [[OUTER_LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[TMP3]] = phi i1 [ false, [[FLOW11]] ], [ true, [[OUTER_LOOP_HEADER]] ]
@@ -33,10 +33,10 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK:       inner.loop.header:
 ; CHECK-NEXT:    [[TMP4:%.*]] = phi i1 [ [[TMP8:%.*]], [[FLOW4:%.*]] ], [ false, [[OUTER_LOOP_BODY]] ]
 ; CHECK-NEXT:    br i1 [[B2:%.*]], label [[INNER_LOOP_BODY:%.*]], label [[FLOW4]]
-; CHECK:       Flow6:
+; CHECK:       Flow4:
 ; CHECK-NEXT:    [[TMP5:%.*]] = phi i1 [ false, [[INNER_LOOP_LATCH:%.*]] ], [ true, [[LEAFBLOCK:%.*]] ]
 ; CHECK-NEXT:    br label [[FLOW5:%.*]]
-; CHECK:       Flow7:
+; CHECK:       Flow5:
 ; CHECK-NEXT:    br i1 [[TMP10:%.*]], label [[INNER_LOOP_END:%.*]], label [[FLOW8:%.*]]
 ; CHECK:       inner.loop.end:
 ; CHECK-NEXT:    br label [[FLOW8]]
@@ -49,7 +49,7 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK-NEXT:    br i1 [[TMP6]], label [[INNER_LOOP_BODY_THEN:%.*]], label [[INNER_LOOP_COND:%.*]]
 ; CHECK:       inner.loop.body.then:
 ; CHECK-NEXT:    br label [[INNER_LOOP_COND]]
-; CHECK:       Flow4:
+; CHECK:       Flow2:
 ; CHECK-NEXT:    [[TMP7:%.*]] = phi i1 [ [[TMP17:%.*]], [[FLOW5]] ], [ true, [[INNER_LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[TMP8]] = phi i1 [ [[TMP18:%.*]], [[FLOW5]] ], [ [[TMP4]], [[INNER_LOOP_HEADER]] ]
 ; CHECK-NEXT:    [[TMP9:%.*]] = phi i1 [ [[TMP19:%.*]], [[FLOW5]] ], [ false, [[INNER_LOOP_HEADER]] ]
@@ -60,7 +60,7 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK:       NodeBlock:
 ; CHECK-NEXT:    [[PIVOT:%.*]] = icmp slt i32 [[X:%.*]], 1
 ; CHECK-NEXT:    br i1 [[PIVOT]], label [[LEAFBLOCK]], label [[FLOW5]]
-; CHECK:       Flow8:
+; CHECK:       Flow6:
 ; CHECK-NEXT:    [[TMP11:%.*]] = phi i1 [ true, [[INNER_LOOP_END]] ], [ false, [[FLOW7]] ]
 ; CHECK-NEXT:    br i1 [[TMP9]], label [[LEAFBLOCK1:%.*]], label [[FLOW9:%.*]]
 ; CHECK:       LeafBlock1:
@@ -69,24 +69,24 @@ define i1 @test_nested(i32 %x, i1 %b1, i1 %b2, i1 %b3) {
 ; CHECK:       LeafBlock:
 ; CHECK-NEXT:    [[SWITCHLEAF:%.*]] = icmp eq i32 [[X]], 0
 ; CHECK-NEXT:    br i1 [[SWITCHLEAF]], label [[INNER_LOOP_LATCH]], label [[FLOW6:%.*]]
-; CHECK:       Flow9:
+; CHECK:       Flow7:
 ; CHECK-NEXT:    [[TMP12]] = phi i1 [ [[TMP14:%.*]], [[FLOW10]] ], [ [[TMP8]], [[FLOW8]] ]
 ; CHECK-NEXT:    [[TMP13:%.*]] = phi i1 [ [[TMP15:%.*]], [[FLOW10]] ], [ [[TMP11]], [[FLOW8]] ]
 ; CHECK-NEXT:    br i1 [[TMP13]], label [[OUTER_LOOP_CLEANUP:%.*]], label [[FLOW11]]
 ; CHECK:       inner.loop.break:
 ; CHECK-NEXT:    br label [[FLOW10]]
-; CHECK:       Flow10:
+; CHECK:       Flow8:
 ; CHECK-NEXT:    [[TMP14]] = phi i1 [ false, [[INNER_LOOP_BREAK]] ], [ true, [[LEAFBLOCK1]] ]
 ; CHECK-NEXT:    [[TMP15]] = phi i1 [ true, [[INNER_LOOP_BREAK]] ], [ [[TMP11]], [[LEAFBLOCK1]] ]
 ; CHECK-NEXT:    br label [[FLOW9]]
 ; CHECK:       outer.loop.cleanup:
 ; CHECK-NEXT:    br label [[OUTER_LOOP_LATCH:%.*]]
-; CHECK:       Flow11:
+; CHECK:       Flow9:
 ; CHECK-NEXT:    [[TMP16]] = phi i1 [ false, [[OUTER_LOOP_LATCH]] ], [ true, [[FLOW9]] ]
 ; CHECK-NEXT:    br label [[FLOW3]]
 ; CHECK:       outer.loop.latch:
 ; CHECK-NEXT:    br label [[FLOW11]]
-; CHECK:       Flow5:
+; CHECK:       Flow3:
 ; CHECK-NEXT:    [[TMP17]] = phi i1 [ [[TMP5]], [[FLOW6]] ], [ true, [[NODEBLOCK]] ]
 ; CHECK-NEXT:    [[TMP18]] = phi i1 [ [[TMP5]], [[FLOW6]] ], [ [[TMP4]], [[NODEBLOCK]] ]
 ; CHECK-NEXT:    [[TMP19]] = phi i1 [ false, [[FLOW6]] ], [ true, [[NODEBLOCK]] ]

diff  --git a/llvm/test/Transforms/StructurizeCFG/workarounds/needs-fr-ule.ll b/llvm/test/Transforms/StructurizeCFG/workarounds/needs-fr-ule.ll
index 17e24ea7f6d9a7..eb9f812e3aa907 100644
--- a/llvm/test/Transforms/StructurizeCFG/workarounds/needs-fr-ule.ll
+++ b/llvm/test/Transforms/StructurizeCFG/workarounds/needs-fr-ule.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -fix-irreducible -unify-loop-exits -structurizecfg -S | FileCheck %s
+; RUN: opt < %s -fix-irreducible -S -preserve-ll-uselistorder | opt -passes=unify-loop-exits -S -preserve-ll-uselistorder | opt -structurizecfg -S | FileCheck %s
 define void @irreducible_mountain_bug(i1 %Pred0, i1 %Pred1, i1 %Pred2, i1 %Pred3, i1 %Pred4, i1 %Pred5, i1 %Pred6, i1 %Pred7, i1 %Pred8, i1 %Pred9, i1 %Pred10, i1 %Pred11, i1 %Pred12, i1 %Pred13) {
 ; CHECK-LABEL: @irreducible_mountain_bug(
 ; CHECK-NEXT:  entry:
@@ -13,32 +13,32 @@ define void @irreducible_mountain_bug(i1 %Pred0, i1 %Pred1, i1 %Pred2, i1 %Pred3
 ; CHECK-NEXT:    [[PRED12_INV:%.*]] = xor i1 [[PRED12:%.*]], true
 ; CHECK-NEXT:    [[PRED13_INV:%.*]] = xor i1 [[PRED13:%.*]], true
 ; CHECK-NEXT:    br i1 [[PRED0_INV]], label [[IF_THEN:%.*]], label [[FLOW22:%.*]]
-; CHECK:       Flow22:
+; CHECK:       Flow18:
 ; CHECK-NEXT:    [[TMP0:%.*]] = phi i1 [ false, [[FLOW5:%.*]] ], [ true, [[ENTRY:%.*]] ]
 ; CHECK-NEXT:    br i1 [[TMP0]], label [[IF_END:%.*]], label [[FLOW23:%.*]]
 ; CHECK:       if.end:
 ; CHECK-NEXT:    br i1 [[PRED1_INV]], label [[IF_ELSE:%.*]], label [[FLOW21:%.*]]
-; CHECK:       Flow21:
+; CHECK:       Flow17:
 ; CHECK-NEXT:    [[TMP1:%.*]] = phi i1 [ false, [[IF_ELSE]] ], [ true, [[IF_END]] ]
 ; CHECK-NEXT:    br i1 [[TMP1]], label [[IF_THEN7:%.*]], label [[IF_END16:%.*]]
 ; CHECK:       if.then7:
 ; CHECK-NEXT:    br label [[IF_END16]]
 ; CHECK:       if.else:
 ; CHECK-NEXT:    br label [[FLOW21]]
-; CHECK:       Flow23:
+; CHECK:       Flow19:
 ; CHECK-NEXT:    br label [[EXIT:%.*]]
 ; CHECK:       if.end16:
 ; CHECK-NEXT:    br i1 [[PRED2_INV]], label [[IF_THEN39:%.*]], label [[FLOW19:%.*]]
-; CHECK:       Flow19:
+; CHECK:       Flow15:
 ; CHECK-NEXT:    [[TMP2:%.*]] = phi i1 [ false, [[FLOW7:%.*]] ], [ true, [[IF_END16]] ]
 ; CHECK-NEXT:    br i1 [[TMP2]], label [[WHILE_COND_PREHEADER:%.*]], label [[FLOW20:%.*]]
 ; CHECK:       while.cond.preheader:
 ; CHECK-NEXT:    br label [[WHILE_COND:%.*]]
-; CHECK:       Flow20:
+; CHECK:       Flow16:
 ; CHECK-NEXT:    br label [[FLOW23]]
 ; CHECK:       while.cond:
 ; CHECK-NEXT:    br i1 [[PRED3_INV]], label [[LOR_RHS:%.*]], label [[FLOW15:%.*]]
-; CHECK:       Flow10:
+; CHECK:       Flow6:
 ; CHECK-NEXT:    [[TMP3:%.*]] = phi i1 [ false, [[WHILE_COND47:%.*]] ], [ true, [[WHILE_BODY63:%.*]] ]
 ; CHECK-NEXT:    [[TMP4:%.*]] = phi i1 [ [[PRED6:%.*]], [[WHILE_COND47]] ], [ false, [[WHILE_BODY63]] ]
 ; CHECK-NEXT:    br label [[FLOW9:%.*]]
@@ -46,7 +46,7 @@ define void @irreducible_mountain_bug(i1 %Pred0, i1 %Pred1, i1 %Pred2, i1 %Pred3
 ; CHECK-NEXT:    br label [[FLOW11:%.*]]
 ; CHECK:       while.body63:
 ; CHECK-NEXT:    br i1 [[PRED5_INV]], label [[WHILE_COND47]], label [[FLOW10:%.*]]
-; CHECK:       Flow9:
+; CHECK:       Flow5:
 ; CHECK-NEXT:    [[TMP5:%.*]] = phi i1 [ [[TMP3]], [[FLOW10]] ], [ poison, [[IRR_GUARD1:%.*]] ]
 ; CHECK-NEXT:    [[TMP9:%.*]] = phi i1 [ [[TMP4]], [[FLOW10]] ], [ true, [[IRR_GUARD1]] ]
 ; CHECK-NEXT:    br i1 [[TMP9]], label [[COND_TRUE49:%.*]], label [[FLOW11]]
@@ -54,7 +54,7 @@ define void @irreducible_mountain_bug(i1 %Pred0, i1 %Pred1, i1 %Pred2, i1 %Pred3
 ; CHECK-NEXT:    br label [[FLOW10]]
 ; CHECK:       cond.end61:
 ; CHECK-NEXT:    br label [[FLOW12:%.*]]
-; CHECK:       Flow17:
+; CHECK:       Flow13:
 ; CHECK-NEXT:    [[TMP11:%.*]] = phi i1 [ [[TMP20:%.*]], [[FLOW18:%.*]] ], [ [[DOTINV:%.*]], [[LOOP_EXIT_GUARD2:%.*]] ]
 ; CHECK-NEXT:    br label [[FLOW16:%.*]]
 ; CHECK:       if.then69:
@@ -77,56 +77,56 @@ define void @irreducible_mountain_bug(i1 %Pred0, i1 %Pred1, i1 %Pred2, i1 %Pred3
 ; CHECK-NEXT:    br label [[FLOW]]
 ; CHECK:       Flow:
 ; CHECK-NEXT:    br label [[FLOW5]]
-; CHECK:       Flow5:
+; CHECK:       Flow1:
 ; CHECK-NEXT:    br label [[FLOW22]]
-; CHECK:       Flow6:
+; CHECK:       Flow2:
 ; CHECK-NEXT:    br label [[FLOW7]]
-; CHECK:       Flow7:
+; CHECK:       Flow3:
 ; CHECK-NEXT:    br label [[FLOW19]]
-; CHECK:       Flow8:
+; CHECK:       Flow4:
 ; CHECK-NEXT:    br label [[FLOW20]]
 ; CHECK:       exit:
 ; CHECK-NEXT:    ret void
-; CHECK:       Flow15:
+; CHECK:       Flow11:
 ; CHECK-NEXT:    [[TMP13:%.*]] = phi i1 [ true, [[LOR_RHS]] ], [ false, [[WHILE_COND]] ]
 ; CHECK-NEXT:    [[TMP14:%.*]] = phi i1 [ [[PRED9:%.*]], [[LOR_RHS]] ], [ true, [[WHILE_COND]] ]
 ; CHECK-NEXT:    br i1 [[TMP14]], label [[IRR_GUARD:%.*]], label [[FLOW16]]
 ; CHECK:       irr.guard:
 ; CHECK-NEXT:    [[GUARD_COND_END61:%.*]] = phi i1 [ true, [[FLOW13:%.*]] ], [ [[TMP13]], [[FLOW15]] ]
 ; CHECK-NEXT:    br i1 [[GUARD_COND_END61]], label [[COND_END61:%.*]], label [[FLOW12]]
-; CHECK:       Flow12:
+; CHECK:       Flow8:
 ; CHECK-NEXT:    [[TMP17:%.*]] = phi i1 [ true, [[COND_END61]] ], [ false, [[IRR_GUARD]] ]
 ; CHECK-NEXT:    [[TMP18:%.*]] = phi i1 [ [[PRED7:%.*]], [[COND_END61]] ], [ true, [[IRR_GUARD]] ]
 ; CHECK-NEXT:    br i1 [[TMP18]], label [[IRR_GUARD1]], label [[FLOW13]]
 ; CHECK:       irr.guard1:
 ; CHECK-NEXT:    [[GUARD_WHILE_BODY63:%.*]] = phi i1 [ true, [[FLOW11]] ], [ [[TMP17]], [[FLOW12]] ]
 ; CHECK-NEXT:    br i1 [[GUARD_WHILE_BODY63]], label [[WHILE_BODY63]], label [[FLOW9]]
-; CHECK:       Flow18:
+; CHECK:       Flow14:
 ; CHECK-NEXT:    [[TMP20]] = phi i1 [ [[PRED8:%.*]], [[IF_THEN69:%.*]] ], [ [[DOTINV]], [[LOOP_EXIT_GUARD3:%.*]] ]
 ; CHECK-NEXT:    br label [[FLOW17:%.*]]
 ; CHECK:       loop.exit.guard:
 ; CHECK-NEXT:    br i1 [[TMP21:%.*]], label [[WHILE_END76:%.*]], label [[FLOW8]]
-; CHECK:       Flow16:
+; CHECK:       Flow12:
 ; CHECK-NEXT:    [[TMP21]] = phi i1 [ false, [[FLOW17]] ], [ true, [[FLOW15]] ]
 ; CHECK-NEXT:    [[TMP22:%.*]] = phi i1 [ [[TMP11]], [[FLOW17]] ], [ true, [[FLOW15]] ]
 ; CHECK-NEXT:    br i1 [[TMP22]], label [[LOOP_EXIT_GUARD:%.*]], label [[WHILE_COND]]
-; CHECK:       loop.exit.guard2:
+; CHECK:       loop.exit.guard1:
 ; CHECK-NEXT:    br i1 [[DOTINV]], label [[LOOP_EXIT_GUARD3]], label [[FLOW17]]
-; CHECK:       loop.exit.guard3:
+; CHECK:       loop.exit.guard2:
 ; CHECK-NEXT:    br i1 [[DOTINV14:%.*]], label [[IF_THEN69]], label [[FLOW18]]
-; CHECK:       Flow11:
+; CHECK:       Flow7:
 ; CHECK-NEXT:    [[TMP24:%.*]] = phi i1 [ true, [[COND_TRUE49]] ], [ [[TMP5]], [[FLOW9]] ]
 ; CHECK-NEXT:    [[TMP16:%.*]] = phi i1 [ false, [[COND_TRUE49]] ], [ true, [[FLOW9]] ]
 ; CHECK-NEXT:    [[TMP27:%.*]] = phi i1 [ [[PRED4:%.*]], [[COND_TRUE49]] ], [ true, [[FLOW9]] ]
 ; CHECK-NEXT:    br i1 [[TMP27]], label [[LOOP_EXIT_GUARD4:%.*]], label [[IRR_GUARD1]]
-; CHECK:       Flow13:
+; CHECK:       Flow9:
 ; CHECK-NEXT:    [[TMP29:%.*]] = phi i1 [ [[TMP16]], [[LOOP_EXIT_GUARD4]] ], [ false, [[FLOW12]] ]
 ; CHECK-NEXT:    [[TMP30:%.*]] = phi i1 [ false, [[LOOP_EXIT_GUARD4]] ], [ true, [[FLOW12]] ]
 ; CHECK-NEXT:    [[TMP32:%.*]] = phi i1 [ [[TMP24]], [[LOOP_EXIT_GUARD4]] ], [ true, [[FLOW12]] ]
 ; CHECK-NEXT:    [[DOTINV14]] = xor i1 [[TMP29]], true
 ; CHECK-NEXT:    [[DOTINV]] = xor i1 [[TMP30]], true
 ; CHECK-NEXT:    br i1 [[TMP32]], label [[LOOP_EXIT_GUARD2]], label [[IRR_GUARD]]
-; CHECK:       loop.exit.guard4:
+; CHECK:       loop.exit.guard3:
 ; CHECK-NEXT:    br label [[FLOW13]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/StructurizeCFG/workarounds/needs-unified-loop-exits.ll b/llvm/test/Transforms/StructurizeCFG/workarounds/needs-unified-loop-exits.ll
index ff989a655d54a5..bec4b955188298 100644
--- a/llvm/test/Transforms/StructurizeCFG/workarounds/needs-unified-loop-exits.ll
+++ b/llvm/test/Transforms/StructurizeCFG/workarounds/needs-unified-loop-exits.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -unify-loop-exits -structurizecfg -S | FileCheck %s
+; RUN: opt < %s -passes=unify-loop-exits -S | opt -structurizecfg -S | FileCheck %s
 
 ; The structurizer uses an RPO traversal over a region, along with a
 ; manual hack that is meant to sort ensure that blocks within a loop
@@ -27,7 +27,7 @@ define void @exiting-block(i1 %PredH1, i1 %PredB2, i1 %PredB1, i1 %PredH2) {
 ; CHECK-NEXT:    br label [[H1:%.*]]
 ; CHECK:       H1:
 ; CHECK-NEXT:    br i1 [[PREDH1_INV]], label [[B1:%.*]], label [[FLOW3:%.*]]
-; CHECK:       Flow3:
+; CHECK:       Flow2:
 ; CHECK-NEXT:    [[TMP1:%.*]] = phi i1 [ [[PREDB1:%.*]], [[B1]] ], [ [[PREDH1]], [[H1]] ]
 ; CHECK-NEXT:    br i1 [[TMP1]], label [[H2:%.*]], label [[FLOW4:%.*]]
 ; CHECK:       H2:
@@ -48,15 +48,15 @@ define void @exiting-block(i1 %PredH1, i1 %PredB2, i1 %PredB1, i1 %PredH2) {
 ; CHECK-NEXT:    br label [[EXIT:%.*]]
 ; CHECK:       exit:
 ; CHECK-NEXT:    ret void
-; CHECK:       Flow5:
+; CHECK:       Flow4:
 ; CHECK-NEXT:    [[TMP4:%.*]] = phi i1 [ false, [[L1:%.*]] ], [ true, [[LOOP_EXIT_GUARD1]] ]
 ; CHECK-NEXT:    br label [[FLOW4]]
 ; CHECK:       loop.exit.guard:
 ; CHECK-NEXT:    br i1 [[TMP6:%.*]], label [[C:%.*]], label [[EXIT]]
-; CHECK:       Flow2:
+; CHECK:       Flow1:
 ; CHECK-NEXT:    [[TMP5]] = phi i1 [ false, [[L2]] ], [ true, [[B2]] ]
 ; CHECK-NEXT:    br label [[FLOW]]
-; CHECK:       Flow4:
+; CHECK:       Flow3:
 ; CHECK-NEXT:    [[TMP6]] = phi i1 [ false, [[FLOW5]] ], [ true, [[FLOW3]] ]
 ; CHECK-NEXT:    [[TMP7:%.*]] = phi i1 [ [[TMP4]], [[FLOW5]] ], [ true, [[FLOW3]] ]
 ; CHECK-NEXT:    br i1 [[TMP7]], label [[LOOP_EXIT_GUARD:%.*]], label [[H1]]
@@ -118,13 +118,13 @@ define void @incorrect-backedge(i1 %PredH2, i1 %PredH3, i1 %PredL2, i1 %PredL13,
 ; CHECK-NEXT:    br i1 [[TMP2]], label [[LOOP_EXIT_GUARD2:%.*]], label [[H3]]
 ; CHECK:       L13:
 ; CHECK-NEXT:    br label [[FLOW3]]
-; CHECK:       Flow5:
+; CHECK:       Flow3:
 ; CHECK-NEXT:    [[TMP3:%.*]] = phi i1 [ [[TMP8:%.*]], [[LOOP_EXIT_GUARD1:%.*]] ], [ true, [[LOOP_EXIT_GUARD:%.*]] ]
 ; CHECK-NEXT:    [[TMP4:%.*]] = phi i1 [ false, [[LOOP_EXIT_GUARD1]] ], [ true, [[LOOP_EXIT_GUARD]] ]
 ; CHECK-NEXT:    br i1 [[TMP4]], label [[L1:%.*]], label [[FLOW6:%.*]]
 ; CHECK:       L1:
 ; CHECK-NEXT:    br label [[FLOW6]]
-; CHECK:       Flow6:
+; CHECK:       Flow4:
 ; CHECK-NEXT:    [[TMP5:%.*]] = phi i1 [ [[PREDL1:%.*]], [[L1]] ], [ [[TMP3]], [[FLOW5:%.*]] ]
 ; CHECK-NEXT:    br i1 [[TMP5]], label [[EXIT:%.*]], label [[H1]]
 ; CHECK:       exit:
@@ -133,11 +133,11 @@ define void @incorrect-backedge(i1 %PredH2, i1 %PredH3, i1 %PredL2, i1 %PredL13,
 ; CHECK-NEXT:    br i1 [[DOTINV:%.*]], label [[LOOP_EXIT_GUARD1]], label [[FLOW5]]
 ; CHECK:       loop.exit.guard1:
 ; CHECK-NEXT:    br label [[FLOW5]]
-; CHECK:       Flow3:
+; CHECK:       Flow1:
 ; CHECK-NEXT:    [[TMP6]] = phi i1 [ true, [[L13]] ], [ false, [[L2]] ]
 ; CHECK-NEXT:    [[TMP7]] = phi i1 [ [[PREDL13_INV]], [[L13]] ], [ true, [[L2]] ]
 ; CHECK-NEXT:    br label [[FLOW]]
-; CHECK:       Flow4:
+; CHECK:       Flow2:
 ; CHECK-NEXT:    [[TMP8]] = phi i1 [ [[TMP1]], [[LOOP_EXIT_GUARD2]] ], [ false, [[H2]] ]
 ; CHECK-NEXT:    [[TMP9:%.*]] = phi i1 [ false, [[LOOP_EXIT_GUARD2]] ], [ true, [[H2]] ]
 ; CHECK-NEXT:    [[TMP10:%.*]] = phi i1 [ [[TMP0]], [[LOOP_EXIT_GUARD2]] ], [ true, [[H2]] ]

diff  --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp
index aa46d98e2ef724..c71fcb2d85a47d 100644
--- a/llvm/tools/opt/optdriver.cpp
+++ b/llvm/tools/opt/optdriver.cpp
@@ -73,9 +73,20 @@ static codegen::RegisterCodeGenFlags CFG;
 static codegen::RegisterMTuneFlag MTF;
 static codegen::RegisterSaveStatsFlag SSF;
 
-// The OptimizationList is automatically populated with registered Passes by the
-// PassNameParser.
-static cl::list<const PassInfo *, bool, PassNameParser> PassList(cl::desc(
+static bool shouldPinPassToLegacyPM(StringRef Pass);
+
+namespace {
+// Register only the passes that the legacy pipeline accepts, so other pass
+// names do not occupy option spellings.
+struct PinnedPassNameParser : PassNameParser {
+  using PassNameParser::PassNameParser;
+  bool ignorablePassImpl(const PassInfo *P) const override {
+    return !shouldPinPassToLegacyPM(P->getPassArgument());
+  }
+};
+} // namespace
+
+static cl::list<const PassInfo *, bool, PinnedPassNameParser> PassList(cl::desc(
     "Optimizations available (use \"-passes=\" for the new pass manager)"));
 
 // This flag specifies a textual description of the optimization pass pipeline
@@ -393,14 +404,12 @@ static bool shouldPinPassToLegacyPM(StringRef Pass) {
   return llvm::is_contained(PassNameExact, Pass);
 }
 
-// For use in NPM transition.
-static bool shouldForceLegacyPM() {
-  for (const PassInfo *P : PassList) {
-    StringRef Arg = P->getPassArgument();
-    if (shouldPinPassToLegacyPM(Arg))
-      return true;
-  }
-  return false;
+static void printPassNameSyntaxError() {
+  errs() << "The `opt -passname` syntax for the new pass manager is "
+            "not supported, please use `opt -passes=<pipeline>` (or the `-p` "
+            "alias for a more concise version).\n";
+  errs() << "See https://llvm.org/docs/NewPassManager.html#invoking-opt "
+            "for more details on the pass pipeline syntax.\n\n";
 }
 
 //===----------------------------------------------------------------------===//
@@ -454,9 +463,22 @@ optMain(int argc, char **argv,
   cl::AddExtraVersionPrinter(sys::printDefaultTargetAndDetectedCPU);
 
   LLVMContext Context;
-  cl::parseCommandLineOptions(
-      Context.getLibraryOptions(), ArrayRef(argv, argc),
-      "llvm .bc -> .bc modular optimizer and analysis printer\n");
+  if (!cl::parseCommandLineOptions(
+          Context.getLibraryOptions(), ArrayRef(argv, argc),
+          "llvm .bc -> .bc modular optimizer and analysis printer\n",
+          &errs())) {
+    // Unpinned pass names are not options; point `opt -passname` users to
+    // -passes.
+    if (any_of(ArrayRef(argv + 1, argc - 1), [&](StringRef Arg) {
+          if (!Arg.consume_front("-"))
+            return false;
+          Arg.consume_front("-");
+          Arg = Arg.split('=').first;
+          return Registry.getPassInfo(Arg) && !shouldPinPassToLegacyPM(Arg);
+        }))
+      printPassNameSyntaxError();
+    return 1;
+  }
 
   SmallVector<PassPluginLibraryInfo, 0> Extensions;
   for (const std::string &Path : PassPlugins) {
@@ -470,16 +492,10 @@ optMain(int argc, char **argv,
   if (Error E = passPluginArguments(Extensions, PluginArgs))
     reportFatalUsageError(std::move(E));
 
-  // TODO: remove shouldForceLegacyPM().
-  const bool UseNPM =
-      !shouldForceLegacyPM() || PassPipeline.getNumOccurrences() > 0;
+  const bool UseNPM = PassList.empty() || PassPipeline.getNumOccurrences() > 0;
 
   if (UseNPM && !PassList.empty()) {
-    errs() << "The `opt -passname` syntax for the new pass manager is "
-              "not supported, please use `opt -passes=<pipeline>` (or the `-p` "
-              "alias for a more concise version).\n";
-    errs() << "See https://llvm.org/docs/NewPassManager.html#invoking-opt "
-              "for more details on the pass pipeline syntax.\n\n";
+    printPassNameSyntaxError();
     return 1;
   }
 


        


More information about the llvm-branch-commits mailing list