diff --git a/llvm/docs/Bugpoint.rst b/llvm/docs/Bugpoint.rst
index 2dd504520d50..ab6bf7004c28 100644
--- a/llvm/docs/Bugpoint.rst
+++ b/llvm/docs/Bugpoint.rst
@@ -158,9 +158,9 @@ non-obvious ways.  Here are some hints and tips:
   repeat until a bug is found or the user kills ``bugpoint``.
 
 * ``bugpoint`` can produce IR which contains long names. Run ``opt
-  -metarenamer`` over the IR to rename everything using easy-to-read,
-  metasyntactic names. Alternatively, run ``opt -strip -instnamer`` to rename
-  everything with very short (often purely numeric) names.
+  -passes=metarenamer`` over the IR to rename everything using easy-to-read,
+  metasyntactic names. Alternatively, run ``opt -passes=strip,instnamer`` to
+  rename everything with very short (often purely numeric) names.
 
 What to do when bugpoint isn't enough
 =====================================
diff --git a/llvm/test/CodeGen/X86/mmx-bitcast-fold.ll b/llvm/test/CodeGen/X86/mmx-bitcast-fold.ll
index 7d1987c1f6a7..0fa7b24ff445 100644
--- a/llvm/test/CodeGen/X86/mmx-bitcast-fold.ll
+++ b/llvm/test/CodeGen/X86/mmx-bitcast-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mtriple=x86_64-- -early-cse -earlycse-debug-hash < %s -S | FileCheck %s
+; RUN: opt -mtriple=x86_64-- -passes=early-cse -earlycse-debug-hash < %s -S | FileCheck %s
 
 ; CHECK: @foo(x86_mmx bitcast (double 0.000000e+00 to x86_mmx))
 
diff --git a/llvm/test/DebugInfo/Generic/dbg-value-lower-linenos.ll b/llvm/test/DebugInfo/Generic/dbg-value-lower-linenos.ll
index 892122df0f2f..cb46b1f813be 100644
--- a/llvm/test/DebugInfo/Generic/dbg-value-lower-linenos.ll
+++ b/llvm/test/DebugInfo/Generic/dbg-value-lower-linenos.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -mem2reg -instcombine | FileCheck %s
+; RUN: opt < %s -S -passes=mem2reg,instcombine | FileCheck %s
 
 ; The '%bar' alloca will be promoted to an SSA register by mem2reg: test that
 ; zero line number are assigned to the dbg.value intrinsics that are inserted
diff --git a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-1.ll b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-1.ll
index 37e53f206ad7..506ca048dc86 100644
--- a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-1.ll
+++ b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mem2reg %s -S -o - | FileCheck %s
+; RUN: opt -passes=mem2reg %s -S -o - | FileCheck %s
 
 ;; Check that mem2reg removes dbg.value(%param.addr, DIExpression(DW_OP_deref...))
 ;; when promoting the alloca %param.addr.
diff --git a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-2.ll b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-2.ll
index 4c14a426fb92..d8d41cb87c82 100644
--- a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-2.ll
+++ b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mem2reg %s -S -o - | FileCheck %s
+; RUN: opt -passes=mem2reg %s -S -o - | FileCheck %s
 
 ;; Check that mem2reg removes dbg.value(%local, DIExpression(DW_OP_deref...))
 ;; that instcombine LowerDbgDeclare inserted before the call to 'esc' when
diff --git a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-3.ll b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-3.ll
index 2d111c3cb682..d814000ac2bf 100644
--- a/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-3.ll
+++ b/llvm/test/DebugInfo/Generic/mem2reg-promote-alloca-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mem2reg %s -S -o - | FileCheck %s
+; RUN: opt -passes=mem2reg %s -S -o - | FileCheck %s
 
 ;; Check that mem2reg removes dbg.value(%local, DIExpression(DW_OP_deref...))
 ;; that instcombine LowerDbgDeclare inserted before the call to 'esc' when
diff --git a/llvm/test/DebugInfo/Generic/pr40628.ll b/llvm/test/DebugInfo/Generic/pr40628.ll
index af994de72506..90ebb86b2f43 100644
--- a/llvm/test/DebugInfo/Generic/pr40628.ll
+++ b/llvm/test/DebugInfo/Generic/pr40628.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S %s -o - | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S %s -o - | FileCheck %s
 
 ; PR40628: The first load below is determined to be redundant by EarlyCSE.
 ; During salvaging, the corresponding dbg.value could have a DW_OP_deref used
diff --git a/llvm/test/DebugInfo/X86/mem2reg_fp80.ll b/llvm/test/DebugInfo/X86/mem2reg_fp80.ll
index d557003dd220..b227a37aa25f 100644
--- a/llvm/test/DebugInfo/X86/mem2reg_fp80.ll
+++ b/llvm/test/DebugInfo/X86/mem2reg_fp80.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mem2reg -S | FileCheck %s
+; RUN: opt < %s -passes=mem2reg -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/DebugInfo/salvage-cast-debug-info.ll b/llvm/test/DebugInfo/salvage-cast-debug-info.ll
index c4f2111bddf2..c196bcd05267 100644
--- a/llvm/test/DebugInfo/salvage-cast-debug-info.ll
+++ b/llvm/test/DebugInfo/salvage-cast-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -debugify -early-cse -earlycse-debug-hash -S | FileCheck %s
+; RUN: opt %s -passes=debugify,early-cse -earlycse-debug-hash -S | FileCheck %s
 define i32 @foo(i64 %nose, i32 %more) {
 ; CHECK-LABEL: @foo(
 ; CHECK: call void @llvm.dbg.value(metadata i64 %nose, metadata [[V1:![0-9]+]], metadata !DIExpression(DW_OP_LLVM_convert, 64, DW_ATE_unsigned, DW_OP_LLVM_convert, 32, DW_ATE_unsigned
diff --git a/llvm/test/DebugInfo/salvage-overflow.ll b/llvm/test/DebugInfo/salvage-overflow.ll
index abb9e4f3d48a..d0333dcd4ecc 100644
--- a/llvm/test/DebugInfo/salvage-overflow.ll
+++ b/llvm/test/DebugInfo/salvage-overflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -sroa -early-cse -S | FileCheck %s
+; RUN: opt %s -passes=sroa,early-cse -S | FileCheck %s
 ; CHECK: DIExpression(DW_OP_constu, 9223372036854775808, DW_OP_minus, DW_OP_stack_value)
 ; Created from the following C input (and then delta-reduced the IR):
 ;
diff --git a/llvm/test/Feature/OperandBundles/special-state.ll b/llvm/test/Feature/OperandBundles/special-state.ll
index f51becaa5098..1b10f6a573b6 100644
--- a/llvm/test/Feature/OperandBundles/special-state.ll
+++ b/llvm/test/Feature/OperandBundles/special-state.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 ; This test isn't directly related to EarlyCSE or varargs.  It is just
 ; using these as a vehicle for testing the correctness of
diff --git a/llvm/test/Other/debugcounter-earlycse.ll b/llvm/test/Other/debugcounter-earlycse.ll
index daaf7c9e4a75..b3e74e05f8db 100644
--- a/llvm/test/Other/debugcounter-earlycse.ll
+++ b/llvm/test/Other/debugcounter-earlycse.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -S -debug-counter=early-cse-skip=1,early-cse-count=1 -early-cse -earlycse-debug-hash < %s 2>&1 | FileCheck %s
+; RUN: opt -S -debug-counter=early-cse-skip=1,early-cse-count=1 -passes=early-cse -earlycse-debug-hash < %s 2>&1 | FileCheck %s
 ;; Test that, with debug counters on, we only optimize the second CSE opportunity.
 define i32 @test(i32 %a, i32 %b) {
 ; CHECK-LABEL: @test(
diff --git a/llvm/test/Other/invariant.group.ll b/llvm/test/Other/invariant.group.ll
index 94b1bc7cd958..08edb4bbe5df 100644
--- a/llvm/test/Other/invariant.group.ll
+++ b/llvm/test/Other/invariant.group.ll
@@ -1,6 +1,6 @@
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
-; RUN: opt -S -gvn < %s | FileCheck %s
-; RUN: opt -S -newgvn < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=gvn < %s | FileCheck %s
+; RUN: opt -S -passes=newgvn < %s | FileCheck %s
 
 ; These tests checks if passes with CSE functionality can do CSE on
 ; launder.invariant.group, that is prohibited if there is a memory clobber
diff --git a/llvm/test/Transforms/CanonicalizeFreezeInLoops/phis.ll b/llvm/test/Transforms/CanonicalizeFreezeInLoops/phis.ll
index 333f754dc5bc..3d0b031de602 100644
--- a/llvm/test/Transforms/CanonicalizeFreezeInLoops/phis.ll
+++ b/llvm/test/Transforms/CanonicalizeFreezeInLoops/phis.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -canon-freeze -S | FileCheck %s
+; RUN: opt < %s -passes=canon-freeze -S | FileCheck %s
 ; A set of tests that have several phi nodes
 declare void @call(i32)
 declare i32 @call2()
diff --git a/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll b/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
index fbd9e77f16f4..08a13856c81b 100644
--- a/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
+++ b/llvm/test/Transforms/EarlyCSE/AMDGPU/intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -mtriple=amdgcn-- -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -mtriple=amdgcn-- -passes=early-cse -earlycse-debug-hash | FileCheck %s
 
 ; CHECK-LABEL: @no_cse
 ; CHECK: call i32 @llvm.amdgcn.s.buffer.load.i32(<4 x i32> %in, i32 0, i32 0)
diff --git a/llvm/test/Transforms/EarlyCSE/DirectX/create_handle.ll b/llvm/test/Transforms/EarlyCSE/DirectX/create_handle.ll
index c58072119156..8c4d1f409897 100644
--- a/llvm/test/Transforms/EarlyCSE/DirectX/create_handle.ll
+++ b/llvm/test/Transforms/EarlyCSE/DirectX/create_handle.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -early-cse -S | FileCheck %s
+; RUN: opt %s -passes=early-cse -S | FileCheck %s
 
 define void @fn() {
 entry:
diff --git a/llvm/test/Transforms/EarlyCSE/atan.ll b/llvm/test/Transforms/EarlyCSE/atan.ll
index e665e0c9e54d..2b7206c0a6aa 100644
--- a/llvm/test/Transforms/EarlyCSE/atan.ll
+++ b/llvm/test/Transforms/EarlyCSE/atan.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -S < %s | FileCheck %s
 
 ; We allow either sign to provide flexibility for mathlib
 ; implementations. The POSIX standard is not strict here.
diff --git a/llvm/test/Transforms/EarlyCSE/atomics.ll b/llvm/test/Transforms/EarlyCSE/atomics.ll
index 73bcab6069b7..da969612c760 100644
--- a/llvm/test/Transforms/EarlyCSE/atomics.ll
+++ b/llvm/test/Transforms/EarlyCSE/atomics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 define i32 @test12(i1 %B, ptr %P1, ptr %P2) {
diff --git a/llvm/test/Transforms/EarlyCSE/basic.ll b/llvm/test/Transforms/EarlyCSE/basic.ll
index 136bc102697e..0a743749cf3a 100644
--- a/llvm/test/Transforms/EarlyCSE/basic.ll
+++ b/llvm/test/Transforms/EarlyCSE/basic.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 ; RUN: opt < %s -S -passes=early-cse | FileCheck %s
 
diff --git a/llvm/test/Transforms/EarlyCSE/commute.ll b/llvm/test/Transforms/EarlyCSE/commute.ll
index 1b0512c17b1a..6aaaf992e441 100644
--- a/llvm/test/Transforms/EarlyCSE/commute.ll
+++ b/llvm/test/Transforms/EarlyCSE/commute.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 define void @test1(float %A, float %B, ptr %PA, ptr %PB) {
diff --git a/llvm/test/Transforms/EarlyCSE/conditional.ll b/llvm/test/Transforms/EarlyCSE/conditional.ll
index 70bd8c294feb..562aad78b2eb 100644
--- a/llvm/test/Transforms/EarlyCSE/conditional.ll
+++ b/llvm/test/Transforms/EarlyCSE/conditional.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 ; RUN: opt -passes='early-cse<memssa>' -S < %s | FileCheck %s
 
 ; Can we CSE a known condition to a constant?
diff --git a/llvm/test/Transforms/EarlyCSE/const-speculation.ll b/llvm/test/Transforms/EarlyCSE/const-speculation.ll
index 53138f5220f4..e98137de903f 100644
--- a/llvm/test/Transforms/EarlyCSE/const-speculation.ll
+++ b/llvm/test/Transforms/EarlyCSE/const-speculation.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S %s | FileCheck %s
 
 %mystruct = type { i32 }
 
diff --git a/llvm/test/Transforms/EarlyCSE/debug-info-undef.ll b/llvm/test/Transforms/EarlyCSE/debug-info-undef.ll
index 0665f73f2721..921fff196a31 100644
--- a/llvm/test/Transforms/EarlyCSE/debug-info-undef.ll
+++ b/llvm/test/Transforms/EarlyCSE/debug-info-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S %s -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt -S %s -passes=early-cse -earlycse-debug-hash | FileCheck %s
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 
diff --git a/llvm/test/Transforms/EarlyCSE/debuginfo-dce.ll b/llvm/test/Transforms/EarlyCSE/debuginfo-dce.ll
index 7bc5c06bf505..cd2abf559cd1 100644
--- a/llvm/test/Transforms/EarlyCSE/debuginfo-dce.ll
+++ b/llvm/test/Transforms/EarlyCSE/debuginfo-dce.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S %s -o - | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S %s -o - | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 ; Function Attrs: nounwind uwtable
diff --git a/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll b/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll
index 16853e9e9e41..bdfad0d6e44e 100644
--- a/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll
+++ b/llvm/test/Transforms/EarlyCSE/defaultfp-strictfp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Test use of constrained floating point intrinsics in the default
diff --git a/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll b/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll
index 1430f5edf854..fafc7ccbb38c 100644
--- a/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll
+++ b/llvm/test/Transforms/EarlyCSE/ebstrict-strictfp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Test use of constrained floating point intrinsics with consistent
diff --git a/llvm/test/Transforms/EarlyCSE/edge.ll b/llvm/test/Transforms/EarlyCSE/edge.ll
index f9a932a21f9b..3011061bf136 100644
--- a/llvm/test/Transforms/EarlyCSE/edge.ll
+++ b/llvm/test/Transforms/EarlyCSE/edge.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 ; RUN: opt -passes='early-cse<memssa>' -S < %s | FileCheck %s
 ; Same as GVN/edge.ll, but updated to reflect EarlyCSE's less powerful
 ; implementation.  EarlyCSE currently doesn't exploit equality comparisons
diff --git a/llvm/test/Transforms/EarlyCSE/fence.ll b/llvm/test/Transforms/EarlyCSE/fence.ll
index 3c5bd687bfdd..1dbf666dfa5f 100644
--- a/llvm/test/Transforms/EarlyCSE/fence.ll
+++ b/llvm/test/Transforms/EarlyCSE/fence.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 ; NOTE: This file is testing the current implementation.  Some of
 ; the transforms used as negative tests below would be legal, but 
diff --git a/llvm/test/Transforms/EarlyCSE/flags.ll b/llvm/test/Transforms/EarlyCSE/flags.ll
index 8b408c123780..82fba148c22b 100644
--- a/llvm/test/Transforms/EarlyCSE/flags.ll
+++ b/llvm/test/Transforms/EarlyCSE/flags.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 ; RUN: opt -passes='early-cse<memssa>' -S < %s | FileCheck %s
 
 declare void @use(i1)
diff --git a/llvm/test/Transforms/EarlyCSE/floatingpoint.ll b/llvm/test/Transforms/EarlyCSE/floatingpoint.ll
index d7453b46f377..9dc594041fc9 100644
--- a/llvm/test/Transforms/EarlyCSE/floatingpoint.ll
+++ b/llvm/test/Transforms/EarlyCSE/floatingpoint.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Ensure we don't simplify away additions vectors of +0.0's (same as scalars).
diff --git a/llvm/test/Transforms/EarlyCSE/gc_relocate.ll b/llvm/test/Transforms/EarlyCSE/gc_relocate.ll
index beeebe500f3f..d8d21f348448 100644
--- a/llvm/test/Transforms/EarlyCSE/gc_relocate.ll
+++ b/llvm/test/Transforms/EarlyCSE/gc_relocate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 
 declare void @func()
 declare i32 @"personality_function"()
diff --git a/llvm/test/Transforms/EarlyCSE/guards.ll b/llvm/test/Transforms/EarlyCSE/guards.ll
index 9abdb749406b..e837b774e616 100644
--- a/llvm/test/Transforms/EarlyCSE/guards.ll
+++ b/llvm/test/Transforms/EarlyCSE/guards.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
 ; RUN: opt < %s -S -passes='early-cse<memssa>' --enable-knowledge-retention | FileCheck %s --check-prefixes=CHECK,USE_ASSUME
 
diff --git a/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll b/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll
index eaaecf487b2b..1d1b16f54e4b 100644
--- a/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll
+++ b/llvm/test/Transforms/EarlyCSE/instsimplify-dom.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 ; RUN: opt -passes='early-cse<memssa>' -S < %s | FileCheck %s
 ; PR12231
 
diff --git a/llvm/test/Transforms/EarlyCSE/int_sideeffect.ll b/llvm/test/Transforms/EarlyCSE/int_sideeffect.ll
index c411756059b5..d59836ccfc1d 100644
--- a/llvm/test/Transforms/EarlyCSE/int_sideeffect.ll
+++ b/llvm/test/Transforms/EarlyCSE/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt -S < %s -passes=early-cse -earlycse-debug-hash | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/EarlyCSE/invariant-loads.ll b/llvm/test/Transforms/EarlyCSE/invariant-loads.ll
index 09a24466e35d..88454660711e 100644
--- a/llvm/test/Transforms/EarlyCSE/invariant-loads.ll
+++ b/llvm/test/Transforms/EarlyCSE/invariant-loads.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
+; RUN: opt -S -passes='early-cse' -earlycse-debug-hash < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
 ; RUN: opt -S -passes='early-cse<memssa>' < %s | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
 ; RUN: opt -S -passes='early-cse<memssa>' --enable-knowledge-retention < %s | FileCheck %s --check-prefixes=CHECK,USE_ASSUME
 
diff --git a/llvm/test/Transforms/EarlyCSE/invariant.start.ll b/llvm/test/Transforms/EarlyCSE/invariant.start.ll
index dcf80f1402ee..9c422568f431 100644
--- a/llvm/test/Transforms/EarlyCSE/invariant.start.ll
+++ b/llvm/test/Transforms/EarlyCSE/invariant.start.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
-; RUN: opt < %s -S -early-cse --enable-knowledge-retention | FileCheck %s --check-prefixes=CHECK,USE_ASSUME
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
+; RUN: opt < %s -S -passes=early-cse --enable-knowledge-retention | FileCheck %s --check-prefixes=CHECK,USE_ASSUME
 ; RUN: opt < %s -S -passes=early-cse | FileCheck %s --check-prefixes=CHECK,NO_ASSUME
 
 declare ptr @llvm.invariant.start.p0(i64, ptr nocapture) nounwind readonly
diff --git a/llvm/test/Transforms/EarlyCSE/masked-intrinsics-unequal-masks.ll b/llvm/test/Transforms/EarlyCSE/masked-intrinsics-unequal-masks.ll
index 9357f99ebb5f..97397724139e 100644
--- a/llvm/test/Transforms/EarlyCSE/masked-intrinsics-unequal-masks.ll
+++ b/llvm/test/Transforms/EarlyCSE/masked-intrinsics-unequal-masks.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse < %s | FileCheck %s
 
 ; Unequal mask check.
 
diff --git a/llvm/test/Transforms/EarlyCSE/masked-intrinsics.ll b/llvm/test/Transforms/EarlyCSE/masked-intrinsics.ll
index aa3167ab5e3f..0fcb4fd8df6c 100644
--- a/llvm/test/Transforms/EarlyCSE/masked-intrinsics.ll
+++ b/llvm/test/Transforms/EarlyCSE/masked-intrinsics.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse < %s | FileCheck %s
 
 define <128 x i8> @f0(ptr %a0, <128 x i8> %a1, <128 x i8> %a2) {
 ; CHECK-LABEL: @f0(
diff --git a/llvm/test/Transforms/EarlyCSE/math-1.ll b/llvm/test/Transforms/EarlyCSE/math-1.ll
index ed24525bff96..d97207843435 100644
--- a/llvm/test/Transforms/EarlyCSE/math-1.ll
+++ b/llvm/test/Transforms/EarlyCSE/math-1.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
 
 declare double @acos(double) #0
 define double @f_acos() {
diff --git a/llvm/test/Transforms/EarlyCSE/math-2.ll b/llvm/test/Transforms/EarlyCSE/math-2.ll
index fb6d979ae685..d9f7c619fa01 100644
--- a/llvm/test/Transforms/EarlyCSE/math-2.ll
+++ b/llvm/test/Transforms/EarlyCSE/math-2.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
 
 declare double @atan2(double, double) #0
 define double @f_atan2() {
diff --git a/llvm/test/Transforms/EarlyCSE/memoryssa.ll b/llvm/test/Transforms/EarlyCSE/memoryssa.ll
index 2d7266f74b51..942b6f87011b 100644
--- a/llvm/test/Transforms/EarlyCSE/memoryssa.ll
+++ b/llvm/test/Transforms/EarlyCSE/memoryssa.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s --check-prefix=CHECK-NOMEMSSA
+; RUN: opt < %s -S -passes='early-cse' -earlycse-debug-hash | FileCheck %s --check-prefix=CHECK-NOMEMSSA
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse' | FileCheck %s --check-prefix=CHECK-NOMEMSSA
 ; RUN: opt < %s -S -aa-pipeline=basic-aa -passes='early-cse<memssa>' | FileCheck %s
diff --git a/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll b/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll
index 21964274dc07..f3b857ab2f48 100644
--- a/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll
+++ b/llvm/test/Transforms/EarlyCSE/mixed-strictfp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Test use of constrained floating point intrinsics mixing the default
diff --git a/llvm/test/Transforms/EarlyCSE/noalias-scope-decl.ll b/llvm/test/Transforms/EarlyCSE/noalias-scope-decl.ll
index 2b51ba06e770..6b20bd6662f8 100644
--- a/llvm/test/Transforms/EarlyCSE/noalias-scope-decl.ll
+++ b/llvm/test/Transforms/EarlyCSE/noalias-scope-decl.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S < %s -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt -S < %s -passes=early-cse -earlycse-debug-hash | FileCheck %s
 
 ; Store-to-load forwarding across a @llvm.experimental.noalias.scope.decl.
 
diff --git a/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll b/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll
index 1a3dfc01c259..8772f208ebe4 100644
--- a/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll
+++ b/llvm/test/Transforms/EarlyCSE/nonmixed-strictfp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Test use of constrained floating point intrinsics with consistent
diff --git a/llvm/test/Transforms/EarlyCSE/opaque-ptr.ll b/llvm/test/Transforms/EarlyCSE/opaque-ptr.ll
index 1c995ab63a5c..a7b9f3e0dfa4 100644
--- a/llvm/test/Transforms/EarlyCSE/opaque-ptr.ll
+++ b/llvm/test/Transforms/EarlyCSE/opaque-ptr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -opaque-pointers < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -opaque-pointers < %s | FileCheck %s
 
 define i32 @different_types_load(ptr %p) {
 ; CHECK-LABEL: @different_types_load(
diff --git a/llvm/test/Transforms/EarlyCSE/phi.ll b/llvm/test/Transforms/EarlyCSE/phi.ll
index e2cb5172d083..cf5aa4ba1ffa 100644
--- a/llvm/test/Transforms/EarlyCSE/phi.ll
+++ b/llvm/test/Transforms/EarlyCSE/phi.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 ; RUN: opt -passes='early-cse<memssa>' -S < %s | FileCheck %s
 
 ; Most basic case, fully identical PHI nodes
diff --git a/llvm/test/Transforms/EarlyCSE/readnone-mayunwind.ll b/llvm/test/Transforms/EarlyCSE/readnone-mayunwind.ll
index 9b2ae3b7eba4..e4d31f31d9ff 100644
--- a/llvm/test/Transforms/EarlyCSE/readnone-mayunwind.ll
+++ b/llvm/test/Transforms/EarlyCSE/readnone-mayunwind.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 declare void @readnone_may_unwind() readnone
 
diff --git a/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll b/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll
index 0c78f22b485d..c33e022f53be 100644
--- a/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll
+++ b/llvm/test/Transforms/EarlyCSE/round-dyn-strictfp.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 ; Test use of constrained floating point intrinsics with dynamic
diff --git a/llvm/test/Transforms/EarlyCSE/tfpropagation.ll b/llvm/test/Transforms/EarlyCSE/tfpropagation.ll
index b26b8c966db2..d07c9627f9b5 100644
--- a/llvm/test/Transforms/EarlyCSE/tfpropagation.ll
+++ b/llvm/test/Transforms/EarlyCSE/tfpropagation.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -early-cse -earlycse-debug-hash | FileCheck %s
+; RUN: opt < %s -S -passes=early-cse -earlycse-debug-hash | FileCheck %s
 ; RUN: opt < %s -S -passes='early-cse<memssa>' | FileCheck %s
 
 define i64 @branching_int(i32 %a) {
diff --git a/llvm/test/Transforms/EarlyCSE/writeonly.ll b/llvm/test/Transforms/EarlyCSE/writeonly.ll
index af20ecfb9051..0bfffa3c825a 100644
--- a/llvm/test/Transforms/EarlyCSE/writeonly.ll
+++ b/llvm/test/Transforms/EarlyCSE/writeonly.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 @var = global i32 undef
 declare void @foo() nounwind
diff --git a/llvm/test/Transforms/InstCombine/invariant.group.ll b/llvm/test/Transforms/InstCombine/invariant.group.ll
index 098f666b370c..521be47d1209 100644
--- a/llvm/test/Transforms/InstCombine/invariant.group.ll
+++ b/llvm/test/Transforms/InstCombine/invariant.group.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -instcombine -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=instcombine,early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 
 define ptr @simplifyNullLaunder() {
 ; CHECK-LABEL: @simplifyNullLaunder(
diff --git a/llvm/test/Transforms/InstNamer/basic.ll b/llvm/test/Transforms/InstNamer/basic.ll
index 4fe0369bd67b..3d35dd848677 100644
--- a/llvm/test/Transforms/InstNamer/basic.ll
+++ b/llvm/test/Transforms/InstNamer/basic.ll
@@ -1,4 +1,3 @@
-; RUN: opt -S -instnamer < %s | FileCheck %s
 ; RUN: opt -S -passes=instnamer < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/allones.ll b/llvm/test/Transforms/InstSimplify/ConstProp/allones.ll
index 9d170dedd4be..1b5878c5e254 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/allones.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/allones.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S -o - %s | FileCheck %s
 target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64-ni:2"
 target triple = "armv7-unknown-linux-gnueabi"
 
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/rint.ll b/llvm/test/Transforms/InstSimplify/ConstProp/rint.ll
index 3b7b0ea57278..f6b3dd84c8d1 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/rint.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/rint.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 declare float @nearbyintf(float) #0
 declare float @llvm.nearbyint.f32(float)
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/round.ll b/llvm/test/Transforms/InstSimplify/ConstProp/round.ll
index e24750e7f30c..6e07a433b6f1 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/round.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/round.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 declare float @roundf(float) #0
 declare float @llvm.round.f32(float)
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/trunc.ll b/llvm/test/Transforms/InstSimplify/ConstProp/trunc.ll
index b7ba65f0893e..1920a85bac6a 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/trunc.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/trunc.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -early-cse -earlycse-debug-hash < %s | FileCheck %s
+; RUN: opt -S -passes=early-cse -earlycse-debug-hash < %s | FileCheck %s
 
 declare float @truncf(float) #0
 declare float @llvm.trunc.f32(float)
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-getelementptr.ll b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-getelementptr.ll
index 6d141acd239f..842d6498fa24 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-getelementptr.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-getelementptr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64"
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector-inseltpoison.ll b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector-inseltpoison.ll
index 48ec29c95f61..be93d6f9d8be 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector-inseltpoison.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector-inseltpoison.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64"
diff --git a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector.ll b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector.ll
index df9011636a35..a2f50a637531 100644
--- a/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector.ll
+++ b/llvm/test/Transforms/InstSimplify/ConstProp/vscale-shufflevector.ll
@@ -1,4 +1,4 @@
-; RUN: opt -early-cse -earlycse-debug-hash -S < %s | FileCheck %s
+; RUN: opt -passes=early-cse -earlycse-debug-hash -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64"