IR printing improvement for loop passes - handle -print-module-scope

[fedor.sergeev]

Summary

Adding support for -print-module-scope similar to how it is
being done for function passes. This option causes loop-pass printer
to emit a whole-module IR instead of just a loop itself.

[sanjoy]

lib/Analysis/LoopInfo.cpp

742 ↗

(On Diff #123580)

Use BasicBlock::getModule() here.

[fedor.sergeev]

Simplifying module printing sequence, as per Sanjoy's suggestion.

[fedor.sergeev]

ugh.. somebody here needs to think before hitting enter..

llvm/trunk/lib/Analysis/LoopInfo.cpp

 
 PreservedAnalyses LoopPrinterPass::run(Function &F,
                                        FunctionAnalysisManager &AM) {
   AM.getResult<LoopAnalysis>(F).print(OS);
   return PreservedAnalyses::all();
 }
 
 void llvm::printLoop(Loop &L, raw_ostream &OS, const std::string &Banner) {
+
+  if (forcePrintModuleIR()) {
+    // handling -print-module-scope
+    OS << Banner << " (loop: ";
+    L.getHeader()->printAsOperand(OS, false);
+    OS << ")\n";
+
+    // printing whole module
+    OS << *L.getHeader()->getModule();
+    return;
+  }
+
   OS << Banner;
 
   auto *PreHeader = L.getLoopPreheader();
   if (PreHeader) {
     OS << "\n; Preheader:";
     PreHeader->print(OS);
     OS << "\n; Loop:";
   }

llvm/trunk/test/Other/loop-pass-printer.ll

 ; This test checks -print-after/before on loop passes
 ; Besides of the loop itself it should be dumping loop pre-header and exits.
 ;
 ; RUN: opt < %s 2>&1 -disable-output \
 ; RUN:     -loop-deletion -print-before=loop-deletion \
 ; RUN:     | FileCheck %s -check-prefix=DEL
 ; RUN: opt < %s 2>&1 -disable-output \
 ; RUN:     -loop-unroll -print-after=loop-unroll -filter-print-funcs=bar \
 ; RUN:     | FileCheck %s -check-prefix=BAR
-;
+; RUN: opt < %s 2>&1 -disable-output \
+; RUN:     -loop-unroll -print-after=loop-unroll -filter-print-funcs=foo -print-module-scope \
+; RUN:     | FileCheck %s -check-prefix=FOO-MODULE
 
 ; DEL:      IR Dump Before
 ; DEL-SAME: dead loops
 ; DEL:      ; Preheader:
 ; DEL-NEXT:  %idx = alloca i32, align 4
 ; DEL:      ; Loop:
 ; DEL-NEXT:  loop:
 ; DEL:       cont:

 ; BAR:      IR Dump After
 ; BAR-SAME: Unroll
 ; BAR:      ; Preheader:
 ; BAR-NEXT:  br label %loop
 ; BAR:      ; Loop:
 ; BAR-NEXT:  loop:
 ; BAR:      ; Exit blocks
 ; BAR:       end:
-; BAR-NOT: IR Dump Before
+; BAR-NOT: IR Dump
 ; BAR-NOT:  ; Loop
 
+; FOO-MODULE: IR Dump After
+; FOO-MODULE-SAME: Unroll
+; FOO-MODULE-SAME: loop: %loop
+; FOO-MODULE-NEXT: ModuleID =
+; FOO-MODULE: define void @foo
+; FOO-MODULE: define void @bar
+; FOO-MODULE-NOT: IR Dump
+
 define void @foo(){
   %idx = alloca i32, align 4
   store i32 0, i32* %idx, align 4
   br label %loop
 
 loop:
   %1 = load i32, i32* %idx, align 4
   %2 = icmp slt i32 %1, 10