[llvm] r256954 - Revert r256952 due to lit test fails.
Weiming Zhao via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 6 10:31:45 PST 2016
Author: weimingz
Date: Wed Jan 6 12:31:44 2016
New Revision: 256954
URL: http://llvm.org/viewvc/llvm-project?rev=256954&view=rev
Log:
Revert r256952 due to lit test fails.
Modified:
llvm/trunk/include/llvm/Pass.h
llvm/trunk/lib/Analysis/CallGraphSCCPass.cpp
llvm/trunk/lib/Analysis/LoopPass.cpp
llvm/trunk/lib/CodeGen/MachineFunctionPrinterPass.cpp
llvm/trunk/lib/IR/IRPrintingPasses.cpp
llvm/trunk/lib/IR/LegacyPassManager.cpp
llvm/trunk/test/Other/2010-05-06-Printer.ll
Modified: llvm/trunk/include/llvm/Pass.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Pass.h?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Pass.h (original)
+++ llvm/trunk/include/llvm/Pass.h Wed Jan 6 12:31:44 2016
@@ -369,10 +369,6 @@ protected:
/// @brief This is the storage for the -time-passes option.
extern bool TimePassesIsEnabled;
-/// isFunctionInPrintList - returns true if a function should be printed via
-// debugging options like -print-after-all/-print-before-all.
-// @brief Tells if the function IR should be printed by PrinterPass.
-extern bool isFunctionInPrintList(StringRef FunctionName);
} // End llvm namespace
// Include support files that contain important APIs commonly used by Passes,
Modified: llvm/trunk/lib/Analysis/CallGraphSCCPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CallGraphSCCPass.cpp?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CallGraphSCCPass.cpp (original)
+++ llvm/trunk/lib/Analysis/CallGraphSCCPass.cpp Wed Jan 6 12:31:44 2016
@@ -612,10 +612,9 @@ namespace {
bool runOnSCC(CallGraphSCC &SCC) override {
Out << Banner;
for (CallGraphNode *CGN : SCC) {
- if (CGN->getFunction()) {
- if (isFunctionInPrintList(CGN->getFunction()->getName()))
- CGN->getFunction()->print(Out);
- } else
+ if (CGN->getFunction())
+ CGN->getFunction()->print(Out);
+ else
Out << "\nPrinting <null> Function\n";
}
return false;
Modified: llvm/trunk/lib/Analysis/LoopPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopPass.cpp?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/LoopPass.cpp (original)
+++ llvm/trunk/lib/Analysis/LoopPass.cpp Wed Jan 6 12:31:44 2016
@@ -42,11 +42,7 @@ public:
}
bool runOnLoop(Loop *L, LPPassManager &) override {
- auto BBI = find_if(L->blocks().begin(), L->blocks().end(),
- [](BasicBlock *BB) { return BB; });
- if (BBI != L->blocks().end() &&
- isFunctionInPrintList((*BBI)->getParent()->getName()))
- P.run(*L);
+ P.run(*L);
return false;
}
};
Modified: llvm/trunk/lib/CodeGen/MachineFunctionPrinterPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineFunctionPrinterPass.cpp?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineFunctionPrinterPass.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineFunctionPrinterPass.cpp Wed Jan 6 12:31:44 2016
@@ -31,7 +31,7 @@ struct MachineFunctionPrinterPass : publ
const std::string Banner;
MachineFunctionPrinterPass() : MachineFunctionPass(ID), OS(dbgs()) { }
- MachineFunctionPrinterPass(raw_ostream &os, const std::string &banner)
+ MachineFunctionPrinterPass(raw_ostream &os, const std::string &banner)
: MachineFunctionPass(ID), OS(os), Banner(banner) {}
const char *getPassName() const override { return "MachineFunction Printer"; }
@@ -42,8 +42,6 @@ struct MachineFunctionPrinterPass : publ
}
bool runOnMachineFunction(MachineFunction &MF) override {
- if (!llvm::isFunctionInPrintList(MF.getName()))
- return false;
OS << "# " << Banner << ":\n";
MF.print(OS, getAnalysisIfAvailable<SlotIndexes>());
return false;
Modified: llvm/trunk/lib/IR/IRPrintingPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/IRPrintingPasses.cpp?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/lib/IR/IRPrintingPasses.cpp (original)
+++ llvm/trunk/lib/IR/IRPrintingPasses.cpp Wed Jan 6 12:31:44 2016
@@ -27,14 +27,8 @@ PrintModulePass::PrintModulePass(raw_ost
ShouldPreserveUseListOrder(ShouldPreserveUseListOrder) {}
PreservedAnalyses PrintModulePass::run(Module &M) {
- OS << Banner << "\n";
- if (llvm::isFunctionInPrintList("*"))
- M.print(OS, nullptr, ShouldPreserveUseListOrder);
- else {
- for(const auto &F : M.functions())
- if (llvm::isFunctionInPrintList(F.getName()))
- F.print(OS);
- }
+ OS << Banner;
+ M.print(OS, nullptr, ShouldPreserveUseListOrder);
return PreservedAnalyses::all();
}
@@ -43,8 +37,7 @@ PrintFunctionPass::PrintFunctionPass(raw
: OS(OS), Banner(Banner) {}
PreservedAnalyses PrintFunctionPass::run(Function &F) {
- if (isFunctionInPrintList(F.getName()))
- OS << Banner << static_cast<Value &>(F);
+ OS << Banner << static_cast<Value &>(F);
return PreservedAnalyses::all();
}
Modified: llvm/trunk/lib/IR/LegacyPassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/LegacyPassManager.cpp?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/lib/IR/LegacyPassManager.cpp (original)
+++ llvm/trunk/lib/IR/LegacyPassManager.cpp Wed Jan 6 12:31:44 2016
@@ -28,7 +28,6 @@
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
#include <map>
-#include <unordered_set>
using namespace llvm;
using namespace llvm::legacy;
@@ -84,13 +83,6 @@ PrintAfterAll("print-after-all",
llvm::cl::desc("Print IR after each pass"),
cl::init(false));
-static cl::list<std::string>
- PrintFuncsList("filter-print-funcs", cl::value_desc("function names"),
- cl::desc("Only print IR for functions whose name "
- "match this for all print-[before|after][-all] "
- "options"),
- cl::CommaSeparated);
-
/// This is a helper to determine whether to print IR before or
/// after a pass.
@@ -117,11 +109,6 @@ static bool ShouldPrintAfterPass(const P
return PrintAfterAll || ShouldPrintBeforeOrAfterPass(PI, PrintAfter);
}
-bool llvm::isFunctionInPrintList(StringRef FunctionName) {
- static std::unordered_set<std::string> PrintFuncNames(PrintFuncsList.begin(),
- PrintFuncsList.end());
- return PrintFuncNames.empty() || PrintFuncNames.count(FunctionName);
-}
/// isPassDebuggingExecutionsOrMore - Return true if -debug-pass=Executions
/// or higher is specified.
bool PMDataManager::isPassDebuggingExecutionsOrMore() const {
Modified: llvm/trunk/test/Other/2010-05-06-Printer.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2010-05-06-Printer.ll?rev=256954&r1=256953&r2=256954&view=diff
==============================================================================
--- llvm/trunk/test/Other/2010-05-06-Printer.ll (original)
+++ llvm/trunk/test/Other/2010-05-06-Printer.ll Wed Jan 6 12:31:44 2016
@@ -1,19 +1,7 @@
; RUN: llc -O2 -print-after-all < %s 2>/dev/null
-; RUN: llc -O2 -print-after-all < %s 2>&1 | FileCheck %s --check-prefix=ALL
-; RUN: llc -O2 -print-after-all -filter-print-funcs=foo < %s 2>&1 | FileCheck %s --check-prefix=FOO
; REQUIRES: default_triple
-define void @tester(){
- ret void
-}
-define void @foo(){
+define void @tester(){
ret void
}
-;ALL: define void @tester()
-;ALL: define void @foo()
-;ALL: ModuleID =
-
-;FOO: IR Dump After
-;FOO-NEXT: define void @foo()
-;FOO-NOT: define void @tester
More information about the llvm-commits
mailing list