diff --git a/llvm/test/Other/ChangePrinters/print-changed-diff.ll b/llvm/test/Other/ChangePrinters/print-changed-diff.ll --- a/llvm/test/Other/ChangePrinters/print-changed-diff.ll +++ b/llvm/test/Other/ChangePrinters/print-changed-diff.ll @@ -140,7 +140,6 @@ ; CHECK-DIFF-SIMPLE: *** IR Dump At Start *** ; CHECK-DIFF-SIMPLE: ModuleID = {{.+}} -; CHECK-DIFF-SIMPLE: *** IR Dump After VerifierPass on [module] omitted because no change *** ; CHECK-DIFF-SIMPLE: *** IR Dump After InstSimplifyPass on g *** ; CHECK-DIFF-SIMPLE-NOT: ModuleID = {{.+}} ; CHECK-DIFF-SIMPLE-NOT: *** IR{{.*}} @@ -353,7 +352,6 @@ ; CHECK-CDIFF-SIMPLE: *** IR Dump At Start *** ; CHECK-CDIFF-SIMPLE: ModuleID = {{.+}} -; CHECK-CDIFF-SIMPLE: *** IR Dump After VerifierPass on [module] omitted because no change *** ; CHECK-CDIFF-SIMPLE: *** IR Dump After InstSimplifyPass on g *** ; CHECK-CDIFF-SIMPLE-NOT: ModuleID = {{.+}} ; CHECK-CDIFF-SIMPLE-NOT: *** IR{{.*}} diff --git a/llvm/test/Other/change-printer.ll b/llvm/test/Other/change-printer.ll --- a/llvm/test/Other/change-printer.ll +++ b/llvm/test/Other/change-printer.ll @@ -109,7 +109,6 @@ ; CHECK-SIMPLE: *** IR Dump At Start *** ; CHECK-SIMPLE-NEXT: ; ModuleID = {{.+}} -; CHECK-SIMPLE: *** IR Dump After VerifierPass on [module] omitted because no change *** ; CHECK-SIMPLE: *** IR Dump After InstSimplifyPass on g *** ; CHECK-SIMPLE-NEXT: define i32 @g() ; CHECK-SIMPLE: *** IR Pass PassManager{{.*}} on g ignored *** @@ -189,7 +188,6 @@ ; CHECK-SIMPLE-BEFORE: *** IR Dump At Start *** ; CHECK-SIMPLE-BEFORE-NEXT: ; ModuleID = {{.+}} -; CHECK-SIMPLE-BEFORE: *** IR Dump After VerifierPass on [module] omitted because no change *** ; CHECK-SIMPLE-BEFORE: *** IR Dump Before InstSimplifyPass on g *** ; CHECK-SIMPLE-BEFORE-NEXT: define i32 @g() ; CHECK-SIMPLE-BEFORE: *** IR Dump After InstSimplifyPass on g *** diff --git a/llvm/test/Other/new-pass-manager-verify-each.ll b/llvm/test/Other/new-pass-manager-verify-each.ll --- a/llvm/test/Other/new-pass-manager-verify-each.ll +++ b/llvm/test/Other/new-pass-manager-verify-each.ll @@ -1,7 +1,7 @@ ; RUN: opt -disable-output -debug-pass-manager -verify-each -passes='no-op-module,verify,cgscc(no-op-cgscc,function(no-op-function,loop(no-op-loop)))' %s 2>&1 | FileCheck %s -; Added manually by opt at beginning -; CHECK: Running pass: VerifierPass +; opt already manually verifies input IR +; CHECK-NOT: Running pass: VerifierPass ; CHECK: Running pass: NoOpModulePass ; CHECK: Verifying module diff --git a/llvm/test/Other/new-pass-manager.ll b/llvm/test/Other/new-pass-manager.ll --- a/llvm/test/Other/new-pass-manager.ll +++ b/llvm/test/Other/new-pass-manager.ll @@ -39,7 +39,6 @@ ; RUN: opt -disable-output -debug-pass-manager -passes=print %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-MODULE-PRINT -; CHECK-MODULE-PRINT: Running pass: VerifierPass ; CHECK-MODULE-PRINT: Running pass: PrintModulePass ; CHECK-MODULE-PRINT: ModuleID ; CHECK-MODULE-PRINT: define void @foo(i1 %x, i8* %p1, i8* %p2) @@ -54,7 +53,6 @@ ; RUN: opt -disable-output -debug-pass-manager -passes='function(print)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-FUNCTION-PRINT -; CHECK-FUNCTION-PRINT: Running pass: VerifierPass ; CHECK-FUNCTION-PRINT: Running analysis: InnerAnalysisManagerProxy<{{.*}}> ; CHECK-FUNCTION-PRINT: Running pass: PrintFunctionPass ; CHECK-FUNCTION-PRINT-NOT: ModuleID @@ -93,7 +91,6 @@ ; CHECK-NO-VERIFY-NOT: VerifierPass ; CHECK-NO-VERIFY: Running pass: NoOpFunctionPass ; CHECK-NO-VERIFY-NOT: VerifierPass -; CHECK-NO-VERIFY-NOT: VerifierPass ; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ diff --git a/llvm/test/Other/opt-bisect-new-pass-manager.ll b/llvm/test/Other/opt-bisect-new-pass-manager.ll --- a/llvm/test/Other/opt-bisect-new-pass-manager.ll +++ b/llvm/test/Other/opt-bisect-new-pass-manager.ll @@ -21,19 +21,15 @@ ; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes=inferattrs -opt-bisect-limit=-1 %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-REQUIRED-PASS -; CHECK-REQUIRED-PASS-NOT: BISECT: {{.*}} VerifierPass -; CHECK-REQUIRED-PASS: Running pass: VerifierPass ; CHECK-REQUIRED-PASS: BISECT: running pass (1) InferFunctionAttrsPass on [module] -; CHECK-REQUIRED-PASS-NOT: BISECT: {{.*}} VerifierPass +; CHECK-REQUIRED-PASS-NOT: BISECT: {{.*}}VerifierPass ; CHECK-REQUIRED-PASS: Running pass: VerifierPass ; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes=inferattrs -opt-bisect-limit=0 %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-LIMIT-REQUIRED-PASS -; CHECK-LIMIT-REQUIRED-PASS-NOT: BISECT: {{.*}} VerifierPass -; CHECK-LIMIT-REQUIRED-PASS: Running pass: VerifierPass ; CHECK-LIMIT-REQUIRED-PASS: BISECT: NOT running pass (1) InferFunctionAttrsPass on [module] -; CHECK-LIMIT-REQUIRED-PASS-NOT: BISECT: {{.*}} VerifierPass +; CHECK-LIMIT-REQUIRED-PASS-NOT: BISECT: {{.*}}VerifierPass ; CHECK-LIMIT-REQUIRED-PASS: Running pass: VerifierPass ; RUN: opt -disable-output -disable-verify \ diff --git a/llvm/test/Other/printer.ll b/llvm/test/Other/printer.ll --- a/llvm/test/Other/printer.ll +++ b/llvm/test/Other/printer.ll @@ -8,7 +8,6 @@ ret void } -; CHECK: *** IR Dump After VerifierPass ; CHECK: *** IR Dump After PromotePass ; CHECK-NEXT: define void @tester ; CHECK: *** IR Dump After InstCombinePass diff --git a/llvm/tools/opt/NewPMDriver.h b/llvm/tools/opt/NewPMDriver.h --- a/llvm/tools/opt/NewPMDriver.h +++ b/llvm/tools/opt/NewPMDriver.h @@ -43,11 +43,7 @@ OK_OutputBitcode, OK_OutputThinLTOBitcode, }; -enum VerifierKind { - VK_NoVerifier, - VK_VerifyInAndOut, - VK_VerifyEachPass -}; +enum VerifierKind { VK_NoVerifier, VK_VerifyOut, VK_VerifyEachPass }; enum PGOKind { NoPGO, InstrGen, diff --git a/llvm/tools/opt/NewPMDriver.cpp b/llvm/tools/opt/NewPMDriver.cpp --- a/llvm/tools/opt/NewPMDriver.cpp +++ b/llvm/tools/opt/NewPMDriver.cpp @@ -438,8 +438,6 @@ PB.crossRegisterProxies(LAM, FAM, CGAM, MAM); ModulePassManager MPM; - if (VK > VK_NoVerifier) - MPM.addPass(VerifierPass()); if (EnableDebugify) MPM.addPass(NewPMDebugifyPass()); if (VerifyDIPreserve) diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -695,7 +695,7 @@ ? OK_OutputAssembly : (OutputThinLTOBC ? OK_OutputThinLTOBitcode : OK_OutputBitcode); - VerifierKind VK = VK_VerifyInAndOut; + VerifierKind VK = VK_VerifyOut; if (NoVerify) VK = VK_NoVerifier; else if (VerifyEach)