Add new option choices for print-changed that do not output llc changes.

[jamieschmeiser]

Summary

When looking at the opt pipeline as part of a compiler invocation (eg, using
clang++ -mllvm -print-changed=cdiff), I am being overwhelmed with the output from
llc...

Add extra option choices for print-changed, corresponding to the current
choices with a prefix of opt- which do not cause printing in llc.

Also, suppress printing in llc for dot-cfg and dot-cfg-quiet instead of quiet mode.

[MaskRay]

llvm/include/llvm/IR/PrintPasses.h

37

The number of modes is massive. Shall we use another option to indicate the intent (only show non-codegen passes)?

llvm/lib/CodeGen/MachineFunctionPass.cpp

131

I think we should keep enumerating all values to ensure a new mode does not silently get unhandled here.

[aeubanks]

if clang is giving you too much, you can always not run the backend passes with -emit-llvm when debugging

llvm/include/llvm/IR/PrintPasses.h

37

agreed, this is growing exponentially because it really should be multiple flags

something like
print-changed
print-changed-diff[=color]
print-ir-pass-changed (default true)
print-mir-pass-changed (default true)
print-dotcfg
print-changed-verbose (affects all change printers)
...

this will allow users to specify more than one change printer at once which I think is fine (could manually error out if not desired, but I don't think that's necessary)

[jamieschmeiser]

llvm/include/llvm/IR/PrintPasses.h

37

My first thought was to change the llc versions to print-llc-changed but I didn't want to propose changing a functionality that others may want (ie, having both come out with one option). I think having the two piggy-back on the same option is too much. The filtering options can be overloaded. What about the following?
print-changed[=diff|=cdiff] (both)
print-ir-changed[=diff|=cdiff]
print-mir-changed[=diff|=cdiff]
print-dotcfg
print-changed-verbose (defaults to false, affects all change printers)

The print-changed-verbose default could also be controlled by an environment variable

__LLVM_PRINT_CHANGED_VERBOSE_DEFAULT__==TRUE

(is there precedence?, better name?)

llvm/lib/CodeGen/MachineFunctionPass.cpp

131

Fine with me. I'll work that up

[MaskRay]

llvm/include/llvm/IR/PrintPasses.h

37

An environment variable for a debugging feature is too much. Users should know that the functionality is unstable like any other API, and perhaps more unstable since this is a debugging feature.

[jamieschmeiser]

llvm/include/llvm/IR/PrintPasses.h

37

@MaskRay @aeubanks I was just suggesting the environment variable as a way of customizing the option to avoid typing and am fine with dropping that idea. I am more interested in agreement about the proposed options. If there is concensus, I will make the appropriate changes but it makes sense to me to get agreement before spending the time making the code changes.

llvm/include/llvm/IR/PrintPasses.h

 enum class ChangePrinter {
   None,
   Verbose,
   Quiet,
   DiffVerbose,
   DiffQuiet,
   ColourDiffVerbose,
   ColourDiffQuiet,
+  LastLLCMode = ColourDiffQuiet,
+  // rest are opt only modes and not supported by llc
   DotCfgVerbose,
-  DotCfgQuiet
+  DotCfgQuiet,
+  OptVerbose,
+  OptQuiet,
+  OptDiffVerbose,
+  OptDiffQuiet,
+  OptColourDiffVerbose,
+  OptColourDiffQuiet,
+  OptDotCfgVerbose,
+  OptDotCfgQuiet
 };
 
 extern cl::opt<ChangePrinter> PrintChanged;
 
 // Returns true if printing before/after some pass is enabled, whether all
 // passes or a specific pass.
 bool shouldPrintBeforeSomePass();
 bool shouldPrintAfterSomePass();

llvm/lib/CodeGen/MachineFunctionPass.cpp

#endif
   SmallString<0> BeforeStr, AfterStr;
   StringRef PassID;
   if (PrintChanged != ChangePrinter::None) {
     if (const PassInfo *PI = Pass::lookupPassInfo(getPassID()))
       PassID = PI->getPassArgument();
   }
   const bool IsInterestingPass = isPassInPrintList(PassID);
   const bool ShouldPrintChanged = PrintChanged != ChangePrinter::None &&
+                                  PrintChanged <= ChangePrinter::LastLLCMode &&
                                   IsInterestingPass &&
                                   isFunctionInPrintList(MF.getName());
   if (ShouldPrintChanged) {
     raw_svector_ostream OS(BeforeStr);
     MF.print(OS);
   }
 
   bool RV = runOnMachineFunction(MF);
if (ShouldPrintChanged || !IsInterestingPass) {
     if (ShouldPrintChanged) {
       raw_svector_ostream OS(AfterStr);
       MF.print(OS);
     }
     if (IsInterestingPass && BeforeStr != AfterStr) {
       errs() << ("*** IR Dump After " + getPassName() + " (" + PassID +
                  ") on " + MF.getName() + " ***\n");
       switch (PrintChanged) {
-      case ChangePrinter::None:
+      default:
         llvm_unreachable("");
       case ChangePrinter::Quiet:
       case ChangePrinter::Verbose:
-      case ChangePrinter::DotCfgQuiet:   // unimplemented
-      case ChangePrinter::DotCfgVerbose: // unimplemented
         errs() << AfterStr;
         break;
       case ChangePrinter::DiffQuiet:
       case ChangePrinter::DiffVerbose:
       case ChangePrinter::ColourDiffQuiet:
       case ChangePrinter::ColourDiffVerbose: {
         bool Color = llvm::is_contained(
             {ChangePrinter::ColourDiffQuiet, ChangePrinter::ColourDiffVerbose},

llvm/lib/IR/PrintPasses.cpp

 // utility to do comparisons and insert the prefixes. For systems that do not
 // have the necessary facilities, the error message will be shown in place of
 // the expected output.
 cl::opt<ChangePrinter> llvm::PrintChanged(
     "print-changed", cl::desc("Print changed IRs"), cl::Hidden,
     cl::ValueOptional, cl::init(ChangePrinter::None),
     cl::values(
         clEnumValN(ChangePrinter::Quiet, "quiet", "Run in quiet mode"),
+        clEnumValN(ChangePrinter::OptQuiet, "opt-quiet",
+                   "Run in quiet mode for opt only"),
         clEnumValN(ChangePrinter::DiffVerbose, "diff",
                    "Display patch-like changes"),
+        clEnumValN(ChangePrinter::OptDiffVerbose, "opt-diff",
+                   "Display patch-like changes for opt only"),
         clEnumValN(ChangePrinter::DiffQuiet, "diff-quiet",
                    "Display patch-like changes in quiet mode"),
+        clEnumValN(ChangePrinter::OptDiffQuiet, "opt-diff-quiet",
+                   "Display patch-like changes in quiet mode for opt only"),
         clEnumValN(ChangePrinter::ColourDiffVerbose, "cdiff",
                    "Display patch-like changes with color"),
+        clEnumValN(ChangePrinter::OptColourDiffVerbose, "opt-cdiff",
+                   "Display patch-like changes with color for opt only"),
         clEnumValN(ChangePrinter::ColourDiffQuiet, "cdiff-quiet",
                    "Display patch-like changes in quiet mode with color"),
+        clEnumValN(
+            ChangePrinter::OptColourDiffQuiet, "opt-cdiff-quiet",
+            "Display patch-like changes in quiet mode with color for opt only"),
         clEnumValN(ChangePrinter::DotCfgVerbose, "dot-cfg",
                    "Create a website with graphical changes"),
+        clEnumValN(ChangePrinter::OptDotCfgVerbose, "opt-dot-cfg",
+                   "Create a website with graphical changes for opt only"),
         clEnumValN(ChangePrinter::DotCfgQuiet, "dot-cfg-quiet",
                    "Create a website with graphical changes in quiet mode"),
+        clEnumValN(ChangePrinter::OptDotCfgQuiet, "opt-dot-cfg-quiet",
+                   "Create a website with graphical changes in quiet mode for "
+                   "opt only"),
+        clEnumValN(ChangePrinter::OptVerbose, "opt", "Display for opt only"),
         // Sentinel value for unspecified option.
         clEnumValN(ChangePrinter::Verbose, "", "")));
 
 // An option for specifying the diff used by print-changed=[diff | diff-quiet]
 static cl::opt<std::string>
     DiffBinary("print-changed-diff-path", cl::Hidden, cl::init("diff"),
                cl::desc("system diff used by change reporters"));
 

llvm/lib/Passes/StandardInstrumentations.cpp

 void TextChangeReporter<T>::handleIgnored(StringRef PassID, std::string &Name) {
   Out << formatv("*** IR Pass {0} on {1} ignored ***\n", PassID, Name);
 }
 
 IRChangedPrinter::~IRChangedPrinter() = default;
 
 void IRChangedPrinter::registerCallbacks(PassInstrumentationCallbacks &PIC) {
   if (PrintChanged == ChangePrinter::Verbose ||
-      PrintChanged == ChangePrinter::Quiet)
+      PrintChanged == ChangePrinter::OptVerbose ||
+      PrintChanged == ChangePrinter::Quiet ||
+      PrintChanged == ChangePrinter::OptQuiet)
     TextChangeReporter<std::string>::registerRequiredCallbacks(PIC);
 }
 
 void IRChangedPrinter::generateIRRepresentation(Any IR, StringRef PassID,
                                                 std::string &Output) {
   raw_string_ostream OS(Output);
   unwrapAndPrint(OS, IR);
   OS.str();
FuncDataT<EmptyData>::report(
         const std::string Added = UseColour ? "\033[32m+%l\033[0m\n" : "+%l\n";
         const std::string NoChange = " %l\n";
         Out << doSystemDiff(BStr, AStr, Removed, Added, NoChange);
       });
 }
 
 void InLineChangePrinter::registerCallbacks(PassInstrumentationCallbacks &PIC) {
   if (PrintChanged == ChangePrinter::DiffVerbose ||
+      PrintChanged == ChangePrinter::OptDiffVerbose ||
       PrintChanged == ChangePrinter::DiffQuiet ||
+      PrintChanged == ChangePrinter::OptDiffQuiet ||
       PrintChanged == ChangePrinter::ColourDiffVerbose ||
-      PrintChanged == ChangePrinter::ColourDiffQuiet)
+      PrintChanged == ChangePrinter::OptColourDiffVerbose ||
+      PrintChanged == ChangePrinter::ColourDiffQuiet ||
+      PrintChanged == ChangePrinter::OptColourDiffQuiet)
     TextChangeReporter<IRDataT<EmptyData>>::registerRequiredCallbacks(PIC);
 }
 
 TimeProfilingPassesHandler::TimeProfilingPassesHandler() {}
 
 void TimeProfilingPassesHandler::registerCallbacks(
     PassInstrumentationCallbacks &PIC) {
   if (!getTimeTraceProfilerInstance())
*HTML
       << "</html>\n";
   HTML->flush();
   HTML->close();
 }
 
 void DotCfgChangeReporter::registerCallbacks(
     PassInstrumentationCallbacks &PIC) {
   if (PrintChanged == ChangePrinter::DotCfgVerbose ||
-       PrintChanged == ChangePrinter::DotCfgQuiet) {
+      PrintChanged == ChangePrinter::OptDotCfgVerbose ||
+      PrintChanged == ChangePrinter::DotCfgQuiet ||
+      PrintChanged == ChangePrinter::OptDotCfgQuiet) {
     SmallString<128> OutputDir;
     sys::fs::expand_tilde(DotCfgDir, OutputDir);
     sys::fs::make_absolute(OutputDir);
     assert(!OutputDir.empty() && "expected output dir to be non-empty");
     DotCfgDir = OutputDir.c_str();
     if (initializeHTML()) {
       ChangeReporter<IRDataT<DCData>>::registerRequiredCallbacks(PIC);
       return;
     }
     dbgs() << "Unable to open output stream for -cfg-dot-changed\n";
   }
 }
 
 StandardInstrumentations::StandardInstrumentations(
     bool DebugLogging, bool VerifyEach, PrintPassOptions PrintPassOpts)
     : PrintPass(DebugLogging, PrintPassOpts), OptNone(DebugLogging),
-      PrintChangedIR(PrintChanged == ChangePrinter::Verbose),
+      PrintChangedIR(PrintChanged == ChangePrinter::Verbose ||
+                     PrintChanged == ChangePrinter::OptVerbose),
       PrintChangedDiff(PrintChanged == ChangePrinter::DiffVerbose ||
-                           PrintChanged == ChangePrinter::ColourDiffVerbose,
+                           PrintChanged == ChangePrinter::OptDiffVerbose ||
                            PrintChanged == ChangePrinter::ColourDiffVerbose ||
-                           PrintChanged == ChangePrinter::ColourDiffQuiet),
-      WebsiteChangeReporter(PrintChanged == ChangePrinter::DotCfgVerbose),
+                           PrintChanged == ChangePrinter::OptColourDiffVerbose,
+                       PrintChanged == ChangePrinter::ColourDiffVerbose ||
+                           PrintChanged ==
+                               ChangePrinter::OptColourDiffVerbose ||
+                           PrintChanged == ChangePrinter::ColourDiffQuiet ||
+                           PrintChanged == ChangePrinter::OptColourDiffQuiet),
+      WebsiteChangeReporter(PrintChanged == ChangePrinter::DotCfgVerbose ||
+                            PrintChanged == ChangePrinter::OptDotCfgVerbose),
       Verify(DebugLogging), VerifyEach(VerifyEach) {}
 
 PrintCrashIRInstrumentation *PrintCrashIRInstrumentation::CrashReporter =
     nullptr;
 
 void PrintCrashIRInstrumentation::reportCrashIR() { dbgs() << SavedIR; }
 
 void PrintCrashIRInstrumentation::SignalHandler(void *) {

llvm/test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll

 ; Simple checks of -print-changed=dot-cfg
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: rm -rf %t && mkdir -p %t
 ; RUN: opt -disable-verify -S -print-changed=dot-cfg -passes=instsimplify -dot-cfg-dir=%t < %s -o /dev/null
 ; RUN: ls %t/*.pdf %t/passes.html | count 4
 ; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-SIMPLE
 ;
+; RUN: rm -rf %t && mkdir -p %t
+; RUN: opt -disable-verify -S -print-changed=opt-dot-cfg -passes=instsimplify -dot-cfg-dir=%t < %s -o /dev/null
+; RUN: ls %t/*.pdf %t/passes.html | count 4
+; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-SIMPLE
+;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: rm -rf %t && mkdir -p %t
 ; RUN: opt -disable-verify -S -print-changed=dot-cfg -passes=instsimplify -filter-print-funcs=f  -dot-cfg-dir=%t < %s -o /dev/null
 ; RUN: ls %t/*.pdf %t/passes.html | count 3
 ; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by

 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: rm -rf %t && mkdir -p %t
 ; RUN: opt -S -print-changed=dot-cfg-quiet -passes=instsimplify -dot-cfg-dir=%t < %s -o /dev/null
 ; RUN: ls %t/*.pdf %t/passes.html | count 3
 ; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-QUIET-SIMPLE --allow-empty
 ;
+; Simple functionality check.
+; RUN: rm -rf %t && mkdir -p %t
+; RUN: opt -S -print-changed=opt-dot-cfg-quiet -passes=instsimplify -dot-cfg-dir=%t < %s -o /dev/null
+; RUN: ls %t/*.pdf %t/passes.html | count 3
+; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-QUIET-SIMPLE --allow-empty
+;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: rm -rf %t && mkdir -p %t
 ; RUN: opt -S -print-changed=dot-cfg-quiet -passes=instsimplify -filter-print-funcs=f  -dot-cfg-dir=%t < %s -o /dev/null
 ; RUN: ls %t/*.pdf %t/passes.html | count 2
 ; RUN: FileCheck %s -input-file=%t/passes.html --check-prefix=CHECK-DOT-CFG-QUIET-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by

llvm/test/Other/ChangePrinters/print-changed-diff.ll

 ; Simple checks of -print-changed=diff
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed=diff -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-SIMPLE
+; RUN: opt -S -print-changed=opt-diff -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-SIMPLE
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed=diff -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by
 ; -print-module-scope
 ; RUN: opt -S -print-changed=diff -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-PRINT-MOD-SCOPE

 ; RUN: opt -S -print-changed=diff -passes="instsimplify,instsimplify" -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-MULT-PASSES-FILTER-FUNC
 ;
 ; Simple checks of -print-changed=diff-quiet
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed=diff-quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-QUIET-SIMPLE --allow-empty
+; RUN: opt -S -print-changed=opt-diff-quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-QUIET-SIMPLE --allow-empty
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed=diff-quiet -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-QUIET-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by
 ; -print-module-scope
 ; RUN: opt -S -print-changed=diff-quiet -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-QUIET-PRINT-MOD-SCOPE

 ; RUN: opt -S -print-changed=diff-quiet -passes="instsimplify,instsimplify" -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-DIFF-QUIET-MULT-PASSES-FILTER-FUNC
 
 ; Simple checks of -print-changed=cdiff
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed=cdiff -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-SIMPLE
+; RUN: opt -S -print-changed=opt-cdiff -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-SIMPLE
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed=cdiff -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by
 ; -print-module-scope
 ; RUN: opt -S -print-changed=cdiff -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-PRINT-MOD-SCOPE

 ; RUN: opt -S -print-changed=cdiff -passes="instsimplify,instsimplify" -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-MULT-PASSES-FILTER-FUNC
 ;
 ; Simple checks of -print-changed=cdiff-quiet
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed=cdiff-quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-QUIET-SIMPLE --allow-empty
+; RUN: opt -S -print-changed=opt-cdiff-quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-QUIET-SIMPLE --allow-empty
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed=cdiff-quiet -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-QUIET-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects is not affected by
 ; -print-module-scope
 ; RUN: opt -S -print-changed=cdiff-quiet -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-CDIFF-QUIET-PRINT-MOD-SCOPE

llvm/test/Other/change-printer.ll

 ; Simple checks of -print-changed functionality
 ;
 ; Note that (mostly) only the banners are checked.
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-SIMPLE
+; Cannot do the expected test as the test harness substitutes the path to opt
+; for -print-changed=opt
+; R_U_N: opt -S -print-changed=opt -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-SIMPLE
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed= -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-SIMPLE
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-FUNC-FILTER
 ;

 ;
 ; Check that the reporting of IRs with -print-before-changed respects -print-module-scope
 ; RUN: opt -S -print-changed -print-before-changed -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-PRINT-MOD-SCOPE-BEFORE
 ;
 ; Simple checks of -print-changed=quiet functionality
 ;
 ; Simple functionality check.
 ; RUN: opt -S -print-changed=quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-QUIET-SIMPLE
+; RUN: opt -S -print-changed=opt-quiet -passes=instsimplify 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-QUIET-SIMPLE
 ;
 ; Check that only the passes that change the IR are printed and that the
 ; others (including g) are filtered out.
 ; RUN: opt -S -print-changed=quiet -passes=instsimplify -filter-print-funcs=f  2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-QUIET-FUNC-FILTER
 ;
 ; Check that the reporting of IRs respects -print-module-scope
 ; RUN: opt -S -print-changed=quiet -passes=instsimplify -print-module-scope 2>&1 -o /dev/null < %s | FileCheck %s --check-prefix=CHECK-QUIET-PRINT-MOD-SCOPE
 ;

llvm/test/Other/print-changed-machine.ll

 ; VERBOSE-FILTER:      *** IR Dump After IRTranslator (irtranslator) on foo ***
 ; VERBOSE-FILTER:      *** IR Dump After AArch64O0PreLegalizerCombiner (aarch64-O0-prelegalizer-combiner) on foo filtered out ***
 ; VERBOSE-FILTER:      *** IR Dump After Legalizer (legalizer) on foo ***
 ; VERBOSE-FILTER-NOT:  *** IR Dump After {{.*}} () on
 
 ; QUIET-FILTER: *** IR Dump After IRTranslator (irtranslator) on foo ***
 ; QUIET-FILTER: *** IR Dump After IRTranslator (irtranslator) on bar ***
 
-;; dot-cfg/dot-cfg-quiet are unimplemented. Currently they behave like 'quiet'.
-; RUN: llc -filetype=null -mtriple=aarch64 -O0 -print-changed=dot-cfg %s 2>&1 | FileCheck %s --check-prefix=QUIET
+; EMPTY-NOT: *** IR Dump
+
+;; dot-cfg/dot-cfg-quiet are unimplemented. Currently they produce nothing.
+;; Same with the opt-... versions.
+; RUN: llc -filetype=null -mtriple=aarch64 -O0 -print-changed=dot-cfg %s 2>&1 | FileCheck %s --allow-empty -check-prefix=EMPTY
+; RUN: llc -filetype=null -mtriple=aarch64 -O0 -print-changed=opt-quiet %s 2>&1 | FileCheck %s --allow-empty -check-prefix=EMPTY
 
 @var = global i32 0
 
 define void @foo(i32 %a) {
 entry:
   %b = add i32 %a, 1
   store i32 %b, ptr @var
   ret void
 }
 
 define void @bar(i32 %a) {
 entry:
   %b = add i32 %a, 2
   store i32 %b, ptr @var
   ret void
 }