Index: include/llvm/Passes/StandardInstrumentations.h =================================================================== --- include/llvm/Passes/StandardInstrumentations.h +++ include/llvm/Passes/StandardInstrumentations.h @@ -16,14 +16,40 @@ #ifndef LLVM_PASSES_STANDARDINSTRUMENTATIONS_H #define LLVM_PASSES_STANDARDINSTRUMENTATIONS_H +#include "llvm/ADT/SmallVector.h" #include "llvm/IR/PassInstrumentation.h" #include "llvm/IR/PassTimingInfo.h" +#include +#include + namespace llvm { +class Module; +class PrintIRInstrumentation { +public: + PrintIRInstrumentation() = default; + + void registerCallbacks(PassInstrumentationCallbacks &PIC); + +private: + bool printBeforePass(StringRef PassID, Any IR); + void printAfterPass(StringRef PassID, Any IR); + void printAfterPassInvalidated(StringRef PassID); + + using PrintModuleDesc = std::tuple; + + void pushModuleDesc(StringRef PassID, Any IR); + PrintModuleDesc popModuleDesc(StringRef PassID); + + SmallVector ModuleDescStack; + bool StoreModuleDesc = false; +}; + /// This class provides an interface to register all the standard pass /// instrumentations and manages their state (if any). class StandardInstrumentations { + PrintIRInstrumentation PrintIR; TimePassesHandler TimePasses; public: Index: lib/Passes/StandardInstrumentations.cpp =================================================================== --- lib/Passes/StandardInstrumentations.cpp +++ lib/Passes/StandardInstrumentations.cpp @@ -28,16 +28,10 @@ using namespace llvm; namespace { -namespace PrintIR { -//===----------------------------------------------------------------------===// -// IR-printing instrumentation -//===----------------------------------------------------------------------===// - -/// Generic IR-printing helper that unpacks a pointer to IRUnit wrapped into -/// llvm::Any and does actual print job. -void unwrapAndPrint(StringRef Banner, Any IR) { - SmallString<40> Extra{"\n"}; +// Function +std::pair unwrapModule(Any IR) { + std::string Extra; const Module *M = nullptr; if (any_isa(IR)) { M = any_cast(IR); @@ -46,31 +40,12 @@ const Function *F = any_cast(IR); assert(F && "function should be valid for printing"); if (!llvm::isFunctionInPrintList(F->getName())) - return; - if (!llvm::forcePrintModuleIR()) { - dbgs() << Banner << Extra << static_cast(*F); - return; - } + return {nullptr, std::string()}; M = F->getParent(); - Extra = formatv(" (function: {0})\n", F->getName()); + Extra = formatv(" (function: {0})", F->getName()); } else if (any_isa(IR)) { const LazyCallGraph::SCC *C = any_cast(IR); assert(C); - if (!llvm::forcePrintModuleIR()) { - Extra = formatv(" (scc: {0})\n", C->getName()); - bool BannerPrinted = false; - for (const LazyCallGraph::Node &N : *C) { - const Function &F = N.getFunction(); - if (!F.isDeclaration() && isFunctionInPrintList(F.getName())) { - if (!BannerPrinted) { - dbgs() << Banner << Extra; - BannerPrinted = true; - } - F.print(dbgs()); - } - } - return; - } for (const LazyCallGraph::Node &N : *C) { const Function &F = N.getFunction(); if (!F.isDeclaration() && isFunctionInPrintList(F.getName())) { @@ -79,65 +54,191 @@ } } if (!M) - return; - Extra = formatv(" (for scc: {0})\n", C->getName()); + return {nullptr, std::string()}; + Extra = formatv(" (scc: {0})", C->getName()); } else if (any_isa(IR)) { const Loop *L = any_cast(IR); assert(L && "Loop should be valid for printing"); const Function *F = L->getHeader()->getParent(); if (!isFunctionInPrintList(F->getName())) - return; - if (!llvm::forcePrintModuleIR()) { - llvm::printLoop(const_cast(*L), dbgs(), Banner); - return; - } + return {nullptr, std::string()}; M = F->getParent(); { std::string LoopName; raw_string_ostream ss(LoopName); L->getHeader()->printAsOperand(ss, false); - Extra = formatv(" (loop: {0})\n", ss.str()); + Extra = formatv(" (loop: {0})", ss.str()); } } - if (M) { - dbgs() << Banner << Extra; - M->print(dbgs(), nullptr, false); - } else { - llvm_unreachable("Unknown wrapped IR type"); + assert(M && "module should be valid for printing"); + return {M, std::move(Extra)}; +} + +void printIR(const Module *M, StringRef Banner, StringRef Extra = StringRef()) { + dbgs() << Banner << Extra << "\n"; + M->print(dbgs(), nullptr, false); +} +void printIR(const Function *F, StringRef Banner, + StringRef Extra = StringRef()) { + dbgs() << Banner << Extra << "\n" << static_cast(*F); +} +void printIR(const LazyCallGraph::SCC *C, StringRef Banner, + StringRef Extra = StringRef()) { + bool BannerPrinted = false; + for (const LazyCallGraph::Node &N : *C) { + const Function &F = N.getFunction(); + if (!F.isDeclaration() && llvm::isFunctionInPrintList(F.getName())) { + if (!BannerPrinted) { + dbgs() << Banner << Extra << "\n"; + BannerPrinted = true; + } + F.print(dbgs()); + } } } +void printIR(const Loop *L, StringRef Banner) { + llvm::printLoop(const_cast(*L), dbgs(), Banner); +} -bool printBeforePass(StringRef PassID, Any IR) { - if (!llvm::shouldPrintBeforePass(PassID)) - return true; +/// Generic IR-printing helper that unpacks a pointer to IRUnit wrapped into +/// llvm::Any and does actual print job. +void unwrapAndPrint(Any IR, StringRef Banner, bool ForceModule = false) { + if (ForceModule) { + const Module *M; + std::string Extra; + std::tie(M, Extra) = unwrapModule(IR); + if (M) + printIR(M, Banner, Extra); + return; + } + + if (any_isa(IR)) { + const Module *M = any_cast(IR); + assert(M && "module should be valid for printing"); + printIR(M, Banner); + return; + } + + if (any_isa(IR)) { + const Function *F = any_cast(IR); + assert(F && "function should be valid for printing"); + if (!llvm::isFunctionInPrintList(F->getName())) + return; + printIR(F, Banner); + return; + } + if (any_isa(IR)) { + const LazyCallGraph::SCC *C = any_cast(IR); + assert(C && "scc should be valid for printing"); + std::string Extra = formatv(" (scc: {0})", C->getName()); + printIR(C, Banner, Extra); + return; + } + + if (any_isa(IR)) { + const Loop *L = any_cast(IR); + assert(L && "Loop should be valid for printing"); + const Function *F = L->getHeader()->getParent(); + if (!llvm::isFunctionInPrintList(F->getName())) + return; + printIR(L, Banner); + return; + } + llvm_unreachable("Unknown wrapped IR type"); +} + +} // namespace + +void PrintIRInstrumentation::pushModuleDesc(StringRef PassID, Any IR) { + assert(StoreModuleDesc); + const Module *M; + std::string Extra; + std::tie(M, Extra) = unwrapModule(IR); + ModuleDescStack.emplace_back(M, Extra, PassID); +} + +PrintIRInstrumentation::PrintModuleDesc +PrintIRInstrumentation::popModuleDesc(StringRef PassID) { + assert(!ModuleDescStack.empty() && "empty ModuleDescStack"); + auto ModuleDesc = ModuleDescStack.pop_back_val(); + assert(std::get<2>(ModuleDesc).equals(PassID) && "malformed ModuleDescStack"); + return ModuleDesc; +} + +bool PrintIRInstrumentation::printBeforePass(StringRef PassID, Any IR) { if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<")) return true; + // Saving Module for AfterPassInvalidated operations. + // Note: here we rely on a fact that we do not change modules while + // traversing the pipeline, so the latest captured module is good + // for all print operations that has not happen yet. + if (StoreModuleDesc && llvm::shouldPrintAfterPass(PassID)) + pushModuleDesc(PassID, IR); + + if (!llvm::shouldPrintBeforePass(PassID)) + return true; + SmallString<20> Banner = formatv("*** IR Dump Before {0} ***", PassID); - unwrapAndPrint(Banner, IR); + unwrapAndPrint(IR, Banner, llvm::forcePrintModuleIR()); return true; } -void printAfterPass(StringRef PassID, Any IR) { +void PrintIRInstrumentation::printAfterPass(StringRef PassID, Any IR) { + if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<")) + return; + if (!llvm::shouldPrintAfterPass(PassID)) return; + if (StoreModuleDesc) + popModuleDesc(PassID); + + SmallString<20> Banner = formatv("*** IR Dump After {0} ***", PassID); + unwrapAndPrint(IR, Banner, llvm::forcePrintModuleIR()); +} + +void PrintIRInstrumentation::printAfterPassInvalidated(StringRef PassID) { + if (!StoreModuleDesc || !llvm::shouldPrintAfterPass(PassID)) + return; + if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<")) return; - SmallString<20> Banner = formatv("*** IR Dump After {0} ***", PassID); - unwrapAndPrint(Banner, IR); - return; + const Module *M; + std::string Extra; + StringRef StoredPassID; + std::tie(M, Extra, StoredPassID) = popModuleDesc(PassID); + // Additional filtering (e.g. -filter-print-func) can lead to module + // printing being skipped. + if (!M) + return; + + SmallString<20> Banner = + formatv("*** IR Dump After {0} *** invalidated: ", PassID); + printIR(M, Banner, Extra); +} + +void PrintIRInstrumentation::registerCallbacks( + PassInstrumentationCallbacks &PIC) { + // BeforePass callback is not just for printing, it also saves a Module + // for later use in AfterPassInvalidated. + StoreModuleDesc = llvm::forcePrintModuleIR() && llvm::shouldPrintAfterPass(); + if (llvm::shouldPrintBeforePass() || StoreModuleDesc) + PIC.registerBeforePassCallback( + [this](StringRef P, Any IR) { return this->printBeforePass(P, IR); }); + + if (llvm::shouldPrintAfterPass()) { + PIC.registerAfterPassCallback( + [this](StringRef P, Any IR) { this->printAfterPass(P, IR); }); + PIC.registerAfterPassInvalidatedCallback( + [this](StringRef P) { this->printAfterPassInvalidated(P); }); + } } -} // namespace PrintIR -} // namespace void StandardInstrumentations::registerCallbacks( PassInstrumentationCallbacks &PIC) { - if (llvm::shouldPrintBeforePass()) - PIC.registerBeforePassCallback(PrintIR::printBeforePass); - if (llvm::shouldPrintAfterPass()) - PIC.registerAfterPassCallback(PrintIR::printAfterPass); + PrintIR.registerCallbacks(PIC); TimePasses.registerCallbacks(PIC); } Index: test/Other/loop-deletion-printer.ll =================================================================== --- test/Other/loop-deletion-printer.ll +++ test/Other/loop-deletion-printer.ll @@ -5,10 +5,14 @@ ; RUN: -passes=loop-instsimplify -print-after-all 2>&1 | FileCheck %s -check-prefix=SIMPLIFY ; RUN: opt < %s -disable-output \ ; RUN: -passes=loop-deletion,loop-instsimplify -print-after-all 2>&1 | FileCheck %s -check-prefix=DELETED +; RUN: opt < %s -disable-output \ +; RUN: -passes=loop-deletion,loop-instsimplify -print-after-all -print-module-scope 2>&1 | FileCheck %s -check-prefix=DELETED-BUT-PRINTED ; ; SIMPLIFY: IR Dump {{.*}} LoopInstSimplifyPass ; DELETED-NOT: IR Dump {{.*}}LoopInstSimplifyPass ; DELETED-NOT: IR Dump {{.*}}LoopDeletionPass +; DELETED-BUT-PRINTED: IR Dump {{.*}}LoopDeletionPass {{.*invalidated:}} +; DELETED-BUT-PRINTED-NOT: IR Dump {{.*}}LoopInstSimplifyPass define void @deleteme() { entry: Index: test/Other/scc-deleted-printer.ll =================================================================== --- test/Other/scc-deleted-printer.ll +++ test/Other/scc-deleted-printer.ll @@ -9,7 +9,7 @@ ; INL: IR Dump After {{InlinerPass .*scc: .tester}} ; INL-MOD: IR Dump Before {{InlinerPass .*scc: .tester, foo}} -; INL-MOD-NOT: IR Dump After {{InlinerPass}} +; INL-MOD: IR Dump After {{InlinerPass .*invalidated: .*scc: .tester, foo}} ; INL-MOD: IR Dump Before {{InlinerPass .*scc: .tester}} ; INL-MOD: IR Dump After {{InlinerPass .*scc: .tester}}