[llvm] r336000 - Revert "Extend CFGPrinter and CallPrinter with Heat Colors"
Sean Fertile via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 29 10:48:59 PDT 2018
Author: sfertile
Date: Fri Jun 29 10:48:58 2018
New Revision: 336000
URL: http://llvm.org/viewvc/llvm-project?rev=336000&view=rev
Log:
Revert "Extend CFGPrinter and CallPrinter with Heat Colors"
This reverts r335996 which broke graph printing in Polly.
Removed:
llvm/trunk/include/llvm/Analysis/HeatUtils.h
llvm/trunk/lib/Analysis/HeatUtils.cpp
llvm/trunk/llvm/Analysis/HeatUtils.h
Modified:
llvm/trunk/include/llvm/Analysis/CFGPrinter.h
llvm/trunk/lib/Analysis/CFGPrinter.cpp
llvm/trunk/lib/Analysis/CMakeLists.txt
llvm/trunk/lib/Analysis/CallPrinter.cpp
llvm/trunk/lib/Analysis/DomPrinter.cpp
llvm/trunk/lib/Analysis/RegionPrinter.cpp
llvm/trunk/lib/Passes/PassRegistry.def
llvm/trunk/lib/Transforms/Scalar/NewGVN.cpp
llvm/trunk/test/Other/2007-06-05-PassID.ll
Modified: llvm/trunk/include/llvm/Analysis/CFGPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/CFGPrinter.h?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/CFGPrinter.h (original)
+++ llvm/trunk/include/llvm/Analysis/CFGPrinter.h Fri Jun 29 10:48:58 2018
@@ -21,122 +21,47 @@
#include "llvm/IR/CFG.h"
#include "llvm/IR/Constants.h"
-#include "llvm/IR/Module.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/Instructions.h"
#include "llvm/IR/PassManager.h"
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
-#include "llvm/Analysis/HeatUtils.h"
-#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/GraphWriter.h"
namespace llvm {
class CFGViewerPass
: public PassInfoMixin<CFGViewerPass> {
public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
class CFGOnlyViewerPass
: public PassInfoMixin<CFGOnlyViewerPass> {
public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
class CFGPrinterPass
: public PassInfoMixin<CFGPrinterPass> {
public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
class CFGOnlyPrinterPass
: public PassInfoMixin<CFGOnlyPrinterPass> {
public:
- PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
-class CFGDOTInfo {
-private:
- const Function *F;
- const BlockFrequencyInfo *BFI;
- const BranchProbabilityInfo *BPI;
- uint64_t MaxFreq;
- bool ShowHeat;
- bool Heuristic;
- bool EdgeWeights;
- bool RawWeights;
+template<>
+struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
-public:
- CFGDOTInfo(const Function *F) : CFGDOTInfo(F, nullptr, nullptr, 0) { }
-
- CFGDOTInfo(const Function *F, const BlockFrequencyInfo *BFI,
- BranchProbabilityInfo *BPI, uint64_t MaxFreq)
- : F(F), BFI(BFI), BPI(BPI), MaxFreq(MaxFreq) {
- ShowHeat = false;
- Heuristic = true;
- EdgeWeights = true;
- RawWeights = true;
- }
-
- const BlockFrequencyInfo *getBFI() { return BFI; }
-
- const BranchProbabilityInfo *getBPI() { return BPI; }
-
- const Function *getFunction() { return this->F; }
-
- uint64_t getMaxFreq() { return MaxFreq; }
-
- uint64_t getFreq(const BasicBlock *BB) {
- return getBlockFreq(BB, BFI, Heuristic);
- }
-
- void setHeatColors(bool ShowHeat) { this->ShowHeat = ShowHeat; }
-
- bool showHeatColors() { return ShowHeat; }
-
- void setHeuristic(bool Heuristic) { this->Heuristic = Heuristic; }
-
- bool useHeuristic() { return Heuristic; }
-
- void setRawEdgeWeights(bool RawWeights) { this->RawWeights = RawWeights; }
-
- bool useRawEdgeWeights() { return RawWeights; }
-
- void setEdgeWeights(bool EdgeWeights) { this->EdgeWeights = EdgeWeights; }
-
- bool showEdgeWeights() { return EdgeWeights; }
-};
-
-template <>
-struct GraphTraits<CFGDOTInfo *> : public GraphTraits<const BasicBlock *> {
- static NodeRef getEntryNode(CFGDOTInfo *CFGInfo) {
- return &(CFGInfo->getFunction()->getEntryBlock());
- }
-
- // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
- using nodes_iterator = pointer_iterator<Function::const_iterator>;
+ DOTGraphTraits (bool isSimple=false) : DefaultDOTGraphTraits(isSimple) {}
- static nodes_iterator nodes_begin(CFGDOTInfo *CFGInfo) {
- return nodes_iterator(CFGInfo->getFunction()->begin());
+ static std::string getGraphName(const Function *F) {
+ return "CFG for '" + F->getName().str() + "' function";
}
- static nodes_iterator nodes_end(CFGDOTInfo *CFGInfo) {
- return nodes_iterator(CFGInfo->getFunction()->end());
- }
-
- static size_t size(CFGDOTInfo *CFGInfo) { return CFGInfo->getFunction()->size(); }
-};
-
-template <> struct DOTGraphTraits<CFGDOTInfo *> : public DefaultDOTGraphTraits {
-
- DOTGraphTraits(bool isSimple = false) : DefaultDOTGraphTraits(isSimple) {}
-
- static std::string getGraphName(CFGDOTInfo *CFGInfo) {
- return "CFG for '" + CFGInfo->getFunction()->getName().str() + "' function";
- }
-
- static std::string getSimpleNodeLabel(const BasicBlock *Node, CFGDOTInfo *) {
+ static std::string getSimpleNodeLabel(const BasicBlock *Node,
+ const Function *) {
if (!Node->getName().empty())
return Node->getName().str();
@@ -148,7 +73,7 @@ template <> struct DOTGraphTraits<CFGDOT
}
static std::string getCompleteNodeLabel(const BasicBlock *Node,
- CFGDOTInfo *) {
+ const Function *) {
enum { MaxColumns = 80 };
std::string Str;
raw_string_ostream OS(Str);
@@ -192,11 +117,12 @@ template <> struct DOTGraphTraits<CFGDOT
return OutStr;
}
- std::string getNodeLabel(const BasicBlock *Node, CFGDOTInfo *CFGInfo) {
+ std::string getNodeLabel(const BasicBlock *Node,
+ const Function *Graph) {
if (isSimple())
- return getSimpleNodeLabel(Node, CFGInfo);
+ return getSimpleNodeLabel(Node, Graph);
else
- return getCompleteNodeLabel(Node, CFGInfo);
+ return getCompleteNodeLabel(Node, Graph);
}
static std::string getEdgeSourceLabel(const BasicBlock *Node,
@@ -223,86 +149,39 @@ template <> struct DOTGraphTraits<CFGDOT
/// Display the raw branch weights from PGO.
std::string getEdgeAttributes(const BasicBlock *Node, succ_const_iterator I,
- CFGDOTInfo *CFGInfo) {
-
- if (!CFGInfo->showEdgeWeights())
- return "";
-
- const unsigned MaxEdgeWidth = 2;
-
+ const Function *F) {
const TerminatorInst *TI = Node->getTerminator();
if (TI->getNumSuccessors() == 1)
- return "penwidth="+std::to_string(MaxEdgeWidth);
-
- unsigned OpNo = I.getSuccessorIndex();
-
- if (OpNo >= TI->getNumSuccessors())
return "";
- std::string Attrs = "";
-
- BasicBlock *SuccBB = TI->getSuccessor(OpNo);
- auto BranchProb = CFGInfo->getBPI()->getEdgeProbability(Node,SuccBB);
- double WeightPercent = ((double)BranchProb.getNumerator()) /
- ((double)BranchProb.getDenominator());
- double Width = 1+(MaxEdgeWidth-1)*WeightPercent;
-
- if (CFGInfo->useRawEdgeWeights()) {
- // Prepend a 'W' to indicate that this is a weight rather than the actual
- // profile count (due to scaling).
-
- uint64_t Freq = CFGInfo->getFreq(Node);
- Attrs = formatv("label=\"W:{0}\" penwidth={1}", (uint64_t)(Freq*WeightPercent), Width);
- if (Attrs.size())
- return Attrs;
-
- MDNode *WeightsNode = TI->getMetadata(LLVMContext::MD_prof);
- if (!WeightsNode)
- return Attrs;
-
- MDString *MDName = cast<MDString>(WeightsNode->getOperand(0));
- if (MDName->getString() != "branch_weights")
- return Attrs;
-
- unsigned OpNo = I.getSuccessorIndex() + 1;
- if (OpNo >= WeightsNode->getNumOperands())
- return Attrs;
- ConstantInt *Weight =
- mdconst::dyn_extract<ConstantInt>(WeightsNode->getOperand(OpNo));
- if (!Weight)
- return Attrs;
-
- Attrs = "label=\"W:" + std::to_string(Weight->getZExtValue()) + "\" penwidth=" + std::to_string(Width);
- } else {
- //formatting value to percentage
- Attrs = formatv("label=\"{0:P}\" penwidth={1}", WeightPercent, Width);
- }
- return Attrs;
- }
+ MDNode *WeightsNode = TI->getMetadata(LLVMContext::MD_prof);
+ if (!WeightsNode)
+ return "";
- std::string getNodeAttributes(const BasicBlock *Node, CFGDOTInfo *CFGInfo) {
+ MDString *MDName = cast<MDString>(WeightsNode->getOperand(0));
+ if (MDName->getString() != "branch_weights")
+ return "";
- if (!CFGInfo->showHeatColors())
+ unsigned OpNo = I.getSuccessorIndex() + 1;
+ if (OpNo >= WeightsNode->getNumOperands())
+ return "";
+ ConstantInt *Weight =
+ mdconst::dyn_extract<ConstantInt>(WeightsNode->getOperand(OpNo));
+ if (!Weight)
return "";
- uint64_t Freq = CFGInfo->getFreq(Node);
- std::string Color = getHeatColor(Freq, CFGInfo->getMaxFreq());
- std::string EdgeColor = (Freq <= (CFGInfo->getMaxFreq() / 2))
- ? (getHeatColor(0))
- : (getHeatColor(1));
-
- std::string Attrs = "color=\"" + EdgeColor + "ff\", style=filled,"+
- "fillcolor=\"" + Color + "70\"";
- return Attrs;
+ // Prepend a 'W' to indicate that this is a weight rather than the actual
+ // profile count (due to scaling).
+ Twine Attrs = "label=\"W:" + Twine(Weight->getZExtValue()) + "\"";
+ return Attrs.str();
}
};
-
-} // namespace llvm
+} // End llvm namespace
namespace llvm {
-class ModulePass;
-ModulePass *createCFGPrinterLegacyPassPass();
-ModulePass *createCFGOnlyPrinterLegacyPassPass();
-} // namespace llvm
+ class FunctionPass;
+ FunctionPass *createCFGPrinterLegacyPassPass ();
+ FunctionPass *createCFGOnlyPrinterLegacyPassPass ();
+} // End llvm namespace
#endif
Removed: llvm/trunk/include/llvm/Analysis/HeatUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/HeatUtils.h?rev=335999&view=auto
==============================================================================
--- llvm/trunk/include/llvm/Analysis/HeatUtils.h (original)
+++ llvm/trunk/include/llvm/Analysis/HeatUtils.h (removed)
@@ -1,54 +0,0 @@
-//===-- HeatUtils.h - Utility for printing heat colors ----------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Utility for printing heat colors based on heuristics or profiling
-// information.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ANALYSIS_HEATUTILS_H
-#define LLVM_ANALYSIS_HEATUTILS_H
-
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/CallSite.h"
-
-#include <string>
-
-namespace llvm {
-
-bool hasProfiling(const Module &M);
-
-uint64_t getBlockFreq(const BasicBlock *BB, const BlockFrequencyInfo *BFI,
- bool useHeuristic = true);
-
-uint64_t getNumOfCalls(Function &callerFunction, Function &calledFunction,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-uint64_t getNumOfCalls(CallSite &callsite,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-uint64_t getMaxFreq(const Function &F, const BlockFrequencyInfo *BFI,
- bool useHeuristic = true);
-
-uint64_t getMaxFreq(Module &M,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-std::string getHeatColor(uint64_t freq, uint64_t maxFreq);
-
-std::string getHeatColor(double percent);
-
-} // namespace llvm
-
-#endif
Modified: llvm/trunk/lib/Analysis/CFGPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CFGPrinter.cpp?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CFGPrinter.cpp (original)
+++ llvm/trunk/lib/Analysis/CFGPrinter.cpp Fri Jun 29 10:48:58 2018
@@ -22,170 +22,53 @@
#include "llvm/Support/FileSystem.h"
using namespace llvm;
-static cl::opt<bool> CFGHeatPerFunction("cfg-heat-per-function",
- cl::init(false), cl::Hidden,
- cl::desc("Heat CFG per function"));
-
-static cl::opt<bool> ShowHeatColors("cfg-heat-colors", cl::init(true),
- cl::Hidden,
- cl::desc("Show heat colors in CFG"));
-
-static cl::opt<bool> UseRawEdgeWeight("cfg-raw-weights", cl::init(false),
- cl::Hidden,
- cl::desc("Use raw weights for labels. "
- "Use percentages as default."));
-
-static cl::opt<bool> ShowEdgeWeight("cfg-weights", cl::init(true), cl::Hidden,
- cl::desc("Show edges labeled with weights"));
-
-static void writeHeatCFGToDotFile(Function &F, BlockFrequencyInfo *BFI,
- BranchProbabilityInfo *BPI, uint64_t MaxFreq,
- bool UseHeuristic, bool isSimple) {
- std::string Filename = ("cfg." + F.getName() + ".dot").str();
- errs() << "Writing '" << Filename << "'...";
-
- std::error_code EC;
- raw_fd_ostream File(Filename, EC, sys::fs::F_Text);
-
- CFGDOTInfo CFGInfo(&F, BFI, BPI, MaxFreq);
- CFGInfo.setHeuristic(UseHeuristic);
- CFGInfo.setHeatColors(ShowHeatColors);
- CFGInfo.setEdgeWeights(ShowEdgeWeight);
- CFGInfo.setRawEdgeWeights(UseRawEdgeWeight);
-
- if (!EC)
- WriteGraph(File, &CFGInfo, isSimple);
- else
- errs() << " error opening file for writing!";
- errs() << "\n";
-}
-
-static void writeAllCFGsToDotFile(Module &M,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- function_ref<BranchProbabilityInfo *(Function &)> LookupBPI,
- bool isSimple) {
- bool UseHeuristic = true;
- uint64_t MaxFreq = 0;
- if (!CFGHeatPerFunction)
- MaxFreq = getMaxFreq(M, LookupBFI, UseHeuristic);
-
- for (auto &F : M) {
- if (F.isDeclaration()) continue;
- auto *BFI = LookupBFI(F);
- auto *BPI = LookupBPI(F);
- if (CFGHeatPerFunction)
- MaxFreq = getMaxFreq(F, BFI, UseHeuristic);
- writeHeatCFGToDotFile(F, BFI, BPI, MaxFreq, UseHeuristic, isSimple);
- }
-
-}
-
-static void viewHeatCFG(Function &F, BlockFrequencyInfo *BFI,
- BranchProbabilityInfo *BPI, uint64_t MaxFreq,
- bool UseHeuristic, bool isSimple) {
- CFGDOTInfo CFGInfo(&F, BFI, BPI, MaxFreq);
- CFGInfo.setHeuristic(UseHeuristic);
- CFGInfo.setHeatColors(ShowHeatColors);
- CFGInfo.setEdgeWeights(ShowEdgeWeight);
- CFGInfo.setRawEdgeWeights(UseRawEdgeWeight);
-
- ViewGraph(&CFGInfo, "cfg." + F.getName(), isSimple);
-}
-
-static void viewAllCFGs(Module &M,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- function_ref<BranchProbabilityInfo *(Function &)> LookupBPI,
- bool isSimple) {
- bool UseHeuristic = true;
- uint64_t MaxFreq = 0;
- if (!CFGHeatPerFunction)
- MaxFreq = getMaxFreq(M, LookupBFI, UseHeuristic);
-
- for (auto &F : M) {
- if (F.isDeclaration()) continue;
- auto *BFI = LookupBFI(F);
- auto *BPI = LookupBPI(F);
- if (CFGHeatPerFunction)
- MaxFreq = getMaxFreq(F, BFI, UseHeuristic);
- viewHeatCFG(F, BFI, BPI, MaxFreq, UseHeuristic, isSimple);
- }
-
-}
-
namespace {
- struct CFGViewerLegacyPass : public ModulePass {
+ struct CFGViewerLegacyPass : public FunctionPass {
static char ID; // Pass identifcation, replacement for typeid
- CFGViewerLegacyPass() : ModulePass(ID) {
+ CFGViewerLegacyPass() : FunctionPass(ID) {
initializeCFGViewerLegacyPassPass(*PassRegistry::getPassRegistry());
}
- bool runOnModule(Module &M) override {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
- auto LookupBPI = [this](Function &F) {
- return &this->getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI();
- };
- viewAllCFGs(M, LookupBFI, LookupBPI, /*isSimple=*/false);
+ bool runOnFunction(Function &F) override {
+ F.viewCFG();
return false;
}
- void print(raw_ostream &OS, const Module * = nullptr) const override {}
+ void print(raw_ostream &OS, const Module* = nullptr) const override {}
void getAnalysisUsage(AnalysisUsage &AU) const override {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.addRequired<BranchProbabilityInfoWrapperPass>();
AU.setPreservesAll();
}
-
};
}
char CFGViewerLegacyPass::ID = 0;
INITIALIZE_PASS(CFGViewerLegacyPass, "view-cfg", "View CFG of function", false, true)
-PreservedAnalyses CFGViewerPass::run(Module &M,
- ModuleAnalysisManager &AM) {
- auto &FAM = AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
- auto LookupBFI = [&FAM](Function &F) {
- return &FAM.getResult<BlockFrequencyAnalysis>(F);
- };
- auto LookupBPI = [&FAM](Function &F) {
- return &FAM.getResult<BranchProbabilityAnalysis>(F);
- };
- viewAllCFGs(M, LookupBFI, LookupBPI, /*isSimple=*/false);
+PreservedAnalyses CFGViewerPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
+ F.viewCFG();
return PreservedAnalyses::all();
}
namespace {
- struct CFGOnlyViewerLegacyPass : public ModulePass {
+ struct CFGOnlyViewerLegacyPass : public FunctionPass {
static char ID; // Pass identifcation, replacement for typeid
- CFGOnlyViewerLegacyPass() : ModulePass(ID) {
+ CFGOnlyViewerLegacyPass() : FunctionPass(ID) {
initializeCFGOnlyViewerLegacyPassPass(*PassRegistry::getPassRegistry());
}
- bool runOnModule(Module &M) override {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
- auto LookupBPI = [this](Function &F) {
- return &this->getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI();
- };
- viewAllCFGs(M, LookupBFI, LookupBPI, /*isSimple=*/true);
+ bool runOnFunction(Function &F) override {
+ F.viewCFGOnly();
return false;
}
- void print(raw_ostream &OS, const Module * = nullptr) const override {}
+ void print(raw_ostream &OS, const Module* = nullptr) const override {}
void getAnalysisUsage(AnalysisUsage &AU) const override {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.addRequired<BranchProbabilityInfoWrapperPass>();
AU.setPreservesAll();
}
-
};
}
@@ -193,46 +76,43 @@ char CFGOnlyViewerLegacyPass::ID = 0;
INITIALIZE_PASS(CFGOnlyViewerLegacyPass, "view-cfg-only",
"View CFG of function (with no function bodies)", false, true)
-PreservedAnalyses CFGOnlyViewerPass::run(Module &M,
- ModuleAnalysisManager &AM) {
- auto &FAM = AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
- auto LookupBFI = [&FAM](Function &F) {
- return &FAM.getResult<BlockFrequencyAnalysis>(F);
- };
- auto LookupBPI = [&FAM](Function &F) {
- return &FAM.getResult<BranchProbabilityAnalysis>(F);
- };
- viewAllCFGs(M, LookupBFI, LookupBPI, /*isSimple=*/true);
+PreservedAnalyses CFGOnlyViewerPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
+ F.viewCFGOnly();
return PreservedAnalyses::all();
}
+static void writeCFGToDotFile(Function &F, bool CFGOnly = false) {
+ std::string Filename = ("cfg." + F.getName() + ".dot").str();
+ errs() << "Writing '" << Filename << "'...";
+
+ std::error_code EC;
+ raw_fd_ostream File(Filename, EC, sys::fs::F_Text);
+
+ if (!EC)
+ WriteGraph(File, (const Function*)&F, CFGOnly);
+ else
+ errs() << " error opening file for writing!";
+ errs() << "\n";
+}
+
namespace {
- struct CFGPrinterLegacyPass : public ModulePass {
+ struct CFGPrinterLegacyPass : public FunctionPass {
static char ID; // Pass identification, replacement for typeid
- CFGPrinterLegacyPass() : ModulePass(ID) {
+ CFGPrinterLegacyPass() : FunctionPass(ID) {
initializeCFGPrinterLegacyPassPass(*PassRegistry::getPassRegistry());
}
- bool runOnModule(Module &M) override {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
- auto LookupBPI = [this](Function &F) {
- return &this->getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI();
- };
- writeAllCFGsToDotFile(M, LookupBFI, LookupBPI, /*isSimple=*/false);
+ bool runOnFunction(Function &F) override {
+ writeCFGToDotFile(F);
return false;
}
- void print(raw_ostream &OS, const Module * = nullptr) const override {}
+ void print(raw_ostream &OS, const Module* = nullptr) const override {}
void getAnalysisUsage(AnalysisUsage &AU) const override {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.addRequired<BranchProbabilityInfoWrapperPass>();
AU.setPreservesAll();
}
-
};
}
@@ -240,46 +120,28 @@ char CFGPrinterLegacyPass::ID = 0;
INITIALIZE_PASS(CFGPrinterLegacyPass, "dot-cfg", "Print CFG of function to 'dot' file",
false, true)
-PreservedAnalyses CFGPrinterPass::run(Module &M,
- ModuleAnalysisManager &AM) {
- auto &FAM = AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
- auto LookupBFI = [&FAM](Function &F) {
- return &FAM.getResult<BlockFrequencyAnalysis>(F);
- };
- auto LookupBPI = [&FAM](Function &F) {
- return &FAM.getResult<BranchProbabilityAnalysis>(F);
- };
- writeAllCFGsToDotFile(M, LookupBFI, LookupBPI, /*isSimple=*/false);
+PreservedAnalyses CFGPrinterPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
+ writeCFGToDotFile(F);
return PreservedAnalyses::all();
}
namespace {
- struct CFGOnlyPrinterLegacyPass : public ModulePass {
+ struct CFGOnlyPrinterLegacyPass : public FunctionPass {
static char ID; // Pass identification, replacement for typeid
- CFGOnlyPrinterLegacyPass() : ModulePass(ID) {
+ CFGOnlyPrinterLegacyPass() : FunctionPass(ID) {
initializeCFGOnlyPrinterLegacyPassPass(*PassRegistry::getPassRegistry());
}
- bool runOnModule(Module &M) override {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
- auto LookupBPI = [this](Function &F) {
- return &this->getAnalysis<BranchProbabilityInfoWrapperPass>(F).getBPI();
- };
- writeAllCFGsToDotFile(M, LookupBFI, LookupBPI, /*isSimple=*/true);
+ bool runOnFunction(Function &F) override {
+ writeCFGToDotFile(F, /*CFGOnly=*/true);
return false;
}
-
- void print(raw_ostream &OS, const Module * = nullptr) const override {}
+ void print(raw_ostream &OS, const Module* = nullptr) const override {}
void getAnalysisUsage(AnalysisUsage &AU) const override {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.addRequired<BranchProbabilityInfoWrapperPass>();
AU.setPreservesAll();
}
-
};
}
@@ -288,16 +150,9 @@ INITIALIZE_PASS(CFGOnlyPrinterLegacyPass
"Print CFG of function to 'dot' file (with no function bodies)",
false, true)
-PreservedAnalyses CFGOnlyPrinterPass::run(Module &M,
- ModuleAnalysisManager &AM) {
- auto &FAM = AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
- auto LookupBFI = [&FAM](Function &F) {
- return &FAM.getResult<BlockFrequencyAnalysis>(F);
- };
- auto LookupBPI = [&FAM](Function &F) {
- return &FAM.getResult<BranchProbabilityAnalysis>(F);
- };
- writeAllCFGsToDotFile(M, LookupBFI, LookupBPI, /*isSimple=*/true);
+PreservedAnalyses CFGOnlyPrinterPass::run(Function &F,
+ FunctionAnalysisManager &AM) {
+ writeCFGToDotFile(F, /*CFGOnly=*/true);
return PreservedAnalyses::all();
}
@@ -307,9 +162,7 @@ PreservedAnalyses CFGOnlyPrinterPass::ru
/// being a 'dot' and 'gv' program in your path.
///
void Function::viewCFG() const {
-
- CFGDOTInfo CFGInfo(this);
- ViewGraph(&CFGInfo, "cfg" + getName());
+ ViewGraph(this, "cfg" + getName());
}
/// viewCFGOnly - This function is meant for use from the debugger. It works
@@ -318,15 +171,14 @@ void Function::viewCFG() const {
/// this can make the graph smaller.
///
void Function::viewCFGOnly() const {
-
- CFGDOTInfo CFGInfo(this);
- ViewGraph(&CFGInfo, "cfg" + getName(), true);
+ ViewGraph(this, "cfg" + getName(), true);
}
-ModulePass *llvm::createCFGPrinterLegacyPassPass() {
+FunctionPass *llvm::createCFGPrinterLegacyPassPass () {
return new CFGPrinterLegacyPass();
}
-ModulePass *llvm::createCFGOnlyPrinterLegacyPassPass() {
+FunctionPass *llvm::createCFGOnlyPrinterLegacyPassPass () {
return new CFGOnlyPrinterLegacyPass();
}
+
Modified: llvm/trunk/lib/Analysis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CMakeLists.txt?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CMakeLists.txt (original)
+++ llvm/trunk/lib/Analysis/CMakeLists.txt Fri Jun 29 10:48:58 2018
@@ -10,7 +10,6 @@ add_llvm_library(LLVMAnalysis
BlockFrequencyInfoImpl.cpp
BranchProbabilityInfo.cpp
CFG.cpp
- HeatUtils.cpp
CFGPrinter.cpp
CFLAndersAliasAnalysis.cpp
CFLSteensAliasAnalysis.cpp
Modified: llvm/trunk/lib/Analysis/CallPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CallPrinter.cpp?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/CallPrinter.cpp (original)
+++ llvm/trunk/lib/Analysis/CallPrinter.cpp Fri Jun 29 10:48:58 2018
@@ -15,337 +15,62 @@
//===----------------------------------------------------------------------===//
#include "llvm/Analysis/CallPrinter.h"
-
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/Analysis/BranchProbabilityInfo.h"
#include "llvm/Analysis/CallGraph.h"
#include "llvm/Analysis/DOTGraphTraitsPass.h"
-#include "llvm/Analysis/HeatUtils.h"
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallSet.h"
using namespace llvm;
-static cl::opt<bool> ShowHeatColors("callgraph-heat-colors", cl::init(true),
- cl::Hidden,
- cl::desc("Show heat colors in call-graph"));
-
-static cl::opt<bool>
- EstimateEdgeWeight("callgraph-weights", cl::init(false), cl::Hidden,
- cl::desc("Show edges labeled with weights"));
-
-static cl::opt<bool>
- FullCallGraph("callgraph-full", cl::init(false), cl::Hidden,
- cl::desc("Show full call-graph (including external nodes)"));
-
-static cl::opt<bool> UseCallCounter(
- "callgraph-call-count", cl::init(false), cl::Hidden,
- cl::desc("Use function's call counter as a heat metric. "
- "The default is the function's maximum block frequency."));
-
namespace llvm {
-class CallGraphDOTInfo {
-private:
- Module *M;
- CallGraph *CG;
- DenseMap<const Function *, uint64_t> Freq;
- uint64_t MaxFreq;
- uint64_t MaxEdgeCount;
-
-public:
- std::function<BlockFrequencyInfo *(Function &)> LookupBFI;
-
- CallGraphDOTInfo(Module *M, CallGraph *CG,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI)
- : M(M), CG(CG), LookupBFI(LookupBFI) {
- MaxFreq = 0;
- MaxEdgeCount = 0;
-
- for (Function &F : *M) {
- Freq[&F] = 0;
-
- if (FullCallGraph) {
- for (User *U : F.users()) {
- auto CS = CallSite(U);
- if (!CS.getCaller()->isDeclaration()) {
- uint64_t Counter = getNumOfCalls(CS, LookupBFI);
- if (Counter > MaxEdgeCount) {
- MaxEdgeCount = Counter;
- }
- }
- }
- }
-
- if (F.isDeclaration())
- continue;
- uint64_t localMaxFreq = 0;
- if (UseCallCounter) {
- Function::ProfileCount EntryCount = F.getEntryCount();
- if (EntryCount.hasValue())
- localMaxFreq = EntryCount.getCount();
- } else {
- localMaxFreq = llvm::getMaxFreq(F, LookupBFI(F));
- }
- if (localMaxFreq >= MaxFreq)
- MaxFreq = localMaxFreq;
- Freq[&F] = localMaxFreq;
-
- if (!FullCallGraph) {
- for (Function &Callee : *M) {
- uint64_t Counter = getNumOfCalls(F, Callee, LookupBFI);
- if (Counter > MaxEdgeCount) {
- MaxEdgeCount = Counter;
- }
- }
- }
- }
- if (!FullCallGraph)
- removeParallelEdges();
- }
-
- Module *getModule() const { return M; }
- CallGraph *getCallGraph() const { return CG; }
-
- uint64_t getFreq(const Function *F) { return Freq[F]; }
-
- uint64_t getMaxFreq() { return MaxFreq; }
-
- uint64_t getMaxEdgeCount() { return MaxEdgeCount; }
-
-private:
- void removeParallelEdges() {
- for (auto &I : (*CG)) {
- CallGraphNode *Node = I.second.get();
-
- bool FoundParallelEdge = true;
- while (FoundParallelEdge) {
- SmallSet<Function *, 16> Visited;
- FoundParallelEdge = false;
- for (auto CI = Node->begin(), CE = Node->end(); CI != CE; CI++) {
- if (!Visited.count(CI->second->getFunction()))
- Visited.insert(CI->second->getFunction());
- else {
- FoundParallelEdge = true;
- Node->removeCallEdge(CI);
- break;
- }
- }
- }
- }
- }
-};
-
-template <>
-struct GraphTraits<CallGraphDOTInfo *>
- : public GraphTraits<const CallGraphNode *> {
- static NodeRef getEntryNode(CallGraphDOTInfo *CGInfo) {
- // Start at the external node!
- return CGInfo->getCallGraph()->getExternalCallingNode();
- }
-
- typedef std::pair<const Function *const, std::unique_ptr<CallGraphNode>>
- PairTy;
- static const CallGraphNode *CGGetValuePtr(const PairTy &P) {
- return P.second.get();
- }
-
- // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
- typedef mapped_iterator<CallGraph::const_iterator, decltype(&CGGetValuePtr)>
- nodes_iterator;
-
- static nodes_iterator nodes_begin(CallGraphDOTInfo *CGInfo) {
- return nodes_iterator(CGInfo->getCallGraph()->begin(), &CGGetValuePtr);
- }
- static nodes_iterator nodes_end(CallGraphDOTInfo *CGInfo) {
- return nodes_iterator(CGInfo->getCallGraph()->end(), &CGGetValuePtr);
- }
-};
-
-template <>
-struct DOTGraphTraits<CallGraphDOTInfo *> : public DefaultDOTGraphTraits {
-
- SmallSet<User *, 16> VisitedCallSites;
-
+template <> struct DOTGraphTraits<CallGraph *> : public DefaultDOTGraphTraits {
DOTGraphTraits(bool isSimple = false) : DefaultDOTGraphTraits(isSimple) {}
- static std::string getGraphName(CallGraphDOTInfo *CGInfo) {
- return "Call graph: " +
- std::string(CGInfo->getModule()->getModuleIdentifier());
- }
-
- static bool isNodeHidden(const CallGraphNode *Node) {
- if (FullCallGraph)
- return false;
-
- if (Node->getFunction())
- return false;
-
- return true;
- }
-
- std::string getNodeLabel(const CallGraphNode *Node,
- CallGraphDOTInfo *CGInfo) {
- if (Node == CGInfo->getCallGraph()->getExternalCallingNode())
- return "external caller";
-
- if (Node == CGInfo->getCallGraph()->getCallsExternalNode())
- return "external callee";
+ static std::string getGraphName(CallGraph *Graph) { return "Call graph"; }
+ std::string getNodeLabel(CallGraphNode *Node, CallGraph *Graph) {
if (Function *Func = Node->getFunction())
return Func->getName();
return "external node";
}
+};
- static const CallGraphNode *CGGetValuePtr(CallGraphNode::CallRecord P) {
- return P.second;
- }
-
- // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
- typedef mapped_iterator<CallGraphNode::const_iterator,
- decltype(&CGGetValuePtr)>
- nodes_iterator;
-
- std::string getEdgeAttributes(const CallGraphNode *Node, nodes_iterator I,
- CallGraphDOTInfo *CGInfo) {
- if (!EstimateEdgeWeight)
- return "";
-
- Function *Caller = Node->getFunction();
- if (Caller == nullptr || Caller->isDeclaration())
- return "";
-
- Function *Callee = (*I)->getFunction();
- if (Callee == nullptr)
- return "";
-
- uint64_t Counter = 0;
- if (FullCallGraph) {
- // looks for next call site between Caller and Callee
- for (User *U : Callee->users()) {
- auto CS = CallSite(U);
- if (CS.getCaller() == Caller) {
- if (VisitedCallSites.count(U))
- continue;
- VisitedCallSites.insert(U);
- Counter = getNumOfCalls(CS, CGInfo->LookupBFI);
- break;
- }
- }
- } else {
- Counter = getNumOfCalls(*Caller, *Callee, CGInfo->LookupBFI);
- }
-
- const unsigned MaxEdgeWidth = 3;
-
- double Width =
- 1 + (MaxEdgeWidth - 1) * (double(Counter) / CGInfo->getMaxEdgeCount());
- std::string Attrs = "label=\"" + std::to_string(Counter) +
- "\" penwidth=" + std::to_string(Width);
-
- return Attrs;
- }
-
- std::string getNodeAttributes(const CallGraphNode *Node,
- CallGraphDOTInfo *CGInfo) {
- Function *F = Node->getFunction();
- if (F == nullptr || F->isDeclaration())
- return "";
-
- std::string attrs = "";
- if (ShowHeatColors) {
- uint64_t freq = CGInfo->getFreq(F);
- std::string color = getHeatColor(freq, CGInfo->getMaxFreq());
- std::string edgeColor = (freq <= (CGInfo->getMaxFreq() / 2))
- ? getHeatColor(0)
- : getHeatColor(1);
-
- attrs = "color=\"" + edgeColor + "ff\", style=filled, fillcolor=\"" +
- color + "80\"";
- }
- return attrs;
+struct AnalysisCallGraphWrapperPassTraits {
+ static CallGraph *getGraph(CallGraphWrapperPass *P) {
+ return &P->getCallGraph();
}
};
-} // namespace llvm
+} // end llvm namespace
namespace {
-// Viewer
-
-class CallGraphViewer : public ModulePass {
-public:
+struct CallGraphViewer
+ : public DOTGraphTraitsModuleViewer<CallGraphWrapperPass, true, CallGraph *,
+ AnalysisCallGraphWrapperPassTraits> {
static char ID;
- CallGraphViewer() : ModulePass(ID) {}
- void getAnalysisUsage(AnalysisUsage &AU) const override;
- bool runOnModule(Module &M) override;
+ CallGraphViewer()
+ : DOTGraphTraitsModuleViewer<CallGraphWrapperPass, true, CallGraph *,
+ AnalysisCallGraphWrapperPassTraits>(
+ "callgraph", ID) {
+ initializeCallGraphViewerPass(*PassRegistry::getPassRegistry());
+ }
};
-void CallGraphViewer::getAnalysisUsage(AnalysisUsage &AU) const {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.setPreservesAll();
-}
-
-bool CallGraphViewer::runOnModule(Module &M) {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
-
- CallGraph CG(M);
- CallGraphDOTInfo CFGInfo(&M, &CG, LookupBFI);
-
- std::string Title =
- DOTGraphTraits<CallGraphDOTInfo *>::getGraphName(&CFGInfo);
- ViewGraph(&CFGInfo, "callgraph", true, Title);
-
- return false;
-}
-
-// DOT Printer
-
-class CallGraphDOTPrinter : public ModulePass {
-public:
+struct CallGraphDOTPrinter : public DOTGraphTraitsModulePrinter<
+ CallGraphWrapperPass, true, CallGraph *,
+ AnalysisCallGraphWrapperPassTraits> {
static char ID;
- CallGraphDOTPrinter() : ModulePass(ID) {}
- void getAnalysisUsage(AnalysisUsage &AU) const override;
- bool runOnModule(Module &M) override;
+ CallGraphDOTPrinter()
+ : DOTGraphTraitsModulePrinter<CallGraphWrapperPass, true, CallGraph *,
+ AnalysisCallGraphWrapperPassTraits>(
+ "callgraph", ID) {
+ initializeCallGraphDOTPrinterPass(*PassRegistry::getPassRegistry());
+ }
};
-void CallGraphDOTPrinter::getAnalysisUsage(AnalysisUsage &AU) const {
- ModulePass::getAnalysisUsage(AU);
- AU.addRequired<BlockFrequencyInfoWrapperPass>();
- AU.setPreservesAll();
-}
-
-bool CallGraphDOTPrinter::runOnModule(Module &M) {
- auto LookupBFI = [this](Function &F) {
- return &this->getAnalysis<BlockFrequencyInfoWrapperPass>(F).getBFI();
- };
-
- std::string Filename =
- (std::string(M.getModuleIdentifier()) + ".callgraph.dot");
- errs() << "Writing '" << Filename << "'...";
-
- std::error_code EC;
- raw_fd_ostream File(Filename, EC, sys::fs::F_Text);
-
- CallGraph CG(M);
- CallGraphDOTInfo CFGInfo(&M, &CG, LookupBFI);
-
- if (!EC)
- WriteGraph(File, &CFGInfo);
- else
- errs() << " error opening file for writing!";
- errs() << "\n";
-
- return false;
-}
-
} // end anonymous namespace
char CallGraphViewer::ID = 0;
Modified: llvm/trunk/lib/Analysis/DomPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DomPrinter.cpp?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/DomPrinter.cpp (original)
+++ llvm/trunk/lib/Analysis/DomPrinter.cpp Fri Jun 29 10:48:58 2018
@@ -38,12 +38,13 @@ struct DOTGraphTraits<DomTreeNode*> : pu
if (!BB)
return "Post dominance root node";
+
if (isSimple())
- return DOTGraphTraits<CFGDOTInfo*>
- ::getSimpleNodeLabel(BB, nullptr);
+ return DOTGraphTraits<const Function*>
+ ::getSimpleNodeLabel(BB, BB->getParent());
else
- return DOTGraphTraits<CFGDOTInfo*>
- ::getCompleteNodeLabel(BB, nullptr);
+ return DOTGraphTraits<const Function*>
+ ::getCompleteNodeLabel(BB, BB->getParent());
}
};
Removed: llvm/trunk/lib/Analysis/HeatUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/HeatUtils.cpp?rev=335999&view=auto
==============================================================================
--- llvm/trunk/lib/Analysis/HeatUtils.cpp (original)
+++ llvm/trunk/lib/Analysis/HeatUtils.cpp (removed)
@@ -1,130 +0,0 @@
-//===-- HeatUtils.cpp - Utility for printing heat colors --------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Utility for printing heat colors based on heuristics or profiling
-// information.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Analysis/HeatUtils.h"
-#include "llvm/IR/Instructions.h"
-
-namespace llvm {
-
-static const unsigned heatSize = 100;
-static const std::string heatPalette[heatSize] = {
- "#3d50c3", "#4055c8", "#4358cb", "#465ecf", "#4961d2", "#4c66d6", "#4f69d9",
- "#536edd", "#5572df", "#5977e3", "#5b7ae5", "#5f7fe8", "#6282ea", "#6687ed",
- "#6a8bef", "#6c8ff1", "#7093f3", "#7396f5", "#779af7", "#7a9df8", "#7ea1fa",
- "#81a4fb", "#85a8fc", "#88abfd", "#8caffe", "#8fb1fe", "#93b5fe", "#96b7ff",
- "#9abbff", "#9ebeff", "#a1c0ff", "#a5c3fe", "#a7c5fe", "#abc8fd", "#aec9fc",
- "#b2ccfb", "#b5cdfa", "#b9d0f9", "#bbd1f8", "#bfd3f6", "#c1d4f4", "#c5d6f2",
- "#c7d7f0", "#cbd8ee", "#cedaeb", "#d1dae9", "#d4dbe6", "#d6dce4", "#d9dce1",
- "#dbdcde", "#dedcdb", "#e0dbd8", "#e3d9d3", "#e5d8d1", "#e8d6cc", "#ead5c9",
- "#ecd3c5", "#eed0c0", "#efcebd", "#f1ccb8", "#f2cab5", "#f3c7b1", "#f4c5ad",
- "#f5c1a9", "#f6bfa6", "#f7bca1", "#f7b99e", "#f7b599", "#f7b396", "#f7af91",
- "#f7ac8e", "#f7a889", "#f6a385", "#f5a081", "#f59c7d", "#f4987a", "#f39475",
- "#f29072", "#f08b6e", "#ef886b", "#ed8366", "#ec7f63", "#e97a5f", "#e8765c",
- "#e57058", "#e36c55", "#e16751", "#de614d", "#dc5d4a", "#d85646", "#d65244",
- "#d24b40", "#d0473d", "#cc403a", "#ca3b37", "#c53334", "#c32e31", "#be242e",
- "#bb1b2c", "#b70d28"};
-
-bool hasProfiling(const Module &M) {
- for (auto &F : M) {
- for (auto &BB : F) {
- auto *TI = BB.getTerminator();
- if (TI == nullptr)
- continue;
- if (TI->getMetadata(llvm::LLVMContext::MD_prof) != nullptr)
- return true;
- }
- }
- return false;
-}
-
-uint64_t getBlockFreq(const BasicBlock *BB, const BlockFrequencyInfo *BFI,
- bool useHeuristic) {
- uint64_t freqVal = 0;
- if (!useHeuristic) {
- Optional<uint64_t> freq = BFI->getBlockProfileCount(BB);
- if (freq.hasValue())
- freqVal = freq.getValue();
- } else {
- freqVal = BFI->getBlockFreq(BB).getFrequency();
- }
- return freqVal;
-}
-
-uint64_t getNumOfCalls(CallSite &CS,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic) {
- if (CS.getInstruction()==nullptr) return 0;
- if (CS.getInstruction()->getParent()==nullptr) return 0;
- BasicBlock *BB = CS.getInstruction()->getParent();
- return getBlockFreq(BB, LookupBFI(*CS.getCaller()));
-}
-
-uint64_t getNumOfCalls(Function &callerFunction, Function &calledFunction,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic) {
- uint64_t counter = 0;
- for (User *U : calledFunction.users()) {
- if (isa<CallInst>(U)) {
- auto CS = CallSite(U);
- if (CS.getCaller() == (&callerFunction)) {
- counter += getNumOfCalls(CS, LookupBFI);
- }
- }
- }
- return counter;
-}
-
-uint64_t getMaxFreq(const Function &F, const BlockFrequencyInfo *BFI,
- bool useHeuristic) {
- uint64_t maxFreq = 0;
- for (const BasicBlock &BB : F) {
- uint64_t freqVal = getBlockFreq(&BB, BFI, useHeuristic);
- if (freqVal >= maxFreq)
- maxFreq = freqVal;
- }
- return maxFreq;
-}
-
-uint64_t getMaxFreq(Module &M,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic) {
- uint64_t maxFreq = 0;
- for (auto &F : M) {
- if (F.isDeclaration())
- continue;
- uint64_t localMaxFreq = getMaxFreq(F, LookupBFI(F), useHeuristic);
- if (localMaxFreq >= maxFreq)
- maxFreq = localMaxFreq;
- }
- return maxFreq;
-}
-
-std::string getHeatColor(uint64_t freq, uint64_t maxFreq) {
- if (freq > maxFreq)
- freq = maxFreq;
- unsigned colorId =
- unsigned(round((double(freq) / maxFreq) * (heatSize - 1.0)));
- return heatPalette[colorId];
-}
-
-std::string getHeatColor(double percent) {
- if (percent > 1.0)
- percent = 1.0;
- if (percent < 0.0)
- percent = 0.0;
- unsigned colorId = unsigned(round(percent * (heatSize - 1.0)));
- return heatPalette[colorId];
-}
-
-} // namespace llvm
Modified: llvm/trunk/lib/Analysis/RegionPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/RegionPrinter.cpp?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/RegionPrinter.cpp (original)
+++ llvm/trunk/lib/Analysis/RegionPrinter.cpp Fri Jun 29 10:48:58 2018
@@ -47,11 +47,11 @@ struct DOTGraphTraits<RegionNode*> : pub
BasicBlock *BB = Node->getNodeAs<BasicBlock>();
if (isSimple())
- return DOTGraphTraits<CFGDOTInfo*>
- ::getSimpleNodeLabel(BB, nullptr);
+ return DOTGraphTraits<const Function*>
+ ::getSimpleNodeLabel(BB, BB->getParent());
else
- return DOTGraphTraits<CFGDOTInfo*>
- ::getCompleteNodeLabel(BB, nullptr);
+ return DOTGraphTraits<const Function*>
+ ::getCompleteNodeLabel(BB, BB->getParent());
}
return "Not implemented";
Modified: llvm/trunk/lib/Passes/PassRegistry.def
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Passes/PassRegistry.def?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Passes/PassRegistry.def (original)
+++ llvm/trunk/lib/Passes/PassRegistry.def Fri Jun 29 10:48:58 2018
@@ -43,8 +43,6 @@ MODULE_PASS("called-value-propagation",
MODULE_PASS("constmerge", ConstantMergePass())
MODULE_PASS("cross-dso-cfi", CrossDSOCFIPass())
MODULE_PASS("deadargelim", DeadArgumentEliminationPass())
-MODULE_PASS("dot-cfg", CFGPrinterPass())
-MODULE_PASS("dot-cfg-only", CFGOnlyPrinterPass())
MODULE_PASS("elim-avail-extern", EliminateAvailableExternallyPass())
MODULE_PASS("forceattrs", ForceFunctionAttrsPass())
MODULE_PASS("function-import", FunctionImportPass())
@@ -78,8 +76,6 @@ MODULE_PASS("strip-dead-prototypes", Str
MODULE_PASS("synthetic-counts-propagation", SyntheticCountsPropagation())
MODULE_PASS("wholeprogramdevirt", WholeProgramDevirtPass())
MODULE_PASS("verify", VerifierPass())
-MODULE_PASS("view-cfg", CFGViewerPass())
-MODULE_PASS("view-cfg-only", CFGOnlyViewerPass())
#undef MODULE_PASS
#ifndef CGSCC_ANALYSIS
@@ -155,6 +151,8 @@ FUNCTION_PASS("correlated-propagation",
FUNCTION_PASS("dce", DCEPass())
FUNCTION_PASS("div-rem-pairs", DivRemPairsPass())
FUNCTION_PASS("dse", DSEPass())
+FUNCTION_PASS("dot-cfg", CFGPrinterPass())
+FUNCTION_PASS("dot-cfg-only", CFGOnlyPrinterPass())
FUNCTION_PASS("early-cse", EarlyCSEPass(/*UseMemorySSA=*/false))
FUNCTION_PASS("early-cse-memssa", EarlyCSEPass(/*UseMemorySSA=*/true))
FUNCTION_PASS("ee-instrument", EntryExitInstrumenterPass(/*PostInlining=*/false))
@@ -216,6 +214,8 @@ FUNCTION_PASS("verify<domtree>", Dominat
FUNCTION_PASS("verify<loops>", LoopVerifierPass())
FUNCTION_PASS("verify<memoryssa>", MemorySSAVerifierPass())
FUNCTION_PASS("verify<regions>", RegionInfoVerifierPass())
+FUNCTION_PASS("view-cfg", CFGViewerPass())
+FUNCTION_PASS("view-cfg-only", CFGOnlyViewerPass())
#undef FUNCTION_PASS
#ifndef LOOP_ANALYSIS
Modified: llvm/trunk/lib/Transforms/Scalar/NewGVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/NewGVN.cpp?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/NewGVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/NewGVN.cpp Fri Jun 29 10:48:58 2018
@@ -896,7 +896,7 @@ bool NewGVN::isBackedge(BasicBlock *From
#ifndef NDEBUG
static std::string getBlockName(const BasicBlock *B) {
- return DOTGraphTraits<CFGDOTInfo *>::getSimpleNodeLabel(B, nullptr);
+ return DOTGraphTraits<const Function *>::getSimpleNodeLabel(B, nullptr);
}
#endif
Removed: llvm/trunk/llvm/Analysis/HeatUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/llvm/Analysis/HeatUtils.h?rev=335999&view=auto
==============================================================================
--- llvm/trunk/llvm/Analysis/HeatUtils.h (original)
+++ llvm/trunk/llvm/Analysis/HeatUtils.h (removed)
@@ -1,54 +0,0 @@
-//===-- HeatUtils.h - Utility for printing heat colors ----------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// Utility for printing heat colors based on heuristics or profiling
-// information.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ANALYSIS_HEATUTILS_H
-#define LLVM_ANALYSIS_HEATUTILS_H
-
-#include "llvm/Analysis/BlockFrequencyInfo.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/CallSite.h"
-
-#include <string>
-
-namespace llvm {
-
-bool hasProfiling(const Module &M);
-
-uint64_t getBlockFreq(const BasicBlock *BB, const BlockFrequencyInfo *BFI,
- bool useHeuristic = true);
-
-uint64_t getNumOfCalls(Function &callerFunction, Function &calledFunction,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-uint64_t getNumOfCalls(CallSite &callsite,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-uint64_t getMaxFreq(const Function &F, const BlockFrequencyInfo *BFI,
- bool useHeuristic = true);
-
-uint64_t getMaxFreq(Module &M,
- function_ref<BlockFrequencyInfo *(Function &)> LookupBFI,
- bool useHeuristic = true);
-
-std::string getHeatColor(uint64_t freq, uint64_t maxFreq);
-
-std::string getHeatColor(double percent);
-
-} // namespace llvm
-
-#endif
Modified: llvm/trunk/test/Other/2007-06-05-PassID.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2007-06-05-PassID.ll?rev=336000&r1=335999&r2=336000&view=diff
==============================================================================
--- llvm/trunk/test/Other/2007-06-05-PassID.ll (original)
+++ llvm/trunk/test/Other/2007-06-05-PassID.ll Fri Jun 29 10:48:58 2018
@@ -1,13 +1,5 @@
;RUN: opt < %s -analyze -dot-cfg-only 2>/dev/null
;RUN: opt < %s -analyze -passes=dot-cfg-only 2>/dev/null
-;RUN: opt < %s -analyze -dot-cfg-only \
-;RUN: -cfg-heat-colors=true -cfg-weights=true 2>/dev/null
-;RUN: opt < %s -analyze -dot-cfg-only \
-;RUN: -cfg-heat-colors=false -cfg-weights=false 2>/dev/null
-;RUN: opt < %s -analyze -dot-cfg \
-;RUN: -cfg-heat-colors=true -cfg-weights=true 2>/dev/null
-;RUN: opt < %s -analyze -dot-cfg \
-;RUN: -cfg-heat-colors=false -cfg-weights=false 2>/dev/null
;PR 1497
define void @foo() {
More information about the llvm-commits
mailing list