Rename VerifierKind and verify output

Author: paperchalice

llvm/include/llvm/Passes/CodeGenPassBuilder.h

@@ -548,6 +548,9 @@ Error CodeGenPassBuilder<Derived, TargetMachineT>::buildPipeline(
   if (auto Err = derived().addMachinePasses(addPass))
     return std::move(Err);
 
+  if (!Opt.DisableVerify)
+    addPass(MachineVerifierPass());
+
   if (PrintAsm) {
     derived().addAsmPrinter(
         addPass, [this, &Out, DwoOut, FileType](MCContext &Ctx) {

llvm/tools/llc/NewPMDriver.cpp

@@ -105,16 +105,15 @@ int llvm::compileModuleWithNewPM(
 
   // Fetch options from TargetPassConfig
   CGPassBuilderOption Opt = getCGPassBuilderOption();
-  Opt.DisableVerify = VK == VerifierKind::NoVerifier;
+  Opt.DisableVerify = VK != VerifierKind::InputOutput;
   Opt.DebugPM = DebugPM;
   Opt.RegAlloc = RegAlloc;
 
   MachineModuleInfo MMI(&LLVMTM);
 
   PassInstrumentationCallbacks PIC;
   StandardInstrumentations SI(Context, Opt.DebugPM,
-                              /*VerifyEach=*/VK ==
-                                  VerifierKind::VerifyEachPass);
+                              VK == VerifierKind::EachPass);
   registerCodeGenCallback(PIC, LLVMTM);
 
   MachineFunctionAnalysisManager MFAM;
@@ -150,7 +149,7 @@ int llvm::compileModuleWithNewPM(
     ExitOnErr(PB.parsePassPipeline(MPM, PassPipeline));
     MPM.addPass(PrintMIRPreparePass(*OS));
     MachineFunctionPassManager MFPM;
-    if (VK == VerifierKind::VerifyOut)
+    if (VK == VerifierKind::InputOutput)
       MFPM.addPass(MachineVerifierPass());
     MFPM.addPass(PrintMIRPass(*OS));
     FPM.addPass(createFunctionToMachineFunctionPassAdaptor(std::move(MFPM)));

llvm/tools/llc/NewPMDriver.h

@@ -32,7 +32,7 @@ class ToolOutputFile;
 class LLVMContext;
 class MIRParser;
 
-enum class VerifierKind { NoVerifier, VerifyOut, VerifyEachPass };
+enum class VerifierKind { None, InputOutput, EachPass };
 
 struct LLCDiagnosticHandler : public DiagnosticHandler {
   bool handleDiagnostics(const DiagnosticInfo &DI) override;

llvm/tools/llc/llc.cpp

@@ -650,11 +650,11 @@ static int compileModule(char **argv, LLVMContext &Context) {
     WithColor::warning(errs(), argv[0])
         << ": warning: ignoring -mc-relax-all because filetype != obj";
 
-  VerifierKind VK = VerifierKind::VerifyOut;
+  VerifierKind VK = VerifierKind::InputOutput;
   if (NoVerify)
-    VK = VerifierKind::NoVerifier;
+    VK = VerifierKind::None;
   else if (VerifyEach)
-    VK = VerifierKind::VerifyEachPass;
+    VK = VerifierKind::EachPass;
 
   if (EnableNewPassManager || !PassPipeline.empty()) {
     return compileModuleWithNewPM(argv[0], std::move(M), std::move(MIR),