From f38f99bd7671cee44c2a6a751fcab8685dbc3996 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Wed, 7 Dec 2022 21:59:26 +0300
Subject: [PATCH] [NFC] Port all MergeFunc tests to `-passes=` syntax

---
 llvm/test/Transforms/MergeFunc/2011-02-08-RemoveEqual.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/2013-01-10-MergeFuncAssert.ll        | 2 +-
 llvm/test/Transforms/MergeFunc/address-spaces.ll                    | 2 +-
 llvm/test/Transforms/MergeFunc/alias.ll                             | 2 +-
 llvm/test/Transforms/MergeFunc/alloca.ll                            | 2 +-
 llvm/test/Transforms/MergeFunc/apply_function_attributes.ll         | 2 +-
 llvm/test/Transforms/MergeFunc/byval-attr-congruent-type.ll         | 2 +-
 llvm/test/Transforms/MergeFunc/byval-attr-type.ll                   | 2 +-
 llvm/test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll       | 2 +-
 llvm/test/Transforms/MergeFunc/comdat.ll                            | 2 +-
 llvm/test/Transforms/MergeFunc/constant-entire-value.ll             | 4 ++--
 llvm/test/Transforms/MergeFunc/crash.ll                             | 2 +-
 llvm/test/Transforms/MergeFunc/crash2.ll                            | 2 +-
 llvm/test/Transforms/MergeFunc/dso_local_equivalent_merged.ll       | 2 +-
 llvm/test/Transforms/MergeFunc/dso_local_equivalent_unmerged.ll     | 2 +-
 llvm/test/Transforms/MergeFunc/external-before-local.ll             | 6 +++---
 llvm/test/Transforms/MergeFunc/fold-weak.ll                         | 2 +-
 llvm/test/Transforms/MergeFunc/functions.ll                         | 2 +-
 llvm/test/Transforms/MergeFunc/gep-base-type.ll                     | 2 +-
 llvm/test/Transforms/MergeFunc/inline-asm.ll                        | 2 +-
 llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/inttoptr.ll                          | 2 +-
 llvm/test/Transforms/MergeFunc/linkonce_odr.ll                      | 4 ++--
 .../test/Transforms/MergeFunc/merge-block-address-other-function.ll | 2 +-
 llvm/test/Transforms/MergeFunc/merge-block-address.ll               | 2 +-
 llvm/test/Transforms/MergeFunc/merge-const-ptr-and-int.ll           | 4 ++--
 llvm/test/Transforms/MergeFunc/merge-different-vector-types.ll      | 4 ++--
 llvm/test/Transforms/MergeFunc/merge-ptr-and-int.ll                 | 2 +-
 llvm/test/Transforms/MergeFunc/merge-small-unnamed-addr.ll          | 2 +-
 llvm/test/Transforms/MergeFunc/merge-unnamed-addr-bitcast.ll        | 2 +-
 llvm/test/Transforms/MergeFunc/merge-unnamed-addr.ll                | 2 +-
 llvm/test/Transforms/MergeFunc/merge-used.ll                        | 2 +-
 llvm/test/Transforms/MergeFunc/merge-weak-crash.ll                  | 2 +-
 llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll     | 4 ++--
 llvm/test/Transforms/MergeFunc/mergefunc-struct-return.ll           | 2 +-
 llvm/test/Transforms/MergeFunc/mismatching-attr-crash.ll            | 2 +-
 .../Transforms/MergeFunc/no-merge-block-address-different-labels.ll | 2 +-
 .../Transforms/MergeFunc/no-merge-block-address-other-function.ll   | 2 +-
 llvm/test/Transforms/MergeFunc/no-merge-ptr-different-sizes.ll      | 2 +-
 llvm/test/Transforms/MergeFunc/no-merge-ptr-int-different-values.ll | 2 +-
 llvm/test/Transforms/MergeFunc/nonzero-address-spaces.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/phi-check-blocks.ll                  | 2 +-
 llvm/test/Transforms/MergeFunc/phi-speculation1.ll                  | 2 +-
 llvm/test/Transforms/MergeFunc/phi-speculation2.ll                  | 2 +-
 llvm/test/Transforms/MergeFunc/ptr-int-transitivity-1.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/ptr-int-transitivity-2.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/ptr-int-transitivity-3.ll            | 2 +-
 llvm/test/Transforms/MergeFunc/ranges-multiple.ll                   | 2 +-
 llvm/test/Transforms/MergeFunc/ranges.ll                            | 2 +-
 llvm/test/Transforms/MergeFunc/self-referential-global.ll           | 2 +-
 llvm/test/Transforms/MergeFunc/shufflevector.ll                     | 2 +-
 llvm/test/Transforms/MergeFunc/tailcall.ll                          | 2 +-
 llvm/test/Transforms/MergeFunc/too-small.ll                         | 2 +-
 llvm/test/Transforms/MergeFunc/undef-different-types.ll             | 4 ++--
 llvm/test/Transforms/MergeFunc/unnamed-addr-reprocessing.ll         | 2 +-
 llvm/test/Transforms/MergeFunc/va_arg.ll                            | 4 ++--
 llvm/test/Transforms/MergeFunc/vector-GEP-crash.ll                  | 2 +-
 llvm/test/Transforms/MergeFunc/vector.ll                            | 2 +-
 llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll                | 2 +-
 llvm/test/Transforms/MergeFunc/weak-small.ll                        | 2 +-
 60 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/llvm/test/Transforms/MergeFunc/2011-02-08-RemoveEqual.ll b/llvm/test/Transforms/MergeFunc/2011-02-08-RemoveEqual.ll
index 97e8ed5..3d29583 100644
--- a/llvm/test/Transforms/MergeFunc/2011-02-08-RemoveEqual.ll
+++ b/llvm/test/Transforms/MergeFunc/2011-02-08-RemoveEqual.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -disable-output < %s
+; RUN: opt -passes=mergefunc -disable-output < %s
 ; This used to crash.
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
diff --git a/llvm/test/Transforms/MergeFunc/2013-01-10-MergeFuncAssert.ll b/llvm/test/Transforms/MergeFunc/2013-01-10-MergeFuncAssert.ll
index 3f6a5ba..0a772f7 100644
--- a/llvm/test/Transforms/MergeFunc/2013-01-10-MergeFuncAssert.ll
+++ b/llvm/test/Transforms/MergeFunc/2013-01-10-MergeFuncAssert.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -disable-output < %s
+; RUN: opt -passes=mergefunc -disable-output < %s
 ; This used to trigger a ConstantExpr::getBitCast assertion.
 
 define void @t1() unnamed_addr uwtable ssp align 2 {
diff --git a/llvm/test/Transforms/MergeFunc/address-spaces.ll b/llvm/test/Transforms/MergeFunc/address-spaces.ll
index 1cfecae..fa2dfd6 100644
--- a/llvm/test/Transforms/MergeFunc/address-spaces.ll
+++ b/llvm/test/Transforms/MergeFunc/address-spaces.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 target datalayout = "p:32:32:32-p1:32:32:32-p2:16:16:16"
 
diff --git a/llvm/test/Transforms/MergeFunc/alias.ll b/llvm/test/Transforms/MergeFunc/alias.ll
index 1de6ede..e58ab34 100644
--- a/llvm/test/Transforms/MergeFunc/alias.ll
+++ b/llvm/test/Transforms/MergeFunc/alias.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc -mergefunc-use-aliases < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc -mergefunc-use-aliases < %s | FileCheck %s
 
 ; Aliases should always be created for the weak functions, and
 ; for external functions if there is no local function
diff --git a/llvm/test/Transforms/MergeFunc/alloca.ll b/llvm/test/Transforms/MergeFunc/alloca.ll
index 165fc68..6a36bb7 100644
--- a/llvm/test/Transforms/MergeFunc/alloca.ll
+++ b/llvm/test/Transforms/MergeFunc/alloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 ;; Make sure that two different allocas are not treated as equal.
 
diff --git a/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll b/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll
index 2ed0e1d..7578899 100644
--- a/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll
+++ b/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 %Opaque_type = type opaque
 %S2i = type <{ i64, i64 }>
diff --git a/llvm/test/Transforms/MergeFunc/byval-attr-congruent-type.ll b/llvm/test/Transforms/MergeFunc/byval-attr-congruent-type.ll
index 7e7d772..b060d17 100644
--- a/llvm/test/Transforms/MergeFunc/byval-attr-congruent-type.ll
+++ b/llvm/test/Transforms/MergeFunc/byval-attr-congruent-type.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mergefunc %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc %s | FileCheck %s
 
 %struct.c = type { i32 }
 %struct.a = type { i32 }
diff --git a/llvm/test/Transforms/MergeFunc/byval-attr-type.ll b/llvm/test/Transforms/MergeFunc/byval-attr-type.ll
index b659213..0925f52 100644
--- a/llvm/test/Transforms/MergeFunc/byval-attr-type.ll
+++ b/llvm/test/Transforms/MergeFunc/byval-attr-type.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc %s | FileCheck %s
 
 @i = global i32 0
 @f = global float 0.0
diff --git a/llvm/test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll b/llvm/test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll
index 4b8d6bb..9a2dfa0 100644
--- a/llvm/test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll
+++ b/llvm/test/Transforms/MergeFunc/call-and-invoke-with-ranges.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 define i8 @call_with_range() {
   bitcast i8 0 to i8 ; dummy to make the function large enough
diff --git a/llvm/test/Transforms/MergeFunc/comdat.ll b/llvm/test/Transforms/MergeFunc/comdat.ll
index 6ef7c54..afad910 100644
--- a/llvm/test/Transforms/MergeFunc/comdat.ll
+++ b/llvm/test/Transforms/MergeFunc/comdat.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc %s | FileCheck %s
 
 @symbols = linkonce_odr global <{ i8*, i8* }> <{ i8* bitcast (i32 (i32, i32)* @f to i8*), i8* bitcast (i32 (i32, i32)* @g to i8*) }>
 
diff --git a/llvm/test/Transforms/MergeFunc/constant-entire-value.ll b/llvm/test/Transforms/MergeFunc/constant-entire-value.ll
index cb193d0..f9c2a3e 100644
--- a/llvm/test/Transforms/MergeFunc/constant-entire-value.ll
+++ b/llvm/test/Transforms/MergeFunc/constant-entire-value.ll
@@ -1,6 +1,6 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
-; RUN: opt -S -mergefunc < %s | FileCheck -check-prefix=NOPLUS %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck -check-prefix=NOPLUS %s
 
 ; This makes sure that zeros in constants don't cause problems with string based
 ; memory comparisons
diff --git a/llvm/test/Transforms/MergeFunc/crash.ll b/llvm/test/Transforms/MergeFunc/crash.ll
index 7380220..1436c91 100644
--- a/llvm/test/Transforms/MergeFunc/crash.ll
+++ b/llvm/test/Transforms/MergeFunc/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -disable-output < %s
+; RUN: opt -passes=mergefunc -disable-output < %s
 ; PR15185
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
 target triple = "i386-pc-linux-gnu"
diff --git a/llvm/test/Transforms/MergeFunc/crash2.ll b/llvm/test/Transforms/MergeFunc/crash2.ll
index 4b3a3f9..b9d48ec 100644
--- a/llvm/test/Transforms/MergeFunc/crash2.ll
+++ b/llvm/test/Transforms/MergeFunc/crash2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -mergefunc -globalopt -S -o - | FileCheck %s
+; RUN: opt %s -passes=mergefunc,globalopt -S -o - | FileCheck %s
 
 ; Make sure we don't crash on this example. This test is supposed to test that
 ; MergeFunctions clears its GlobalNumbers value map. If this map still contains
diff --git a/llvm/test/Transforms/MergeFunc/dso_local_equivalent_merged.ll b/llvm/test/Transforms/MergeFunc/dso_local_equivalent_merged.ll
index 9b1692f..4c8c0cf 100644
--- a/llvm/test/Transforms/MergeFunc/dso_local_equivalent_merged.ll
+++ b/llvm/test/Transforms/MergeFunc/dso_local_equivalent_merged.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ;; Check the cases involving dso_local_equivalent where we do expect functions to be merged.
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; CHECK-NOT: @b
 
diff --git a/llvm/test/Transforms/MergeFunc/dso_local_equivalent_unmerged.ll b/llvm/test/Transforms/MergeFunc/dso_local_equivalent_unmerged.ll
index 3657f99..d112244 100644
--- a/llvm/test/Transforms/MergeFunc/dso_local_equivalent_unmerged.ll
+++ b/llvm/test/Transforms/MergeFunc/dso_local_equivalent_unmerged.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ;; Check the cases involving dso_local_equivalent where we do not expect functions to be merged.
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 @x = constant { i32 ()*, i32 ()* } { i32 ()* @a, i32 ()* @b }
 ; CHECK: { i32 ()* @a, i32 ()* @b }
diff --git a/llvm/test/Transforms/MergeFunc/external-before-local.ll b/llvm/test/Transforms/MergeFunc/external-before-local.ll
index 7dcdb01..9f2d5e4 100644
--- a/llvm/test/Transforms/MergeFunc/external-before-local.ll
+++ b/llvm/test/Transforms/MergeFunc/external-before-local.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; We should normalize to test2 rather than test1,
 ; because it allows us to drop test1 entirely
@@ -7,7 +7,7 @@
 ; CHECK: define void @test3() unnamed_addr
 ; CHECK-NEXT: call void @test2()
 ; CHECK-NEXT: call void @test2()
-  
+
 declare void @dummy()
 
 define internal void @test1() unnamed_addr {
@@ -37,7 +37,7 @@ define void @test3() unnamed_addr {
 ; CHECK-NEXT: tail call void @test6()
 
 declare void @dummy2()
-  
+
 define weak void @test4() {
     call void @dummy2()
     call void @dummy2()
diff --git a/llvm/test/Transforms/MergeFunc/fold-weak.ll b/llvm/test/Transforms/MergeFunc/fold-weak.ll
index f8a1888..abaeae9 100644
--- a/llvm/test/Transforms/MergeFunc/fold-weak.ll
+++ b/llvm/test/Transforms/MergeFunc/fold-weak.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 define weak i32 @sum(i32 %x, i32 %y) {
   %sum = add i32 %x, %y
diff --git a/llvm/test/Transforms/MergeFunc/functions.ll b/llvm/test/Transforms/MergeFunc/functions.ll
index 006fdf5..5324950 100644
--- a/llvm/test/Transforms/MergeFunc/functions.ll
+++ b/llvm/test/Transforms/MergeFunc/functions.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; Be sure we don't merge cross-referenced functions of same type.
 
diff --git a/llvm/test/Transforms/MergeFunc/gep-base-type.ll b/llvm/test/Transforms/MergeFunc/gep-base-type.ll
index bfbb247..2d535d4 100644
--- a/llvm/test/Transforms/MergeFunc/gep-base-type.ll
+++ b/llvm/test/Transforms/MergeFunc/gep-base-type.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | 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-n8:16:32:64-S128"
 
 ; These should not be merged, the type of the GEP pointer argument does not have
diff --git a/llvm/test/Transforms/MergeFunc/inline-asm.ll b/llvm/test/Transforms/MergeFunc/inline-asm.ll
index 1576024..ac9b767 100644
--- a/llvm/test/Transforms/MergeFunc/inline-asm.ll
+++ b/llvm/test/Transforms/MergeFunc/inline-asm.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 ; CHECK-LABEL: @int_ptr_arg_different
 ; CHECK-NEXT: call void asm
diff --git a/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll b/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll
index 86deb2c..dd62de8 100644
--- a/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll
+++ b/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 target datalayout = "e-p:32:32:32-p1:16:16:16-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-n8:16:32-S128"
 
 %.qux.2496 = type { i32, %.qux.2497 }
diff --git a/llvm/test/Transforms/MergeFunc/inttoptr.ll b/llvm/test/Transforms/MergeFunc/inttoptr.ll
index 05ae766..c1715c1 100644
--- a/llvm/test/Transforms/MergeFunc/inttoptr.ll
+++ b/llvm/test/Transforms/MergeFunc/inttoptr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 ; PR15185
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
 target triple = "i386-pc-linux-gnu"
diff --git a/llvm/test/Transforms/MergeFunc/linkonce_odr.ll b/llvm/test/Transforms/MergeFunc/linkonce_odr.ll
index 825f905..6bd4251 100644
--- a/llvm/test/Transforms/MergeFunc/linkonce_odr.ll
+++ b/llvm/test/Transforms/MergeFunc/linkonce_odr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s -implicit-check-not=funC
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s -implicit-check-not=funC
 
 ; Replacments should be totally ordered on the function name.
 ; If we don't do this we  can end up with one module defining a thunk for @funA
@@ -36,7 +36,7 @@ define linkonce_odr i32 @funA(i32 %x, i32 %y) {
   ret i32 %sum3
 }
 
-; This creates a use of @funB, preventing -mergefunc from deleting it.
+; This creates a use of @funB, preventing -passes=mergefunc from deleting it.
 ; @funC, however, can safely be deleted as it has no uses, and is discardable
 ; if unused.
 @take_addr_of_funB = global i8* bitcast (i32 (i32, i32)* @funB to i8*)
diff --git a/llvm/test/Transforms/MergeFunc/merge-block-address-other-function.ll b/llvm/test/Transforms/MergeFunc/merge-block-address-other-function.ll
index ca1a6f2..d4b75d5 100644
--- a/llvm/test/Transforms/MergeFunc/merge-block-address-other-function.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-block-address-other-function.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %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/Transforms/MergeFunc/merge-block-address.ll b/llvm/test/Transforms/MergeFunc/merge-block-address.ll
index d2340a7..3049967 100644
--- a/llvm/test/Transforms/MergeFunc/merge-block-address.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-block-address.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 ; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; These two functions are identical. The basic block labels are the same, and
diff --git a/llvm/test/Transforms/MergeFunc/merge-const-ptr-and-int.ll b/llvm/test/Transforms/MergeFunc/merge-const-ptr-and-int.ll
index 8c86ab1..11d43c9 100644
--- a/llvm/test/Transforms/MergeFunc/merge-const-ptr-and-int.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-const-ptr-and-int.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
-; RUN: opt -mergefunc -S < %s | FileCheck -check-prefix=MERGE %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck -check-prefix=MERGE %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-n8:16:32:64-S128"
 
 ; Afunc and Bfunc differ only in that one returns i64, the other a pointer.
diff --git a/llvm/test/Transforms/MergeFunc/merge-different-vector-types.ll b/llvm/test/Transforms/MergeFunc/merge-different-vector-types.ll
index 7696139..c2fd65b 100644
--- a/llvm/test/Transforms/MergeFunc/merge-different-vector-types.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-different-vector-types.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
-; RUN: opt -mergefunc -S < %s | FileCheck -check-prefix=MERGE %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck -check-prefix=MERGE %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-n8:16:32:64-S128"
 
 ; Merging should still work even if the values are wrapped in a vector.
diff --git a/llvm/test/Transforms/MergeFunc/merge-ptr-and-int.ll b/llvm/test/Transforms/MergeFunc/merge-ptr-and-int.ll
index 4e887ce..59fc2be 100644
--- a/llvm/test/Transforms/MergeFunc/merge-ptr-and-int.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-ptr-and-int.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | 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-n8:16:32:64-S128"
 
 
diff --git a/llvm/test/Transforms/MergeFunc/merge-small-unnamed-addr.ll b/llvm/test/Transforms/MergeFunc/merge-small-unnamed-addr.ll
index 256f686..0f113d9 100644
--- a/llvm/test/Transforms/MergeFunc/merge-small-unnamed-addr.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-small-unnamed-addr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; CHECK-NOT: @b
 
diff --git a/llvm/test/Transforms/MergeFunc/merge-unnamed-addr-bitcast.ll b/llvm/test/Transforms/MergeFunc/merge-unnamed-addr-bitcast.ll
index 3cefc3e..2d6c7bb 100644
--- a/llvm/test/Transforms/MergeFunc/merge-unnamed-addr-bitcast.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-unnamed-addr-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 %A = type { i32 }
 %B = type { i32 }
diff --git a/llvm/test/Transforms/MergeFunc/merge-unnamed-addr.ll b/llvm/test/Transforms/MergeFunc/merge-unnamed-addr.ll
index cb34d43..99c5148 100644
--- a/llvm/test/Transforms/MergeFunc/merge-unnamed-addr.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-unnamed-addr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; CHECK-NOT: @b
 
diff --git a/llvm/test/Transforms/MergeFunc/merge-used.ll b/llvm/test/Transforms/MergeFunc/merge-used.ll
index a86e66e..a63fbce 100644
--- a/llvm/test/Transforms/MergeFunc/merge-used.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-used.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 @llvm.compiler.used = appending global [1 x i8*] [i8* bitcast (i32 (i32)* @a to i8*)], section "llvm.metadata"
 
diff --git a/llvm/test/Transforms/MergeFunc/merge-weak-crash.ll b/llvm/test/Transforms/MergeFunc/merge-weak-crash.ll
index 9d2c5ca..9a2d664 100644
--- a/llvm/test/Transforms/MergeFunc/merge-weak-crash.ll
+++ b/llvm/test/Transforms/MergeFunc/merge-weak-crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; CHECK-LABEL: define i32 @func1
 ; CHECK: call i32 @func2
diff --git a/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll b/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
index 65169a2..5cbbf7a 100644
--- a/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
+++ b/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -passes='default<O0>,mergefunc' -S -mergefunc-preserve-debug-info < %s | FileCheck %s --check-prefix=OPTIMIZATION_LEVEL_0
 ; RUN: opt -passes='default<O2>,mergefunc' -S -mergefunc-preserve-debug-info < %s | FileCheck %s --check-prefix=OPTIMIZATION_LEVEL_2
 
-; Preserve debug info in thunks under -mergefunc -mergefunc-preserve-debug-info
+; Preserve debug info in thunks under -passes=mergefunc -mergefunc-preserve-debug-info
 ;
 ; We test that:
 ; At -O0 we have preserved the generated @llvm.dbg.declare debug intrinsics.
@@ -11,7 +11,7 @@
 ; Debug info got generated for the call made by the thunk and for its return value.
 ; The foregoing is the only content of a thunk's entry block.
 ; A thunk makes a tail call to the shared implementation.
-; A thunk's call site is preserved to point to the thunk (with only -mergefunc the
+; A thunk's call site is preserved to point to the thunk (with only -passes=mergefunc the
 ;   call site is modified to point to the shared implementation) when both occur
 ;   within the same translation unit.
 
diff --git a/llvm/test/Transforms/MergeFunc/mergefunc-struct-return.ll b/llvm/test/Transforms/MergeFunc/mergefunc-struct-return.ll
index 4c68ee3..d255222 100644
--- a/llvm/test/Transforms/MergeFunc/mergefunc-struct-return.ll
+++ b/llvm/test/Transforms/MergeFunc/mergefunc-struct-return.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 ; This test makes sure that the mergefunc pass, uses extract and insert value
 ; to convert the struct result type; as struct types cannot be bitcast.
diff --git a/llvm/test/Transforms/MergeFunc/mismatching-attr-crash.ll b/llvm/test/Transforms/MergeFunc/mismatching-attr-crash.ll
index 65d71d1..f00e5f1 100644
--- a/llvm/test/Transforms/MergeFunc/mismatching-attr-crash.ll
+++ b/llvm/test/Transforms/MergeFunc/mismatching-attr-crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc %s | FileCheck %s
 
 ; CHECK-LABEL: define void @foo
 ; CHECK: call void %bc
diff --git a/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll b/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll
index 3024a9a..a7ec0edb 100644
--- a/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll
+++ b/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; There is a slight different in these two functions, in that the label values
 ; are switched. They are thus not mergeable. This tests that block addresses
diff --git a/llvm/test/Transforms/MergeFunc/no-merge-block-address-other-function.ll b/llvm/test/Transforms/MergeFunc/no-merge-block-address-other-function.ll
index e1aa30a..2e2c373 100644
--- a/llvm/test/Transforms/MergeFunc/no-merge-block-address-other-function.ll
+++ b/llvm/test/Transforms/MergeFunc/no-merge-block-address-other-function.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; We should not merge these two functions, because the blocks are different.
 ; This tests the handling of block addresses from different functions.
diff --git a/llvm/test/Transforms/MergeFunc/no-merge-ptr-different-sizes.ll b/llvm/test/Transforms/MergeFunc/no-merge-ptr-different-sizes.ll
index c0c6dab..ff0ff3d 100644
--- a/llvm/test/Transforms/MergeFunc/no-merge-ptr-different-sizes.ll
+++ b/llvm/test/Transforms/MergeFunc/no-merge-ptr-different-sizes.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | 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-n8:16:32:64-S128"
 
 ; These should not be merged, as the datalayout says a pointer is 64 bits. No
diff --git a/llvm/test/Transforms/MergeFunc/no-merge-ptr-int-different-values.ll b/llvm/test/Transforms/MergeFunc/no-merge-ptr-int-different-values.ll
index 6bd6564..81c492c 100644
--- a/llvm/test/Transforms/MergeFunc/no-merge-ptr-int-different-values.ll
+++ b/llvm/test/Transforms/MergeFunc/no-merge-ptr-int-different-values.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | 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-n8:16:32:64-S128"
 
 ; These should not be merged, as 1 != 0.
diff --git a/llvm/test/Transforms/MergeFunc/nonzero-address-spaces.ll b/llvm/test/Transforms/MergeFunc/nonzero-address-spaces.ll
index 3ee887c..72b633a 100644
--- a/llvm/test/Transforms/MergeFunc/nonzero-address-spaces.ll
+++ b/llvm/test/Transforms/MergeFunc/nonzero-address-spaces.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; MergeFunctions should respect the default function address
 ; space specified in the data layout.
diff --git a/llvm/test/Transforms/MergeFunc/phi-check-blocks.ll b/llvm/test/Transforms/MergeFunc/phi-check-blocks.ll
index 76f4491..6e2542d 100644
--- a/llvm/test/Transforms/MergeFunc/phi-check-blocks.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-check-blocks.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; Ensure that we do not merge functions that are identical with the
 ; exception of the order of the incoming blocks to a phi.
diff --git a/llvm/test/Transforms/MergeFunc/phi-speculation1.ll b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
index 548e510..1d5205f 100644
--- a/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | not grep "functions merged"
+; RUN: opt < %s -passes=mergefunc -stats -disable-output 2>&1 | not grep "functions merged"
 
 define i32 @foo1(i32 %x) {
 entry:
diff --git a/llvm/test/Transforms/MergeFunc/phi-speculation2.ll b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
index d42a465..54d6bf5 100644
--- a/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | grep "functions merged"
+; RUN: opt < %s -passes=mergefunc -stats -disable-output 2>&1 | grep "functions merged"
 
 define i32 @foo1(i32 %x) {
 entry:
diff --git a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-1.ll b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-1.ll
index d6ff10f..9bf248d 100644
--- a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-1.ll
+++ b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | not grep "functions merged"
+; RUN: opt -S -passes=mergefunc < %s | not grep "functions merged"
 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-n8:16:32:64-S128"
 
 declare void @stuff()
diff --git a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-2.ll b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-2.ll
index c9fb6a6..46e8df4 100644
--- a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-2.ll
+++ b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | 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-n8:16:32:64-S128"
 
 declare void @stuff()
diff --git a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-3.ll b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-3.ll
index 8f00f03..1c5679a 100644
--- a/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-3.ll
+++ b/llvm/test/Transforms/MergeFunc/ptr-int-transitivity-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | not grep "functions merged"
+; RUN: opt -S -passes=mergefunc < %s | not grep "functions merged"
 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-n8:16:32:64-S128"
 
 declare void @stuff()
diff --git a/llvm/test/Transforms/MergeFunc/ranges-multiple.ll b/llvm/test/Transforms/MergeFunc/ranges-multiple.ll
index 2bbeb8c..8013872 100644
--- a/llvm/test/Transforms/MergeFunc/ranges-multiple.ll
+++ b/llvm/test/Transforms/MergeFunc/ranges-multiple.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 define i1 @cmp_with_range(i8*, i8*) {
   %v1 = load i8, i8* %0, !range !0
   %v2 = load i8, i8* %1, !range !0
diff --git a/llvm/test/Transforms/MergeFunc/ranges.ll b/llvm/test/Transforms/MergeFunc/ranges.ll
index 77cf281..039467b 100644
--- a/llvm/test/Transforms/MergeFunc/ranges.ll
+++ b/llvm/test/Transforms/MergeFunc/ranges.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 define i1 @cmp_with_range(i8*, i8*) {
   %v1 = load i8, i8* %0, !range !0
   %v2 = load i8, i8* %1, !range !0
diff --git a/llvm/test/Transforms/MergeFunc/self-referential-global.ll b/llvm/test/Transforms/MergeFunc/self-referential-global.ll
index d3d1c62..20cffe8 100644
--- a/llvm/test/Transforms/MergeFunc/self-referential-global.ll
+++ b/llvm/test/Transforms/MergeFunc/self-referential-global.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -disable-output < %s
+; RUN: opt -passes=mergefunc -disable-output < %s
 
 ; A linked list type and simple payload
 %LL = type { %S, %LL* }
diff --git a/llvm/test/Transforms/MergeFunc/shufflevector.ll b/llvm/test/Transforms/MergeFunc/shufflevector.ll
index 244fd5c..a91086a 100644
--- a/llvm/test/Transforms/MergeFunc/shufflevector.ll
+++ b/llvm/test/Transforms/MergeFunc/shufflevector.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 define internal <2 x i32> @test1(<2 x i32> %v1, <2 x i32> %v2) {
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/MergeFunc/tailcall.ll b/llvm/test/Transforms/MergeFunc/tailcall.ll
index 8adf45a..e3682a6 100644
--- a/llvm/test/Transforms/MergeFunc/tailcall.ll
+++ b/llvm/test/Transforms/MergeFunc/tailcall.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 declare void @dummy()
 
diff --git a/llvm/test/Transforms/MergeFunc/too-small.ll b/llvm/test/Transforms/MergeFunc/too-small.ll
index 1a526ff..2d21fff 100644
--- a/llvm/test/Transforms/MergeFunc/too-small.ll
+++ b/llvm/test/Transforms/MergeFunc/too-small.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 define void @foo(i32 %x) {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/MergeFunc/undef-different-types.ll b/llvm/test/Transforms/MergeFunc/undef-different-types.ll
index 4694146..4cef4d5 100644
--- a/llvm/test/Transforms/MergeFunc/undef-different-types.ll
+++ b/llvm/test/Transforms/MergeFunc/undef-different-types.ll
@@ -1,5 +1,5 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
-; RUN: opt -mergefunc -S < %s | FileCheck -check-prefix=MERGE %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck -check-prefix=MERGE %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-n8:16:32:64-S128"
 
 ; Cfunc and Dfunc differ only in that one returns i64, the other a pointer, and
diff --git a/llvm/test/Transforms/MergeFunc/unnamed-addr-reprocessing.ll b/llvm/test/Transforms/MergeFunc/unnamed-addr-reprocessing.ll
index 4981b33..ebe882e 100644
--- a/llvm/test/Transforms/MergeFunc/unnamed-addr-reprocessing.ll
+++ b/llvm/test/Transforms/MergeFunc/unnamed-addr-reprocessing.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; After the merge of test5 and test6, we can merge test3 and test4,
 ; then test1 and test2.
diff --git a/llvm/test/Transforms/MergeFunc/va_arg.ll b/llvm/test/Transforms/MergeFunc/va_arg.ll
index 1a48a63..fd42dff 100644
--- a/llvm/test/Transforms/MergeFunc/va_arg.ll
+++ b/llvm/test/Transforms/MergeFunc/va_arg.ll
@@ -1,5 +1,5 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
-; RUN: opt -S -mergefunc -mergefunc-use-aliases < %s | FileCheck %s -check-prefix=ALIAS
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc -mergefunc-use-aliases < %s | FileCheck %s -check-prefix=ALIAS
 
 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/Transforms/MergeFunc/vector-GEP-crash.ll b/llvm/test/Transforms/MergeFunc/vector-GEP-crash.ll
index d0e86eb..a8cc115 100644
--- a/llvm/test/Transforms/MergeFunc/vector-GEP-crash.ll
+++ b/llvm/test/Transforms/MergeFunc/vector-GEP-crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -disable-output < %s
+; RUN: opt -passes=mergefunc -disable-output < %s
 ; This used to cause a crash when compairing the GEPs
 
 define void @foo(<2 x i64*>) {
diff --git a/llvm/test/Transforms/MergeFunc/vector.ll b/llvm/test/Transforms/MergeFunc/vector.ll
index 59b3d25..ae63be7 100644
--- a/llvm/test/Transforms/MergeFunc/vector.ll
+++ b/llvm/test/Transforms/MergeFunc/vector.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mergefunc -stats -disable-output < %s 2>&1 | grep "functions merged"
+; RUN: opt -passes=mergefunc -stats -disable-output < %s 2>&1 | grep "functions merged"
 
 ; This test is checks whether we can merge
 ;   vector<intptr_t>::push_back(0)
diff --git a/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll b/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll
index 2274722..c4fdb82 100644
--- a/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll
+++ b/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt -mergefunc < %s -disable-output -stats | not grep merged
+; RUN: opt -passes=mergefunc < %s -disable-output -stats | not grep merged
 ; This used to crash with an assert.
 
 define <2 x i8> @v1(<2 x i8> %x) {
diff --git a/llvm/test/Transforms/MergeFunc/weak-small.ll b/llvm/test/Transforms/MergeFunc/weak-small.ll
index 44ac7da..067f45b 100644
--- a/llvm/test/Transforms/MergeFunc/weak-small.ll
+++ b/llvm/test/Transforms/MergeFunc/weak-small.ll
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -S < %s | FileCheck %s
+; RUN: opt -passes=mergefunc -S < %s | FileCheck %s
 
 ; Weak functions too small for merging to be profitable
 
-- 
2.7.4