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

---
 .../Transforms/JumpThreading/2008-11-27-EntryMunge.ll     | 2 +-
 llvm/test/Transforms/JumpThreading/2010-08-26-and.ll      | 2 +-
 .../JumpThreading/2011-04-02-SimplifyDeadBlock.ll         | 2 +-
 llvm/test/Transforms/JumpThreading/2011-04-14-InfLoop.ll  | 2 +-
 .../JumpThreading/2012-07-19-NoSuccessorIndirectBr.ll     | 2 +-
 .../Transforms/JumpThreading/PR33357-lvi-recursion.ll     | 2 +-
 llvm/test/Transforms/JumpThreading/PR37745.ll             | 2 +-
 .../JumpThreading/PR44611-across-header-hang.ll           | 2 +-
 .../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 +-
 .../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 +-
 .../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 +-
 .../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 +-
 .../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 +-
 .../Transforms/JumpThreading/indirectbr-cast-int-op.ll    | 2 +-
 .../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 +-
 .../test/Transforms/JumpThreading/no-irreducible-loops.ll | 2 +-
 llvm/test/Transforms/JumpThreading/noalias-scope-decl.ll  | 2 +-
 .../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 +-
 .../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 +-
 .../Transforms/JumpThreading/thread-two-bbs-threshold.ll  | 2 +-
 llvm/test/Transforms/JumpThreading/thread-two-bbs.ll      | 2 +-
 .../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 6a50d4f1a32c..05ca08766a24 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 bde993a4d3de..7ddc48e3abf9 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 76dd2d12bdec..4203000ff3ab 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 d905244ddd5c..393d499307df 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 a8b89fe96a25..2a4b4e3efa7f 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 a2a006ac8f3b..76ee63b37734 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 82fc91911821..8c846369d14c 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 d36a3a19f2fe..2f37039b2e9c 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 163f790a90c2..32873248bee7 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 7813ba43c331..651abdfc8aa4 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 b97aab88395e..c90c355c19ee 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 902bf0aa8f04..76dc61013b8c 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 77e8658b93a8..cef7b1dee90e 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 16e7549e3fc8..bb8eeb713716 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 958811764be9..2a9765233ec1 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 a5226483f675..ac2bf337fd86 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 16867b07c2e4..97e71a84a35b 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 9b9dedbc88df..8a9ae0a312c8 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 5818ad8d51e0..a1a2b1dfd15e 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 2dde9c42c08b..f44894abdbf0 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 9b05b4496b0c..af39a541c15c 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 1ea8cdc4693a..7a0e33a8a128 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 76a9db53861f..5d452d65e811 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 260554ca53b6..69ef3b976290 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 4cc1363c6beb..2491edba9497 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 04d7b62d5372..dfe816553dde 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 cb45610eb3a1..0f99e6b76190 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 24bf36e3b06c..e92412adec13 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 2905b43af72c..6e0c23345a87 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 34060fbb09d9..1f4ef04f80a9 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 003cf811dfa9..4c7880109259 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 75b262856612..3485bf8c98da 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 0962e0e88495..8a3c838bbce5 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 db851c46ff5c..aa092d72b82d 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 8bbadcbe2b46..c83a12b26d91 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 68452155ed6e..d916fca32185 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 d4da77c5de41..e631ed002c70 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 49c0982b7a4f..8aa8790b0fa1 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 bb83153393fb..e3faa50810b7 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 1ed903d26a0c..d9fd3327516a 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 43c8d9c759b4..b6a4d7940c2a 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 6124aab33385..99571a53ac5b 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 23a689f15b14..b6d5e14fb1a2 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 12d0451ef095..c33fa8563009 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 de80ff8189fe..c92ae71dd7c4 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 7ec69f97c258..1d22d69d75fa 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 e37bf2187069..560595537b12 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 ee0140035c3b..63a704c8bb27 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 cf3c9db651f1..437ff3824ef4 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 8e4d7cb89c9e..63d9a667225f 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 362f232dda09..248bb08ebf0e 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 8a5139030beb..683e723f1b33 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 54558c1539e3..eb585894b5b3 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 0266e158da09..17f3b1a3c4c2 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 0a0c6899fc60..67fcabc178f1 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 72be8dc2d464..e638d7796710 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 41ca9512dcb8..9b04d45b3503 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 35d9aa5b1841..38a4fe470f1e 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 5a05b98aa816..e0deced58140 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 1d64525f1157..e75b989f5499 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 2264466452a8..7d21a4e17815 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 b593116dd133..e9b9b75519f6 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 e4dadd303dc1..05fd86134e51 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 f1d062925161..1a1fe9a05d6e 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 4c06d526ca18..aa7a93e6b87e 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 c326b6a2f7f8..d9a2dc20a418 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 b2136d847667..837856bdb220 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 7927df9520de..7659d72babf7 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 bc97429cbae7..40b82d21ad08 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 ea336e0f0f7e..d3183a733236 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 2c9fb4882ba6..aedfab851d5d 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 8e4dacd957a5..f64e68943b98 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 7f4d7e0c19f8..d67f21580b50 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 9f616eae4761..a730be9492c8 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 579328140754..e59539123d6e 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 0cd721639498..d2b5b9e0e2a1 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 27d060e15952..705bb475287c 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 2e3f1f241bd8..e80985c7f8b0 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 89bf2ad4efcf..a3bcfdd87a28 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 1e0949ff6618..0384c73968b9 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 8f36563012b5..8a9e6f728936 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 0b037ad443e5..fae3735283f1 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 3e3799e902ed..5cb70adf87b4 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 7bbd7c0e1816..f7e6b2189dc8 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 ef1e8f28d14f..26283bb27209 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 9be8ff94cecb..affd3d7940c3 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 93cdc2274bc4..91294ee0a2fc 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 b235c9b72b93..91a982b9f55a 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 9c83fd7d485c..8d649761700a 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 e6a6093279de..e82949f7fd97 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.