diff --git a/llvm/test/tools/llvm-reduce/custom-delta-passes.ll b/llvm/test/tools/llvm-reduce/custom-delta-passes.ll
index 7c36d52e8885e..0be76ab1bf743 100644
--- a/llvm/test/tools/llvm-reduce/custom-delta-passes.ll
+++ b/llvm/test/tools/llvm-reduce/custom-delta-passes.ll
@@ -1,12 +1,12 @@
-; RUN: llvm-reduce --delta-passes=module-data --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=module-data --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefix=CHECK-NOCHANGE %s < %t
-; RUN: llvm-reduce --delta-passes=function-bodies --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=function-bodies --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefix=CHECK-CHANGE %s < %t
-; RUN: llvm-reduce --delta-passes=function-bodies,module-data --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=function-bodies,module-data --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefix=CHECK-CHANGE %s < %t
 
-; RUN: not llvm-reduce --delta-passes=foo --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
-; RUN: not llvm-reduce --delta-passes='function-bodies;module-data' --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
+; RUN: not llvm-reduce --abort-on-invalid-reduction --delta-passes=foo --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
+; RUN: not llvm-reduce --abort-on-invalid-reduction --delta-passes='function-bodies;module-data' --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
 
 ; RUN: llvm-reduce --print-delta-passes --test FileCheck %s 2>&1 | FileCheck %s --check-prefix=PRINT
 
diff --git a/llvm/test/tools/llvm-reduce/do-not-remove-terminator.ll b/llvm/test/tools/llvm-reduce/do-not-remove-terminator.ll
index c517781f5547c..c22837fd12a08 100644
--- a/llvm/test/tools/llvm-reduce/do-not-remove-terminator.ll
+++ b/llvm/test/tools/llvm-reduce/do-not-remove-terminator.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-FINAL %s
 
 ; Make sure we do not remove the terminator of the entry block. The interesting
diff --git a/llvm/test/tools/llvm-reduce/fail-file-open.test b/llvm/test/tools/llvm-reduce/fail-file-open.test
index 7c649e1d39f81..a121538433aec 100644
--- a/llvm/test/tools/llvm-reduce/fail-file-open.test
+++ b/llvm/test/tools/llvm-reduce/fail-file-open.test
@@ -1,4 +1,4 @@
-# RUN: not llvm-reduce --test=echo %s.NotAFileInTestingDir 2>&1 | FileCheck %s
+# RUN: not llvm-reduce --abort-on-invalid-reduction --test=echo %s.NotAFileInTestingDir 2>&1 | FileCheck %s
 
 This file will not be read. An invalid file path is fed to llvm-reduce.
 
diff --git a/llvm/test/tools/llvm-reduce/granularity-level.ll b/llvm/test/tools/llvm-reduce/granularity-level.ll
index 41b81af0a178f..8951c025253b4 100644
--- a/llvm/test/tools/llvm-reduce/granularity-level.ll
+++ b/llvm/test/tools/llvm-reduce/granularity-level.ll
@@ -1,6 +1,6 @@
 ; Test that llvm-reduce produces the same output when starting at a higher granularity level.
 ;
-; RUN: llvm-reduce --delta-passes=functions,instructions --starting-granularity-level=2 --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions,instructions --starting-granularity-level=2 --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck -implicit-check-not=uninteresting --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 define i32 @uninteresting1() {
diff --git a/llvm/test/tools/llvm-reduce/no-replace-intrinsic-callee-with-undef.ll b/llvm/test/tools/llvm-reduce/no-replace-intrinsic-callee-with-undef.ll
index 152f83266f9eb..f184e04c366b2 100644
--- a/llvm/test/tools/llvm-reduce/no-replace-intrinsic-callee-with-undef.ll
+++ b/llvm/test/tools/llvm-reduce/no-replace-intrinsic-callee-with-undef.ll
@@ -3,11 +3,11 @@
 ; not replaced. The whole call instruction can be removed by instruction
 ; reduction instead.
 
-; RUN: llvm-reduce --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefixes=ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2> %t.log
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefixes=ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2> %t.log
 ; RUN: FileCheck -implicit-check-not=uninteresting --check-prefixes=ALL,CHECK-FINAL %s < %t
 
 ; Check that the call is removed by instruction reduction passes
-; RUN: llvm-reduce --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefix=ALL --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefix=ALL --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck -implicit-check-not=uninteresting --check-prefixes=ALL,CHECK-NOCALL %s < %t
 
 
diff --git a/llvm/test/tools/llvm-reduce/operands-skip-parallel.ll b/llvm/test/tools/llvm-reduce/operands-skip-parallel.ll
index 5d6f1083b84f7..11e6647986dc5 100644
--- a/llvm/test/tools/llvm-reduce/operands-skip-parallel.ll
+++ b/llvm/test/tools/llvm-reduce/operands-skip-parallel.ll
@@ -1,8 +1,8 @@
 ; This reuses llvm/test/tools/llvm-reduce/operands-skip.ll
 ; REQUIRES: thread_support
 
-; RUN: llvm-reduce -j 2 %S/operands-skip.ll -o %t.1 --delta-passes=operands-skip --test FileCheck --test-arg %S/operands-skip.ll --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
+; RUN: llvm-reduce --abort-on-invalid-reduction -j 2 %S/operands-skip.ll -o %t.1 --delta-passes=operands-skip --test FileCheck --test-arg %S/operands-skip.ll --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
 ; RUN: FileCheck %S/operands-skip.ll --input-file %t.1 --check-prefixes=REDUCED
 
-; RUN: llvm-reduce -j 4 %S/operands-skip.ll -o %t.2 --delta-passes=operands-skip --test FileCheck --test-arg %S/operands-skip.ll --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
+; RUN: llvm-reduce --abort-on-invalid-reduction -j 4 %S/operands-skip.ll -o %t.2 --delta-passes=operands-skip --test FileCheck --test-arg %S/operands-skip.ll --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
 ; RUN: FileCheck %S/operands-skip.ll --input-file %t.2 --check-prefixes=REDUCED
diff --git a/llvm/test/tools/llvm-reduce/operands-skip.ll b/llvm/test/tools/llvm-reduce/operands-skip.ll
index 415d67d722572..505f1d7e36906 100644
--- a/llvm/test/tools/llvm-reduce/operands-skip.ll
+++ b/llvm/test/tools/llvm-reduce/operands-skip.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce %s -o %t --delta-passes=operands-skip --test FileCheck --test-arg %s --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
+; RUN: llvm-reduce %s -o %t --abort-on-invalid-reduction --delta-passes=operands-skip --test FileCheck --test-arg %s --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
 ; RUN: FileCheck %s --input-file %t --check-prefixes=REDUCED
 
 ; INTERESTING: store i32 43, ptr {{(%imm|%indirect)}}, align 4
diff --git a/llvm/test/tools/llvm-reduce/operands-to-args.ll b/llvm/test/tools/llvm-reduce/operands-to-args.ll
index 481487eed3a21..bb2d3363eff11 100644
--- a/llvm/test/tools/llvm-reduce/operands-to-args.ll
+++ b/llvm/test/tools/llvm-reduce/operands-to-args.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce %s -o %t --delta-passes=operands-to-args --test FileCheck --test-arg %s --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
+; RUN: llvm-reduce %s -o %t --abort-on-invalid-reduction --delta-passes=operands-to-args --test FileCheck --test-arg %s --test-arg --match-full-lines --test-arg --check-prefix=INTERESTING --test-arg --input-file
 ; RUN: FileCheck %s --input-file %t --check-prefixes=REDUCED,INTERESTING
 
 ; REDUCED-LABEL: define void @func(i32 %k, ptr %Local, ptr %Global) {
diff --git a/llvm/test/tools/llvm-reduce/oracle-count.ll b/llvm/test/tools/llvm-reduce/oracle-count.ll
index 948c6da262e24..25349929cebab 100644
--- a/llvm/test/tools/llvm-reduce/oracle-count.ll
+++ b/llvm/test/tools/llvm-reduce/oracle-count.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
 ; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s
 
 ; CHECK-INTERESTINGNESS: ret i32
diff --git a/llvm/test/tools/llvm-reduce/parallel-workitem-kill.ll b/llvm/test/tools/llvm-reduce/parallel-workitem-kill.ll
index da52a8bfdcc13..bafb7f2f41f91 100644
--- a/llvm/test/tools/llvm-reduce/parallel-workitem-kill.ll
+++ b/llvm/test/tools/llvm-reduce/parallel-workitem-kill.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: thread_support
-; RUN: llvm-reduce -j 4 %s -o %t --delta-passes=instructions --test %python --test-arg %S/Inputs/sleep-and-check-stores.py --test-arg 1 --test-arg 5
+; RUN: llvm-reduce -j 4 %s -o %t --abort-on-invalid-reduction --delta-passes=instructions --test %python --test-arg %S/Inputs/sleep-and-check-stores.py --test-arg 1 --test-arg 5
 ; RUN: FileCheck %s < %t
 
 ; CHECK: define void @foo
diff --git a/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress-wrong-function.ll b/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress-wrong-function.ll
index 70aeb1fd53d94..f296553759f6b 100644
--- a/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress-wrong-function.ll
+++ b/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress-wrong-function.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=functions --test FileCheck --test-arg --check-prefixes=INTERESTING --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions --test FileCheck --test-arg --check-prefixes=INTERESTING --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=RESULT --input-file=%t %s
 
 ; FIXME: This testcase exhibits nonsensical behavior. The first
diff --git a/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress.ll b/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress.ll
index 4f84e59eaa414..8f811668de2aa 100644
--- a/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress.ll
+++ b/llvm/test/tools/llvm-reduce/reduce-functions-blockaddress.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=functions --test FileCheck --test-arg --check-prefixes=INTERESTING --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions --test FileCheck --test-arg --check-prefixes=INTERESTING --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=RESULT --input-file=%t %s
 
 ; Make sure we don't crash on blockaddress
diff --git a/llvm/test/tools/llvm-reduce/remove-alias.ll b/llvm/test/tools/llvm-reduce/remove-alias.ll
index d9ec4f768678b..1b8070ed27767 100644
--- a/llvm/test/tools/llvm-reduce/remove-alias.ll
+++ b/llvm/test/tools/llvm-reduce/remove-alias.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s
 
 ; Test handling of 'alias'.
diff --git a/llvm/test/tools/llvm-reduce/remove-all-of-multiple-args.ll b/llvm/test/tools/llvm-reduce/remove-all-of-multiple-args.ll
index 52c2fd4f53810..7ba0bd11d1401 100644
--- a/llvm/test/tools/llvm-reduce/remove-all-of-multiple-args.ll
+++ b/llvm/test/tools/llvm-reduce/remove-all-of-multiple-args.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 define i32 @t(i32 %a0, i32 %a1, i32 %a2) {
diff --git a/llvm/test/tools/llvm-reduce/remove-args-2.ll b/llvm/test/tools/llvm-reduce/remove-args-2.ll
index ee22ccec1eb70..d2461496b262b 100644
--- a/llvm/test/tools/llvm-reduce/remove-args-2.ll
+++ b/llvm/test/tools/llvm-reduce/remove-args-2.ll
@@ -1,7 +1,7 @@
 ; Test that llvm-reduce can remove uninteresting function arguments from function definitions as well as their calls.
 ; This test checks that functions with different argument types are handled correctly
 ;
-; RUN: llvm-reduce --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s --input-file %t
 
 %struct.foo = type { ptr, i32, i32, ptr }
diff --git a/llvm/test/tools/llvm-reduce/remove-args-fn-passed-through-call.ll b/llvm/test/tools/llvm-reduce/remove-args-fn-passed-through-call.ll
index 9716f075e2408..4361dc0598066 100644
--- a/llvm/test/tools/llvm-reduce/remove-args-fn-passed-through-call.ll
+++ b/llvm/test/tools/llvm-reduce/remove-args-fn-passed-through-call.ll
@@ -1,7 +1,7 @@
 ; Test that llvm-reduce can remove uninteresting function arguments from function definitions as well as their calls.
 ; This test checks that functions with different argument types are handled correctly
 ;
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s --input-file %t
 
 declare void @pass(ptr)
diff --git a/llvm/test/tools/llvm-reduce/remove-args-from-declaration.ll b/llvm/test/tools/llvm-reduce/remove-args-from-declaration.ll
index f476495c57314..5f3741362b4c2 100644
--- a/llvm/test/tools/llvm-reduce/remove-args-from-declaration.ll
+++ b/llvm/test/tools/llvm-reduce/remove-args-from-declaration.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; CHECK-INTERESTINGNESS-LABEL: @interesting(
diff --git a/llvm/test/tools/llvm-reduce/remove-args-used-by-ret.ll b/llvm/test/tools/llvm-reduce/remove-args-used-by-ret.ll
index ddac7aabcf862..0872c23f12e11 100644
--- a/llvm/test/tools/llvm-reduce/remove-args-used-by-ret.ll
+++ b/llvm/test/tools/llvm-reduce/remove-args-used-by-ret.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; We can't drop arguments if they are used by terminator instructions.
diff --git a/llvm/test/tools/llvm-reduce/remove-args.ll b/llvm/test/tools/llvm-reduce/remove-args.ll
index 555cca5326810..95105ea664363 100644
--- a/llvm/test/tools/llvm-reduce/remove-args.ll
+++ b/llvm/test/tools/llvm-reduce/remove-args.ll
@@ -1,6 +1,6 @@
 ; Test that llvm-reduce can remove uninteresting function arguments from function definitions as well as their calls.
 ;
-; RUN: llvm-reduce -delta-passes=arguments --test %python --test-arg %p/Inputs/remove-args.py %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction -delta-passes=arguments --test %python --test-arg %p/Inputs/remove-args.py %s -o %t
 ; RUN: cat %t | FileCheck -implicit-check-not=uninteresting %s
 
 ; CHECK: @interesting(i32 %interesting)
diff --git a/llvm/test/tools/llvm-reduce/remove-attributes-from-intrinsic-like-functions.ll b/llvm/test/tools/llvm-reduce/remove-attributes-from-intrinsic-like-functions.ll
index 60df12e94feb2..4489c445e2b8c 100644
--- a/llvm/test/tools/llvm-reduce/remove-attributes-from-intrinsic-like-functions.ll
+++ b/llvm/test/tools/llvm-reduce/remove-attributes-from-intrinsic-like-functions.ll
@@ -1,6 +1,6 @@
 ; Just because a function is named like an intrinsic does not mean we should skip it's attributes.
 ;
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; CHECK-ALL: declare i32 @llvm.not.really.an.intrinsic(i32, i32) #0
diff --git a/llvm/test/tools/llvm-reduce/remove-dp-values.ll b/llvm/test/tools/llvm-reduce/remove-dp-values.ll
index 526dbce8456c3..40ff9f32e960d 100644
--- a/llvm/test/tools/llvm-reduce/remove-dp-values.ll
+++ b/llvm/test/tools/llvm-reduce/remove-dp-values.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t --try-experimental-debuginfo-iterators
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t --try-experimental-debuginfo-iterators
 ; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s --implicit-check-not=dbg.value
 
 ; Test that we can, in RemoveDIs mode / DPValues mode (where variable location
diff --git a/llvm/test/tools/llvm-reduce/remove-funcs.ll b/llvm/test/tools/llvm-reduce/remove-funcs.ll
index 39ba25ccd1273..3a744cc4776bf 100644
--- a/llvm/test/tools/llvm-reduce/remove-funcs.ll
+++ b/llvm/test/tools/llvm-reduce/remove-funcs.ll
@@ -1,7 +1,7 @@
 ; Test that llvm-reduce can remove uninteresting functions as well as
 ; their InstCalls.
 ;
-; RUN: llvm-reduce --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=functions,instructions --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck -implicit-check-not=uninteresting --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 define i32 @uninteresting1() {
diff --git a/llvm/test/tools/llvm-reduce/remove-function-arguments-of-funcs-used-in-blockaddress.ll b/llvm/test/tools/llvm-reduce/remove-function-arguments-of-funcs-used-in-blockaddress.ll
index 68052f25dbca0..b90492e348bf2 100644
--- a/llvm/test/tools/llvm-reduce/remove-function-arguments-of-funcs-used-in-blockaddress.ll
+++ b/llvm/test/tools/llvm-reduce/remove-function-arguments-of-funcs-used-in-blockaddress.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; CHECK-INTERESTINGNESS: define void @func(
diff --git a/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll b/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
index 65c210e70d4b2..bfa516ed3a763 100644
--- a/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
+++ b/llvm/test/tools/llvm-reduce/remove-function-bodies-comdat.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 ; RUN: opt -passes=verify %t
 
diff --git a/llvm/test/tools/llvm-reduce/remove-global-variable-attributes.ll b/llvm/test/tools/llvm-reduce/remove-global-variable-attributes.ll
index bec3afd960e90..e60aef27383c1 100644
--- a/llvm/test/tools/llvm-reduce/remove-global-variable-attributes.ll
+++ b/llvm/test/tools/llvm-reduce/remove-global-variable-attributes.ll
@@ -1,6 +1,6 @@
 ; Test that llvm-reduce can remove uninteresting attributes.
 ;
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; CHECK-ALL: @gv0 = global i32 0 #0
diff --git a/llvm/test/tools/llvm-reduce/remove-metadata-args.ll b/llvm/test/tools/llvm-reduce/remove-metadata-args.ll
index be0d67d3ebe26..bc88a8f941473 100644
--- a/llvm/test/tools/llvm-reduce/remove-metadata-args.ll
+++ b/llvm/test/tools/llvm-reduce/remove-metadata-args.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce %s -o %t --delta-passes=metadata --test FileCheck --test-arg %s --test-arg --check-prefix=EXCITING --test-arg --input-file
+; RUN: llvm-reduce %s -o %t --abort-on-invalid-reduction --delta-passes=metadata --test FileCheck --test-arg %s --test-arg --check-prefix=EXCITING --test-arg --input-file
 ; RUN: FileCheck %s --input-file %t --check-prefix=REDUCED
 
 ; All exciting stuff must remain in the reduced file.
diff --git a/llvm/test/tools/llvm-reduce/remove-multiple-use-of-global-vars-in-same-instruction.ll b/llvm/test/tools/llvm-reduce/remove-multiple-use-of-global-vars-in-same-instruction.ll
index 4da2b6d3e8dd9..d4e709c76285f 100644
--- a/llvm/test/tools/llvm-reduce/remove-multiple-use-of-global-vars-in-same-instruction.ll
+++ b/llvm/test/tools/llvm-reduce/remove-multiple-use-of-global-vars-in-same-instruction.ll
@@ -1,6 +1,6 @@
 ; Test that llvm-reduce can remove uninteresting function arguments from function definitions as well as their calls.
 ;
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefix=CHECK-ALL --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefix=CHECK-ALL --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefix=CHECK-ALL %s < %t
 
 ; CHECK-ALL: @uninteresting1 = global
diff --git a/llvm/test/tools/llvm-reduce/remove-operand-bundles.ll b/llvm/test/tools/llvm-reduce/remove-operand-bundles.ll
index dd205cd7b43f1..e70119a17224b 100644
--- a/llvm/test/tools/llvm-reduce/remove-operand-bundles.ll
+++ b/llvm/test/tools/llvm-reduce/remove-operand-bundles.ll
@@ -1,6 +1,6 @@
 ; Test that llvm-reduce can remove uninteresting operand bundles from calls.
 ;
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 ; CHECK-ALL: declare void @f1()
diff --git a/llvm/test/tools/llvm-reduce/remove-single-arg.ll b/llvm/test/tools/llvm-reduce/remove-single-arg.ll
index 96b48789fe3f4..402e754e56bcc 100644
--- a/llvm/test/tools/llvm-reduce/remove-single-arg.ll
+++ b/llvm/test/tools/llvm-reduce/remove-single-arg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 define i32 @t(i32 %a0) {
diff --git a/llvm/test/tools/llvm-reduce/remove-unused-declarations.ll b/llvm/test/tools/llvm-reduce/remove-unused-declarations.ll
index d1e69325c7c40..cbf2e34c1baf7 100644
--- a/llvm/test/tools/llvm-reduce/remove-unused-declarations.ll
+++ b/llvm/test/tools/llvm-reduce/remove-unused-declarations.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --test FileCheck --test-arg --check-prefix=CHECK-ALL --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefix=CHECK-ALL --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefix=CHECK-ALL --implicit-check-not=uninteresting %s < %t
 
 declare void @llvm.uninteresting()
diff --git a/llvm/test/tools/llvm-reduce/run-ir-passes.ll b/llvm/test/tools/llvm-reduce/run-ir-passes.ll
index d3dceec252286..3abc496b16edb 100644
--- a/llvm/test/tools/llvm-reduce/run-ir-passes.ll
+++ b/llvm/test/tools/llvm-reduce/run-ir-passes.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-reduce --delta-passes=ir-passes --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=ir-passes --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
 ; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s
 
 ; CHECK-INTERESTINGNESS-LABEL: @f1