From 07e34d2de565a88da2724d52cdcf47b4bca873db Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault@amd.com>
Date: Sun, 27 Nov 2022 11:18:35 -0500
Subject: [PATCH] JumpThreading: Convert tests to -passes

---
 llvm/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll       | 2 +-
 llvm/test/Transforms/JumpThreading/2010-08-26-and.ll              | 2 +-
 .../test/Transforms/JumpThreading/2011-04-02-SimplifyDeadBlock.ll | 2 +-
 llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll          | 2 +-
 .../Transforms/JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll  | 2 +-
 llvm/test/Transforms/JumpThreading/PR33357-lvi-recursion.ll       | 2 +-
 llvm/test/Transforms/JumpThreading/PR37745.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/PR44611-across-header-hang.ll  | 2 +-
 llvm/test/Transforms/JumpThreading/aa-crash-phi-no-args.ll        | 1 -
 llvm/test/Transforms/JumpThreading/and-and-cond.ll                | 2 +-
 llvm/test/Transforms/JumpThreading/and-cond.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/assume-edge-dom.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/assume.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/basic.ll                       | 2 +-
 llvm/test/Transforms/JumpThreading/bb-unreachable-from-entry.ll   | 2 +-
 llvm/test/Transforms/JumpThreading/branch-debug-info.ll           | 2 +-
 llvm/test/Transforms/JumpThreading/branch-no-const.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/callbr-edge-split.ll           | 2 +-
 llvm/test/Transforms/JumpThreading/codesize-loop.ll               | 4 ++--
 llvm/test/Transforms/JumpThreading/combine-metadata.ll            | 2 +-
 llvm/test/Transforms/JumpThreading/compare.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/conservative-lvi.ll            | 2 +-
 llvm/test/Transforms/JumpThreading/constant-fold-status.ll        | 2 +-
 llvm/test/Transforms/JumpThreading/crash.ll                       | 2 +-
 llvm/test/Transforms/JumpThreading/ddt-crash.ll                   | 2 +-
 llvm/test/Transforms/JumpThreading/ddt-crash2.ll                  | 2 +-
 llvm/test/Transforms/JumpThreading/ddt-crash3.ll                  | 2 +-
 llvm/test/Transforms/JumpThreading/ddt-crash4.ll                  | 2 +-
 llvm/test/Transforms/JumpThreading/degenerate-phi.ll              | 2 +-
 llvm/test/Transforms/JumpThreading/divergent-target-test.ll       | 8 ++++----
 llvm/test/Transforms/JumpThreading/fold-not-thread.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/free_instructions.ll           | 2 +-
 llvm/test/Transforms/JumpThreading/freeze-impliescond.ll          | 2 +-
 llvm/test/Transforms/JumpThreading/freeze-lvi-edgevaluelocal.ll   | 2 +-
 llvm/test/Transforms/JumpThreading/freeze.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/guards.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/header-succ.ll                 | 2 +-
 llvm/test/Transforms/JumpThreading/implied-cond.ll                | 2 +-
 llvm/test/Transforms/JumpThreading/indirectbr-cast-int-op.ll      | 2 +-
 llvm/test/Transforms/JumpThreading/indirectbr-in-predpred.ll      | 2 +-
 llvm/test/Transforms/JumpThreading/indirectbr.ll                  | 2 +-
 llvm/test/Transforms/JumpThreading/induction.ll                   | 2 +-
 .../insert-placeholder-to-prevent-infinite-recursion.ll           | 2 +-
 llvm/test/Transforms/JumpThreading/is_constant.ll                 | 2 +-
 llvm/test/Transforms/JumpThreading/landing-pad.ll                 | 2 +-
 llvm/test/Transforms/JumpThreading/loop-phi.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/lvi-load.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/lvi-tristate.ll                | 2 +-
 llvm/test/Transforms/JumpThreading/ne-undef.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/no-irreducible-loops.ll        | 2 +-
 llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll          | 2 +-
 llvm/test/Transforms/JumpThreading/nonnull-gep-out-of-bounds.ll   | 2 +-
 llvm/test/Transforms/JumpThreading/or-undef.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/phi-copy-to-pred.ll            | 2 +-
 llvm/test/Transforms/JumpThreading/phi-eq.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/phi-known.ll                   | 2 +-
 llvm/test/Transforms/JumpThreading/pr15851_hang.ll                | 2 +-
 llvm/test/Transforms/JumpThreading/pr22086.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/pr27840.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/pr33605.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/pr33917.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/pr36133.ll                     | 2 +-
 llvm/test/Transforms/JumpThreading/pr40992-indirectbr-folding.ll  | 2 +-
 llvm/test/Transforms/JumpThreading/pr46857-callbr.ll              | 2 +-
 llvm/test/Transforms/JumpThreading/pr9331.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/pre-load.ll                    | 2 +-
 llvm/test/Transforms/JumpThreading/range-compare.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/redundant-dbg-info.ll          | 2 +-
 llvm/test/Transforms/JumpThreading/removed-use.ll                 | 2 +-
 llvm/test/Transforms/JumpThreading/select-unfold-msan.ll          | 2 +-
 llvm/test/Transforms/JumpThreading/select.ll                      | 2 +-
 llvm/test/Transforms/JumpThreading/static-profile.ll              | 2 +-
 llvm/test/Transforms/JumpThreading/thread-cmp.ll                  | 2 +-
 llvm/test/Transforms/JumpThreading/thread-loads.ll                | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-1.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-2.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-3.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-4.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-5.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-prob-6.ll               | 2 +-
 llvm/test/Transforms/JumpThreading/thread-two-bbs-cuda.ll         | 2 +-
 llvm/test/Transforms/JumpThreading/thread-two-bbs-msvc.ll         | 2 +-
 llvm/test/Transforms/JumpThreading/thread-two-bbs-threshold.ll    | 2 +-
 llvm/test/Transforms/JumpThreading/thread-two-bbs.ll              | 2 +-
 llvm/test/Transforms/JumpThreading/threadable-edge-cast.ll        | 2 +-
 llvm/test/Transforms/JumpThreading/threading_prof1.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/threading_prof2.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/threading_prof3.ll             | 2 +-
 llvm/test/Transforms/JumpThreading/unreachable-loops.ll           | 1 -
 llvm/test/Transforms/JumpThreading/update-edge-weight.ll          | 2 +-
 90 files changed, 92 insertions(+), 94 deletions(-)

diff --git a/llvm/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll b/llvm/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
index 6a50d4f..05ca087 100644
--- a/llvm/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
+++ b/llvm/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | grep "ret i32 0"
+; RUN: opt < %s -passes=jump-threading -S | grep "ret i32 0"
 ; PR3138
 
 define i32 @jt() {
diff --git a/llvm/test/Transforms/JumpThreading/2010-08-26-and.ll b/llvm/test/Transforms/JumpThreading/2010-08-26-and.ll
index bde993a..7ddc48e 100644
--- a/llvm/test/Transforms/JumpThreading/2010-08-26-and.ll
+++ b/llvm/test/Transforms/JumpThreading/2010-08-26-and.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -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"
 target triple = "x86_64-apple-darwin10.0.0"
diff --git a/llvm/test/Transforms/JumpThreading/2011-04-02-SimplifyDeadBlock.ll b/llvm/test/Transforms/JumpThreading/2011-04-02-SimplifyDeadBlock.ll
index 76dd2d1..4203000 100644
--- a/llvm/test/Transforms/JumpThreading/2011-04-02-SimplifyDeadBlock.ll
+++ b/llvm/test/Transforms/JumpThreading/2011-04-02-SimplifyDeadBlock.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading
+; RUN: opt -S -passes=jump-threading < %s
 ; PR9446
 ; Just check that it doesn't crash
 
diff --git a/llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll b/llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll
index d905244..393d499 100644
--- a/llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll
+++ b/llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading < %s
+; RUN: opt -passes=jump-threading < %s
 ; <rdar://problem/9284786>
 
 %0 = type <{ i64, i16, i64, i8, i8 }>
diff --git a/llvm/test/Transforms/JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll b/llvm/test/Transforms/JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll
index a8b89fe..2a4b4e3 100644
--- a/llvm/test/Transforms/JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll
+++ b/llvm/test/Transforms/JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading
+; RUN: opt -S -passes=jump-threading < %s
 ; PR 13405
 ; Just check that it doesn't crash / assert
 
diff --git a/llvm/test/Transforms/JumpThreading/PR33357-lvi-recursion.ll b/llvm/test/Transforms/JumpThreading/PR33357-lvi-recursion.ll
index a2a006a..76ee63b 100644
--- a/llvm/test/Transforms/JumpThreading/PR33357-lvi-recursion.ll
+++ b/llvm/test/Transforms/JumpThreading/PR33357-lvi-recursion.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading -verify -o - %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify -o - %s | FileCheck %s
 @a = external global i16, align 1
 
 ; CHECK-LABEL: f
diff --git a/llvm/test/Transforms/JumpThreading/PR37745.ll b/llvm/test/Transforms/JumpThreading/PR37745.ll
index 82fc919..8c84636 100644
--- a/llvm/test/Transforms/JumpThreading/PR37745.ll
+++ b/llvm/test/Transforms/JumpThreading/PR37745.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -verify-each -S -mtriple=x86_64-- -o - %s
+; RUN: opt -passes=jump-threading -verify-each -S -mtriple=x86_64-- -o - %s
 
 define void @foo() {
 entry:
diff --git a/llvm/test/Transforms/JumpThreading/PR44611-across-header-hang.ll b/llvm/test/Transforms/JumpThreading/PR44611-across-header-hang.ll
index d36a3a1..2f37039 100644
--- a/llvm/test/Transforms/JumpThreading/PR44611-across-header-hang.ll
+++ b/llvm/test/Transforms/JumpThreading/PR44611-across-header-hang.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -jump-threading -jump-threading-across-loop-headers | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading -jump-threading-across-loop-headers | FileCheck %s
 
 ; CHECK-LABEL: @foo
 ; Just check that we don't hang on this test.
diff --git a/llvm/test/Transforms/JumpThreading/aa-crash-phi-no-args.ll b/llvm/test/Transforms/JumpThreading/aa-crash-phi-no-args.ll
index 163f790..3287324 100644
--- a/llvm/test/Transforms/JumpThreading/aa-crash-phi-no-args.ll
+++ b/llvm/test/Transforms/JumpThreading/aa-crash-phi-no-args.ll
@@ -1,5 +1,4 @@
 ; REQUIRES: asserts
-; RUN: opt -jump-threading -aa-pipeline basic-aa -S -disable-output %s
 ; RUN: opt -passes=jump-threading -aa-pipeline basic-aa -S -disable-output %s
 
 define void @foo(ptr %arg1, ptr %arg2) {
diff --git a/llvm/test/Transforms/JumpThreading/and-and-cond.ll b/llvm/test/Transforms/JumpThreading/and-and-cond.ll
index 7813ba4..651abdf 100644
--- a/llvm/test/Transforms/JumpThreading/and-and-cond.ll
+++ b/llvm/test/Transforms/JumpThreading/and-and-cond.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -mem2reg -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1  -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading,mem2reg,instcombine,simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/and-cond.ll b/llvm/test/Transforms/JumpThreading/and-cond.ll
index b97aab8..c90c355 100644
--- a/llvm/test/Transforms/JumpThreading/and-cond.ll
+++ b/llvm/test/Transforms/JumpThreading/and-cond.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -mem2reg -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1  -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading,mem2reg,instcombine,simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/assume-edge-dom.ll b/llvm/test/Transforms/JumpThreading/assume-edge-dom.ll
index 902bf0a..76dc610 100644
--- a/llvm/test/Transforms/JumpThreading/assume-edge-dom.ll
+++ b/llvm/test/Transforms/JumpThreading/assume-edge-dom.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 declare ptr @escape()
 declare void @llvm.assume(i1)
diff --git a/llvm/test/Transforms/JumpThreading/assume.ll b/llvm/test/Transforms/JumpThreading/assume.ll
index 77e8658..cef7b1d 100644
--- a/llvm/test/Transforms/JumpThreading/assume.ll
+++ b/llvm/test/Transforms/JumpThreading/assume.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading -dce < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,dce < %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/JumpThreading/basic.ll b/llvm/test/Transforms/JumpThreading/basic.ll
index 16e7549e..bb8eeb7 100644
--- a/llvm/test/Transforms/JumpThreading/basic.ll
+++ b/llvm/test/Transforms/JumpThreading/basic.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/bb-unreachable-from-entry.ll b/llvm/test/Transforms/JumpThreading/bb-unreachable-from-entry.ll
index 9588117..2a97652 100644
--- a/llvm/test/Transforms/JumpThreading/bb-unreachable-from-entry.ll
+++ b/llvm/test/Transforms/JumpThreading/bb-unreachable-from-entry.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S < %s -jump-threading | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading | FileCheck %s
 
 define void @foo() {
 ; CHECK-LABEL: @foo(
diff --git a/llvm/test/Transforms/JumpThreading/branch-debug-info.ll b/llvm/test/Transforms/JumpThreading/branch-debug-info.ll
index a522648..ac2bf33 100644
--- a/llvm/test/Transforms/JumpThreading/branch-debug-info.ll
+++ b/llvm/test/Transforms/JumpThreading/branch-debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -debugify -jump-threading -S | FileCheck %s
+; RUN: opt -S -passes=debugify,jump-threading < %s | FileCheck %s
 ; Tests Bug 37966
 
 define void @test0(i32 %i) {
diff --git a/llvm/test/Transforms/JumpThreading/branch-no-const.ll b/llvm/test/Transforms/JumpThreading/branch-no-const.ll
index 16867b0..97e71a8 100644
--- a/llvm/test/Transforms/JumpThreading/branch-no-const.ll
+++ b/llvm/test/Transforms/JumpThreading/branch-no-const.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | not grep phi
+; RUN: opt < %s -passes=jump-threading -S | not grep phi
 
 declare i8 @mcguffin()
 
diff --git a/llvm/test/Transforms/JumpThreading/callbr-edge-split.ll b/llvm/test/Transforms/JumpThreading/callbr-edge-split.ll
index 9b9dedb..8a9ae0a 100644
--- a/llvm/test/Transforms/JumpThreading/callbr-edge-split.ll
+++ b/llvm/test/Transforms/JumpThreading/callbr-edge-split.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -S -jump-threading | FileCheck %s
+; RUN: opt < %s -S -passes=jump-threading | FileCheck %s
 
 ; This test used to cause jump threading to try to split an edge of a callbr.
 
diff --git a/llvm/test/Transforms/JumpThreading/codesize-loop.ll b/llvm/test/Transforms/JumpThreading/codesize-loop.ll
index 5818ad8..a1a2b1d 100644
--- a/llvm/test/Transforms/JumpThreading/codesize-loop.ll
+++ b/llvm/test/Transforms/JumpThreading/codesize-loop.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S %s -o - | FileCheck %s --check-prefix=DEFAULT
-; RUN: opt -jump-threading -S -jump-threading-threshold=6 %s -o - | FileCheck %s --check-prefix=OVERIDE
+; RUN: opt -passes=jump-threading -S %s -o - | FileCheck %s --check-prefix=DEFAULT
+; RUN: opt -passes=jump-threading -S -jump-threading-threshold=6 %s -o - | FileCheck %s --check-prefix=OVERIDE
 
 @.str = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1
 define i32 @test_minsize(i32 %argc, ptr nocapture readonly %argv) local_unnamed_addr #0 {
diff --git a/llvm/test/Transforms/JumpThreading/combine-metadata.ll b/llvm/test/Transforms/JumpThreading/combine-metadata.ll
index 2dde9c4..f44894a 100644
--- a/llvm/test/Transforms/JumpThreading/combine-metadata.ll
+++ b/llvm/test/Transforms/JumpThreading/combine-metadata.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 
 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:128:128"
 target triple = "i386-apple-darwin7"
diff --git a/llvm/test/Transforms/JumpThreading/compare.ll b/llvm/test/Transforms/JumpThreading/compare.ll
index 9b05b44..af39a54 100644
--- a/llvm/test/Transforms/JumpThreading/compare.ll
+++ b/llvm/test/Transforms/JumpThreading/compare.ll
@@ -1,5 +1,5 @@
 ; There should be no phi nodes left.
-; RUN: opt < %s -jump-threading  -S | not grep "phi i32"
+; RUN: opt < %s -passes=jump-threading  -S | not grep "phi i32"
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/conservative-lvi.ll b/llvm/test/Transforms/JumpThreading/conservative-lvi.ll
index 1ea8cdc..7a0e33a 100644
--- a/llvm/test/Transforms/JumpThreading/conservative-lvi.ll
+++ b/llvm/test/Transforms/JumpThreading/conservative-lvi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S %s | FileCheck %s
 
 ; Check that we thread arg2neg -> checkpos -> end.
 ;
diff --git a/llvm/test/Transforms/JumpThreading/constant-fold-status.ll b/llvm/test/Transforms/JumpThreading/constant-fold-status.ll
index 76a9db5..5d452d6 100644
--- a/llvm/test/Transforms/JumpThreading/constant-fold-status.ll
+++ b/llvm/test/Transforms/JumpThreading/constant-fold-status.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading < %s -S -o - | FileCheck %s
+; RUN: opt -passes=jump-threading < %s -S -o - | FileCheck %s
 
 ; Reproducer for PR47297.
 
diff --git a/llvm/test/Transforms/JumpThreading/crash.ll b/llvm/test/Transforms/JumpThreading/crash.ll
index 260554c..69ef3b9 100644
--- a/llvm/test/Transforms/JumpThreading/crash.ll
+++ b/llvm/test/Transforms/JumpThreading/crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 ; PR2285
 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/Transforms/JumpThreading/ddt-crash.ll b/llvm/test/Transforms/JumpThreading/ddt-crash.ll
index 4cc1363c..2491edb 100644
--- a/llvm/test/Transforms/JumpThreading/ddt-crash.ll
+++ b/llvm/test/Transforms/JumpThreading/ddt-crash.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -disable-output
+; RUN: opt < %s -passes=jump-threading -disable-output
 
 %struct.ham = type { i8, i8, i16, i32 }
 %struct.zot = type { ptr }
diff --git a/llvm/test/Transforms/JumpThreading/ddt-crash2.ll b/llvm/test/Transforms/JumpThreading/ddt-crash2.ll
index 04d7b62..dfe8165 100644
--- a/llvm/test/Transforms/JumpThreading/ddt-crash2.ll
+++ b/llvm/test/Transforms/JumpThreading/ddt-crash2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -disable-output
+; RUN: opt < %s -passes=jump-threading -disable-output
 
 %struct.aaa = type { i8 }
 
diff --git a/llvm/test/Transforms/JumpThreading/ddt-crash3.ll b/llvm/test/Transforms/JumpThreading/ddt-crash3.ll
index cb45610..0f99e6b 100644
--- a/llvm/test/Transforms/JumpThreading/ddt-crash3.ll
+++ b/llvm/test/Transforms/JumpThreading/ddt-crash3.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -disable-output -verify-dom-info
+; RUN: opt < %s -passes=jump-threading -disable-output -verify-dom-info
 
 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/JumpThreading/ddt-crash4.ll b/llvm/test/Transforms/JumpThreading/ddt-crash4.ll
index 24bf36e..e92412a 100644
--- a/llvm/test/Transforms/JumpThreading/ddt-crash4.ll
+++ b/llvm/test/Transforms/JumpThreading/ddt-crash4.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -disable-output -verify-dom-info
+; RUN: opt < %s -passes=jump-threading -disable-output -verify-dom-info
 @global = external global i64, align 8
 
 define void @f() {
diff --git a/llvm/test/Transforms/JumpThreading/degenerate-phi.ll b/llvm/test/Transforms/JumpThreading/degenerate-phi.ll
index 2905b43..6e0c233 100644
--- a/llvm/test/Transforms/JumpThreading/degenerate-phi.ll
+++ b/llvm/test/Transforms/JumpThreading/degenerate-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -disable-output < %s
+; RUN: opt -passes=jump-threading -disable-output < %s
 ; PR9112
 
 ; This is actually a test for value tracking. Jump threading produces
diff --git a/llvm/test/Transforms/JumpThreading/divergent-target-test.ll b/llvm/test/Transforms/JumpThreading/divergent-target-test.ll
index 34060fb..1f4ef04 100644
--- a/llvm/test/Transforms/JumpThreading/divergent-target-test.ll
+++ b/llvm/test/Transforms/JumpThreading/divergent-target-test.ll
@@ -1,8 +1,8 @@
 ; REQUIRES: amdgpu-registered-target && x86-registered-target
-; RUN: opt < %s -mtriple=amdgcn -jump-threading -S | FileCheck %s  -check-prefixes=CHECK,DIVERGENT
-; RUN: opt < %s -mtriple=amdgcn -passes=jump-threading -S | FileCheck %s  -check-prefixes=CHECK,DIVERGENT
-; RUN: opt < %s -mtriple=x86_64 -jump-threading -S | FileCheck %s  -check-prefixes=CHECK,UNIFORM
-; RUN: opt < %s -mtriple=x86_64 -passes=jump-threading -S | FileCheck %s  -check-prefixes=CHECK,UNIFORM
+; RUN: opt < %s -mtriple=amdgcn -passes=jump-threading -S | FileCheck %s -check-prefixes=CHECK,DIVERGENT
+; RUN: opt < %s -mtriple=amdgcn -passes=jump-threading -S | FileCheck %s -check-prefixes=CHECK,DIVERGENT
+; RUN: opt < %s -mtriple=x86_64 -passes=jump-threading -S | FileCheck %s -check-prefixes=CHECK,UNIFORM
+; RUN: opt < %s -mtriple=x86_64 -passes=jump-threading -S | FileCheck %s -check-prefixes=CHECK,UNIFORM
 
 ; Here we assure that for the target with no branch divergence usual Jump Threading optimization performed
 ; For target with branch divergence - no optimization, so the IR is unchanged.
diff --git a/llvm/test/Transforms/JumpThreading/fold-not-thread.ll b/llvm/test/Transforms/JumpThreading/fold-not-thread.ll
index 003cf81..4c78801 100644
--- a/llvm/test/Transforms/JumpThreading/fold-not-thread.ll
+++ b/llvm/test/Transforms/JumpThreading/fold-not-thread.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S -verify < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify < %s | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/free_instructions.ll b/llvm/test/Transforms/JumpThreading/free_instructions.ll
index 75b2628..3485bf8 100644
--- a/llvm/test/Transforms/JumpThreading/free_instructions.ll
+++ b/llvm/test/Transforms/JumpThreading/free_instructions.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -jump-threading -jump-threading-threshold=3 < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading -jump-threading-threshold=3 < %s | FileCheck %s
 
 ; TODO: In this test case, only the stores in %join should cound towards
 ; the jump threading threshold, as everything else are free instructions.
diff --git a/llvm/test/Transforms/JumpThreading/freeze-impliescond.ll b/llvm/test/Transforms/JumpThreading/freeze-impliescond.ll
index 0962e0e..8a3c838 100644
--- a/llvm/test/Transforms/JumpThreading/freeze-impliescond.ll
+++ b/llvm/test/Transforms/JumpThreading/freeze-impliescond.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare void @f()
 
diff --git a/llvm/test/Transforms/JumpThreading/freeze-lvi-edgevaluelocal.ll b/llvm/test/Transforms/JumpThreading/freeze-lvi-edgevaluelocal.ll
index db851c4..aa092d7 100644
--- a/llvm/test/Transforms/JumpThreading/freeze-lvi-edgevaluelocal.ll
+++ b/llvm/test/Transforms/JumpThreading/freeze-lvi-edgevaluelocal.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare void @f()
 declare void @f2()
diff --git a/llvm/test/Transforms/JumpThreading/freeze.ll b/llvm/test/Transforms/JumpThreading/freeze.ll
index 8bbadcb..c83a12b 100644
--- a/llvm/test/Transforms/JumpThreading/freeze.ll
+++ b/llvm/test/Transforms/JumpThreading/freeze.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/guards.ll b/llvm/test/Transforms/JumpThreading/guards.ll
index 6845215..d916fca 100644
--- a/llvm/test/Transforms/JumpThreading/guards.ll
+++ b/llvm/test/Transforms/JumpThreading/guards.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -jump-threading -dce -S | FileCheck %s
+; RUN: opt -S -passes=jump-threading,dce < %s | FileCheck %s
 
 declare void @llvm.experimental.guard(i1, ...)
 
diff --git a/llvm/test/Transforms/JumpThreading/header-succ.ll b/llvm/test/Transforms/JumpThreading/header-succ.ll
index d4da77c..e631ed0 100644
--- a/llvm/test/Transforms/JumpThreading/header-succ.ll
+++ b/llvm/test/Transforms/JumpThreading/header-succ.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 ; Check that the heuristic for avoiding accidental introduction of irreducible
 ; loops doesn't also prevent us from threading simple constructs where this
diff --git a/llvm/test/Transforms/JumpThreading/implied-cond.ll b/llvm/test/Transforms/JumpThreading/implied-cond.ll
index 49c0982..8aa8790 100644
--- a/llvm/test/Transforms/JumpThreading/implied-cond.ll
+++ b/llvm/test/Transforms/JumpThreading/implied-cond.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare void @side_effect(i32)
 
diff --git a/llvm/test/Transforms/JumpThreading/indirectbr-cast-int-op.ll b/llvm/test/Transforms/JumpThreading/indirectbr-cast-int-op.ll
index bb83153..e3faa50 100644
--- a/llvm/test/Transforms/JumpThreading/indirectbr-cast-int-op.ll
+++ b/llvm/test/Transforms/JumpThreading/indirectbr-cast-int-op.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 ; The indirectbr needs a block address. The add can't produce that.
 ; This shouldn't crash.
diff --git a/llvm/test/Transforms/JumpThreading/indirectbr-in-predpred.ll b/llvm/test/Transforms/JumpThreading/indirectbr-in-predpred.ll
index 1ed903d..d9fd332 100644
--- a/llvm/test/Transforms/JumpThreading/indirectbr-in-predpred.ll
+++ b/llvm/test/Transforms/JumpThreading/indirectbr-in-predpred.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S < %s -jump-threading | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading | FileCheck %s
 
 define i1 @test1(i32 %0) #0 {
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/JumpThreading/indirectbr.ll b/llvm/test/Transforms/JumpThreading/indirectbr.ll
index 43c8d9c..b6a4d79 100644
--- a/llvm/test/Transforms/JumpThreading/indirectbr.ll
+++ b/llvm/test/Transforms/JumpThreading/indirectbr.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -jump-threading | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading | FileCheck %s
 
 ; Keep block addresses alive.
 @addresses = constant [4 x ptr] [
diff --git a/llvm/test/Transforms/JumpThreading/induction.ll b/llvm/test/Transforms/JumpThreading/induction.ll
index 6124aab..99571a5 100644
--- a/llvm/test/Transforms/JumpThreading/induction.ll
+++ b/llvm/test/Transforms/JumpThreading/induction.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 define i8 @test(i32 %a, i32 %length) {
 ; CHECK-LABEL: @test(
diff --git a/llvm/test/Transforms/JumpThreading/insert-placeholder-to-prevent-infinite-recursion.ll b/llvm/test/Transforms/JumpThreading/insert-placeholder-to-prevent-infinite-recursion.ll
index 23a689f..b6d5e14 100644
--- a/llvm/test/Transforms/JumpThreading/insert-placeholder-to-prevent-infinite-recursion.ll
+++ b/llvm/test/Transforms/JumpThreading/insert-placeholder-to-prevent-infinite-recursion.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 @a = common dso_local local_unnamed_addr global i16 0, align 2
 
 ; Function Attrs: nofree norecurse nounwind
diff --git a/llvm/test/Transforms/JumpThreading/is_constant.ll b/llvm/test/Transforms/JumpThreading/is_constant.ll
index 12d0451..c33fa856 100644
--- a/llvm/test/Transforms/JumpThreading/is_constant.ll
+++ b/llvm/test/Transforms/JumpThreading/is_constant.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S -verify < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify < %s | FileCheck %s
 
 ; This is reduced from the Linux net/ipv4/tcp.c file built with ASAN. We
 ; don't want jump threading to split up a basic block which has a PHI node with
diff --git a/llvm/test/Transforms/JumpThreading/landing-pad.ll b/llvm/test/Transforms/JumpThreading/landing-pad.ll
index de80ff8..c92ae71 100644
--- a/llvm/test/Transforms/JumpThreading/landing-pad.ll
+++ b/llvm/test/Transforms/JumpThreading/landing-pad.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -disable-output -jump-threading
+; RUN: opt -passes=jump-threading -disable-output < %s
 
 %class.E = type { ptr, %class.C }
 %class.C = type { %class.A }
diff --git a/llvm/test/Transforms/JumpThreading/loop-phi.ll b/llvm/test/Transforms/JumpThreading/loop-phi.ll
index 7ec69f9..1d22d69 100644
--- a/llvm/test/Transforms/JumpThreading/loop-phi.ll
+++ b/llvm/test/Transforms/JumpThreading/loop-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S -jump-threading-across-loop-headers | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S -jump-threading-across-loop-headers | FileCheck %s
 
 ; Make sure we correctly distinguish between %tmp15 and %tmp16 when we clone
 ; body2.
diff --git a/llvm/test/Transforms/JumpThreading/lvi-load.ll b/llvm/test/Transforms/JumpThreading/lvi-load.ll
index e37bf21..5605955 100644
--- a/llvm/test/Transforms/JumpThreading/lvi-load.ll
+++ b/llvm/test/Transforms/JumpThreading/lvi-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading -dce < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,dce < %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"
 target triple = "x86_64-apple-darwin10.4"
 
diff --git a/llvm/test/Transforms/JumpThreading/lvi-tristate.ll b/llvm/test/Transforms/JumpThreading/lvi-tristate.ll
index ee01400..63a704c 100644
--- a/llvm/test/Transforms/JumpThreading/lvi-tristate.ll
+++ b/llvm/test/Transforms/JumpThreading/lvi-tristate.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading,simplifycfg -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck %s
 declare void @ham()
 
 define void @hoge() {
diff --git a/llvm/test/Transforms/JumpThreading/ne-undef.ll b/llvm/test/Transforms/JumpThreading/ne-undef.ll
index cf3c9db..437ff38 100644
--- a/llvm/test/Transforms/JumpThreading/ne-undef.ll
+++ b/llvm/test/Transforms/JumpThreading/ne-undef.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S %s | FileCheck %s
 
 declare i1 @cond()
 
diff --git a/llvm/test/Transforms/JumpThreading/no-irreducible-loops.ll b/llvm/test/Transforms/JumpThreading/no-irreducible-loops.ll
index 8e4d7cb..63d9a66 100644
--- a/llvm/test/Transforms/JumpThreading/no-irreducible-loops.ll
+++ b/llvm/test/Transforms/JumpThreading/no-irreducible-loops.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -loop-rotate -instcombine -indvars -loop-unroll -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S -verify-dom-info -verify-loop-info > %t
+; RUN: opt -S < %s -passes=jump-threading,loop-rotate,instcombine,indvars,loop-unroll,simplifycfg -simplifycfg-require-and-preserve-domtree=1 -verify-dom-info -verify-loop-info > %t
 ; RUN: grep "store volatile" %t | count 3
 ; RUN: not grep "br label" %t
 
diff --git a/llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll b/llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll
index 362f232..248bb08 100644
--- a/llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll
+++ b/llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 define void @test(ptr %ptr) {
 ; CHECK-LABEL: @test(
diff --git a/llvm/test/Transforms/JumpThreading/nonnull-gep-out-of-bounds.ll b/llvm/test/Transforms/JumpThreading/nonnull-gep-out-of-bounds.ll
index 8a51390..683e723 100644
--- a/llvm/test/Transforms/JumpThreading/nonnull-gep-out-of-bounds.ll
+++ b/llvm/test/Transforms/JumpThreading/nonnull-gep-out-of-bounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S %s -o - | FileCheck %s
+; RUN: opt -passes=jump-threading -S %s -o - | FileCheck %s
 
 define i32 @f(ptr %a, i64 %i) {
 entry:
diff --git a/llvm/test/Transforms/JumpThreading/or-undef.ll b/llvm/test/Transforms/JumpThreading/or-undef.ll
index 54558c1..eb58589 100644
--- a/llvm/test/Transforms/JumpThreading/or-undef.ll
+++ b/llvm/test/Transforms/JumpThreading/or-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 ; rdar://7620633
 
 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"
diff --git a/llvm/test/Transforms/JumpThreading/phi-copy-to-pred.ll b/llvm/test/Transforms/JumpThreading/phi-copy-to-pred.ll
index 0266e15..17f3b1a 100644
--- a/llvm/test/Transforms/JumpThreading/phi-copy-to-pred.ll
+++ b/llvm/test/Transforms/JumpThreading/phi-copy-to-pred.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare void @f()
 declare void @g()
diff --git a/llvm/test/Transforms/JumpThreading/phi-eq.ll b/llvm/test/Transforms/JumpThreading/phi-eq.ll
index 0a0c689..67fcabc 100644
--- a/llvm/test/Transforms/JumpThreading/phi-eq.ll
+++ b/llvm/test/Transforms/JumpThreading/phi-eq.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 ; Test whether two consecutive switches with identical structures assign the
 ; proper value to the proper variable.  This is really testing
 ; Instruction::isIdenticalToWhenDefined, as previously that function was
diff --git a/llvm/test/Transforms/JumpThreading/phi-known.ll b/llvm/test/Transforms/JumpThreading/phi-known.ll
index 72be8dc..e638d779 100644
--- a/llvm/test/Transforms/JumpThreading/phi-known.ll
+++ b/llvm/test/Transforms/JumpThreading/phi-known.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading %s | FileCheck %s
 
 ; Value of predicate known on all inputs (trivial case)
 ; Note: InstCombine/EarlyCSE would also get this case
diff --git a/llvm/test/Transforms/JumpThreading/pr15851_hang.ll b/llvm/test/Transforms/JumpThreading/pr15851_hang.ll
index 41ca951..9b04d45 100644
--- a/llvm/test/Transforms/JumpThreading/pr15851_hang.ll
+++ b/llvm/test/Transforms/JumpThreading/pr15851_hang.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 ; CHECK-LABEL: @f(
 ; CHECK-LABEL: entry
diff --git a/llvm/test/Transforms/JumpThreading/pr22086.ll b/llvm/test/Transforms/JumpThreading/pr22086.ll
index 35d9aa5..38a4fe4 100644
--- a/llvm/test/Transforms/JumpThreading/pr22086.ll
+++ b/llvm/test/Transforms/JumpThreading/pr22086.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 
 ; CHECK-LABEL: @f(
diff --git a/llvm/test/Transforms/JumpThreading/pr27840.ll b/llvm/test/Transforms/JumpThreading/pr27840.ll
index 5a05b98..e0deced 100644
--- a/llvm/test/Transforms/JumpThreading/pr27840.ll
+++ b/llvm/test/Transforms/JumpThreading/pr27840.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
diff --git a/llvm/test/Transforms/JumpThreading/pr33605.ll b/llvm/test/Transforms/JumpThreading/pr33605.ll
index 1d64525..e75b989 100644
--- a/llvm/test/Transforms/JumpThreading/pr33605.ll
+++ b/llvm/test/Transforms/JumpThreading/pr33605.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 
 ; Skip simplifying unconditional branches from empty blocks in simplifyCFG,
 ; when it can destroy canonical loop structure.
diff --git a/llvm/test/Transforms/JumpThreading/pr33917.ll b/llvm/test/Transforms/JumpThreading/pr33917.ll
index 2264466..7d21a4e 100644
--- a/llvm/test/Transforms/JumpThreading/pr33917.ll
+++ b/llvm/test/Transforms/JumpThreading/pr33917.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -correlated-propagation %s -S | FileCheck %s
+; RUN: opt -S -passes=jump-threading,correlated-propagation %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/JumpThreading/pr36133.ll b/llvm/test/Transforms/JumpThreading/pr36133.ll
index b593116..e9b9b75 100644
--- a/llvm/test/Transforms/JumpThreading/pr36133.ll
+++ b/llvm/test/Transforms/JumpThreading/pr36133.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 @global = external global ptr, align 8
 
 define i32 @foo(i32 %arg) {
diff --git a/llvm/test/Transforms/JumpThreading/pr40992-indirectbr-folding.ll b/llvm/test/Transforms/JumpThreading/pr40992-indirectbr-folding.ll
index e4dadd3..05fd861 100644
--- a/llvm/test/Transforms/JumpThreading/pr40992-indirectbr-folding.ll
+++ b/llvm/test/Transforms/JumpThreading/pr40992-indirectbr-folding.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -jump-threading | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading | FileCheck %s
 
 ; PR40992: Do not incorrectly fold %bb5 into an unconditional br to %bb7.
 ;          Also verify we correctly thread %bb1 -> %bb7 when %c is false.
diff --git a/llvm/test/Transforms/JumpThreading/pr46857-callbr.ll b/llvm/test/Transforms/JumpThreading/pr46857-callbr.ll
index f1d0629..1a1fe9a 100644
--- a/llvm/test/Transforms/JumpThreading/pr46857-callbr.ll
+++ b/llvm/test/Transforms/JumpThreading/pr46857-callbr.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 
 define i1 @func(i1 %arg, i32 %arg1, i1 %arg2) {
 ; CHECK-LABEL: @func(
diff --git a/llvm/test/Transforms/JumpThreading/pr9331.ll b/llvm/test/Transforms/JumpThreading/pr9331.ll
index 4c06d52..aa7a93e 100644
--- a/llvm/test/Transforms/JumpThreading/pr9331.ll
+++ b/llvm/test/Transforms/JumpThreading/pr9331.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s
+; RUN: opt -passes=jump-threading -S < %s
 
 define void @func(i8 zeroext %p_44) nounwind {
 entry:
diff --git a/llvm/test/Transforms/JumpThreading/pre-load.ll b/llvm/test/Transforms/JumpThreading/pre-load.ll
index c326b6a..d9a2dc2 100644
--- a/llvm/test/Transforms/JumpThreading/pre-load.ll
+++ b/llvm/test/Transforms/JumpThreading/pre-load.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 @x = global i32 0
 @y = global i32 0
diff --git a/llvm/test/Transforms/JumpThreading/range-compare.ll b/llvm/test/Transforms/JumpThreading/range-compare.ll
index b2136d8..837856b 100644
--- a/llvm/test/Transforms/JumpThreading/range-compare.ll
+++ b/llvm/test/Transforms/JumpThreading/range-compare.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-;RUN: opt < %s -jump-threading -S | FileCheck %s
+;RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 
 
 declare void @bar(...)
diff --git a/llvm/test/Transforms/JumpThreading/redundant-dbg-info.ll b/llvm/test/Transforms/JumpThreading/redundant-dbg-info.ll
index 7927df9..7659d72 100644
--- a/llvm/test/Transforms/JumpThreading/redundant-dbg-info.ll
+++ b/llvm/test/Transforms/JumpThreading/redundant-dbg-info.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 define dso_local i32 @_Z3fooi(i32 %a) !dbg !7 {
 entry:
diff --git a/llvm/test/Transforms/JumpThreading/removed-use.ll b/llvm/test/Transforms/JumpThreading/removed-use.ll
index bc97429..40b82d2 100644
--- a/llvm/test/Transforms/JumpThreading/removed-use.ll
+++ b/llvm/test/Transforms/JumpThreading/removed-use.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -jump-threading | FileCheck %s
+; RUN: opt -S < %s -passes=jump-threading | FileCheck %s
 ; CHECK-LABEL: @foo
 ; CHECK: bb6:
 ; CHECK-NEXT: ret void
diff --git a/llvm/test/Transforms/JumpThreading/select-unfold-msan.ll b/llvm/test/Transforms/JumpThreading/select-unfold-msan.ll
index ea336e0..d3183a7 100644
--- a/llvm/test/Transforms/JumpThreading/select-unfold-msan.ll
+++ b/llvm/test/Transforms/JumpThreading/select-unfold-msan.ll
@@ -1,5 +1,5 @@
 ; PR45220
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 declare i1 @NOP()
 
diff --git a/llvm/test/Transforms/JumpThreading/select.ll b/llvm/test/Transforms/JumpThreading/select.ll
index 2c9fb48..aedfab8 100644
--- a/llvm/test/Transforms/JumpThreading/select.ll
+++ b/llvm/test/Transforms/JumpThreading/select.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 declare void @foo()
 declare void @bar()
diff --git a/llvm/test/Transforms/JumpThreading/static-profile.ll b/llvm/test/Transforms/JumpThreading/static-profile.ll
index 8e4dacd..f64e689 100644
--- a/llvm/test/Transforms/JumpThreading/static-profile.ll
+++ b/llvm/test/Transforms/JumpThreading/static-profile.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading < %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading < %s | FileCheck %s
 
 ; Check that based solely on static profile estimation we don't update the
 ; branch-weight metadata.  Even if the function has an entry frequency, a
diff --git a/llvm/test/Transforms/JumpThreading/thread-cmp.ll b/llvm/test/Transforms/JumpThreading/thread-cmp.ll
index 7f4d7e0..d67f215 100644
--- a/llvm/test/Transforms/JumpThreading/thread-cmp.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-cmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading %s | FileCheck %s
 ; When simplify a branch based on LVI predicates, we should replace the
 ; comparison itself with a constant (when possible) in case it's otherwise used.
 
diff --git a/llvm/test/Transforms/JumpThreading/thread-loads.ll b/llvm/test/Transforms/JumpThreading/thread-loads.ll
index 9f616ea..a730be9 100644
--- a/llvm/test/Transforms/JumpThreading/thread-loads.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-loads.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt < %s -passes=jump-threading -S | FileCheck %s
 ; RUN: opt < %s -aa-pipeline=basic-aa -passes=jump-threading -S | FileCheck %s
 
 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:128:128"
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-1.ll b/llvm/test/Transforms/JumpThreading/thread-prob-1.ll
index 5793281..e595391 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-1.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we set the branch probability for the newly created
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-2.ll b/llvm/test/Transforms/JumpThreading/thread-prob-2.ll
index 0cd7216..d2b5b9e 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-2.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we clear edge probabilities for bb.cond as we fold
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-3.ll b/llvm/test/Transforms/JumpThreading/thread-prob-3.ll
index 27d060e..705bb47 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-3.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we set edge probabilities for bb2 as we
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-4.ll b/llvm/test/Transforms/JumpThreading/thread-prob-4.ll
index 2e3f1f2..e80985c 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-4.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-4.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we clear edge probabilities for bb1 as we fold
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-5.ll b/llvm/test/Transforms/JumpThreading/thread-prob-5.ll
index 89bf2ad..a3bcfdd 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-5.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-5.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we clear edge probabilities for bb1 as we fold
diff --git a/llvm/test/Transforms/JumpThreading/thread-prob-6.ll b/llvm/test/Transforms/JumpThreading/thread-prob-6.ll
index 1e0949f..0384c73 100644
--- a/llvm/test/Transforms/JumpThreading/thread-prob-6.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-prob-6.ll
@@ -1,4 +1,4 @@
-; RUN: opt -debug-only=branch-prob -jump-threading -S %s 2>&1 | FileCheck %s
+; RUN: opt -debug-only=branch-prob -passes=jump-threading -S %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 
 ; Make sure that we clear edge probabilities for bb1 as we fold
diff --git a/llvm/test/Transforms/JumpThreading/thread-two-bbs-cuda.ll b/llvm/test/Transforms/JumpThreading/thread-two-bbs-cuda.ll
index 8f36563..8a9e6f7 100644
--- a/llvm/test/Transforms/JumpThreading/thread-two-bbs-cuda.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-two-bbs-cuda.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S -verify | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify < %s | FileCheck %s
 
 target datalayout = "e-i64:64-i128:128-v16:16-v32:32-n16:32:64"
 target triple = "nvptx64-nvidia-cuda"
diff --git a/llvm/test/Transforms/JumpThreading/thread-two-bbs-msvc.ll b/llvm/test/Transforms/JumpThreading/thread-two-bbs-msvc.ll
index 0b037ad..fae3735 100644
--- a/llvm/test/Transforms/JumpThreading/thread-two-bbs-msvc.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-two-bbs-msvc.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S -verify | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify < %s | FileCheck %s
 
 target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc19.16.27026"
diff --git a/llvm/test/Transforms/JumpThreading/thread-two-bbs-threshold.ll b/llvm/test/Transforms/JumpThreading/thread-two-bbs-threshold.ll
index 3e3799e..5cb70ad 100644
--- a/llvm/test/Transforms/JumpThreading/thread-two-bbs-threshold.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-two-bbs-threshold.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -jump-threading -jump-threading-threshold=3 -S -verify | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify -jump-threading-threshold=3 < %s | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/JumpThreading/thread-two-bbs.ll b/llvm/test/Transforms/JumpThreading/thread-two-bbs.ll
index 7bbd7c0..f7e6b21 100644
--- a/llvm/test/Transforms/JumpThreading/thread-two-bbs.ll
+++ b/llvm/test/Transforms/JumpThreading/thread-two-bbs.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -jump-threading -S -verify | FileCheck %s
+; RUN: opt -S -passes=jump-threading,verify < %s | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/Transforms/JumpThreading/threadable-edge-cast.ll b/llvm/test/Transforms/JumpThreading/threadable-edge-cast.ll
index ef1e8f28..26283bb 100644
--- a/llvm/test/Transforms/JumpThreading/threadable-edge-cast.ll
+++ b/llvm/test/Transforms/JumpThreading/threadable-edge-cast.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()
diff --git a/llvm/test/Transforms/JumpThreading/threading_prof1.ll b/llvm/test/Transforms/JumpThreading/threading_prof1.ll
index 9be8ff9..affd3d7 100644
--- a/llvm/test/Transforms/JumpThreading/threading_prof1.ll
+++ b/llvm/test/Transforms/JumpThreading/threading_prof1.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 ; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 define void @test() {
diff --git a/llvm/test/Transforms/JumpThreading/threading_prof2.ll b/llvm/test/Transforms/JumpThreading/threading_prof2.ll
index 93cdc22..91294ee 100644
--- a/llvm/test/Transforms/JumpThreading/threading_prof2.ll
+++ b/llvm/test/Transforms/JumpThreading/threading_prof2.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 ; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 define void @test() {
 bb:
diff --git a/llvm/test/Transforms/JumpThreading/threading_prof3.ll b/llvm/test/Transforms/JumpThreading/threading_prof3.ll
index b235c9b..91a982b 100644
--- a/llvm/test/Transforms/JumpThreading/threading_prof3.ll
+++ b/llvm/test/Transforms/JumpThreading/threading_prof3.ll
@@ -1,4 +1,4 @@
-; RUN: opt -jump-threading -S < %s | FileCheck %s
+; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 ; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 ; Check that all zero branch weights do not cause a crash.
diff --git a/llvm/test/Transforms/JumpThreading/unreachable-loops.ll b/llvm/test/Transforms/JumpThreading/unreachable-loops.ll
index 9c83fd7..8d64976 100644
--- a/llvm/test/Transforms/JumpThreading/unreachable-loops.ll
+++ b/llvm/test/Transforms/JumpThreading/unreachable-loops.ll
@@ -1,5 +1,4 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -jump-threading -S < %s | FileCheck %s
 ; RUN: opt -passes=jump-threading -S < %s | FileCheck %s
 
 ; Check the unreachable loop won't cause infinite loop
diff --git a/llvm/test/Transforms/JumpThreading/update-edge-weight.ll b/llvm/test/Transforms/JumpThreading/update-edge-weight.ll
index e6a6093..e82949f 100644
--- a/llvm/test/Transforms/JumpThreading/update-edge-weight.ll
+++ b/llvm/test/Transforms/JumpThreading/update-edge-weight.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -jump-threading %s | FileCheck %s
+; RUN: opt -S -passes=jump-threading %s | FileCheck %s
 ; RUN: opt -S -passes=jump-threading %s | FileCheck %s
 
 ; Test if edge weights are properly updated after jump threading.
-- 
2.7.4