From 61d13b1c02c0f32e99a169158868716eb437560b Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Thu, 9 Feb 2017 20:37:46 +0000 Subject: [PATCH] Drop graph_ prefix git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294621 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/GraphTraits.h | 8 ++++---- include/llvm/Support/GenericDomTree.h | 2 +- include/llvm/Support/GenericDomTreeConstruction.h | 2 +- lib/Analysis/IteratedDominanceFrontier.cpp | 2 +- lib/Target/AMDGPU/AMDILCFGStructurizer.cpp | 4 ++-- lib/Target/Hexagon/HexagonBitSimplify.cpp | 4 ++-- lib/Target/Hexagon/HexagonCommonGEP.cpp | 4 ++-- lib/Target/Hexagon/HexagonGenExtract.cpp | 2 +- lib/Target/Hexagon/HexagonGenInsert.cpp | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/llvm/ADT/GraphTraits.h b/include/llvm/ADT/GraphTraits.h index bf17fac45d6..2c88c4271b4 100644 --- a/include/llvm/ADT/GraphTraits.h +++ b/include/llvm/ADT/GraphTraits.h @@ -91,27 +91,27 @@ template struct GraphTraits>> : GraphTraits {}; // Provide iterator ranges for the graph traits nodes and children template iterator_range::nodes_iterator> -graph_nodes(const GraphType &G) { +nodes(const GraphType &G) { return make_range(GraphTraits::nodes_begin(G), GraphTraits::nodes_end(G)); } template iterator_range>::nodes_iterator> -inverse_graph_nodes(const GraphType &G) { +inverse_nodes(const GraphType &G) { return make_range(GraphTraits>::nodes_begin(G), GraphTraits>::nodes_end(G)); } template iterator_range::ChildIteratorType> -graph_children(const typename GraphTraits::NodeRef &G) { +children(const typename GraphTraits::NodeRef &G) { return make_range(GraphTraits::child_begin(G), GraphTraits::child_end(G)); } template iterator_range>::ChildIteratorType> -inverse_graph_children(const typename GraphTraits::NodeRef &G) { +inverse_children(const typename GraphTraits::NodeRef &G) { return make_range(GraphTraits>::child_begin(G), GraphTraits>::child_end(G)); } diff --git a/include/llvm/Support/GenericDomTree.h b/include/llvm/Support/GenericDomTree.h index de0a85d9d81..8be7c7d0b43 100644 --- a/include/llvm/Support/GenericDomTree.h +++ b/include/llvm/Support/GenericDomTree.h @@ -782,7 +782,7 @@ public: Calculate(*this, F); } else { // Initialize the roots list - for (auto *Node : graph_nodes(&F)) + for (auto *Node : nodes(&F)) if (TraitsTy::child_begin(Node) == TraitsTy::child_end(Node)) addRoot(Node); diff --git a/include/llvm/Support/GenericDomTreeConstruction.h b/include/llvm/Support/GenericDomTreeConstruction.h index 19b22328235..c1d757f3ab6 100644 --- a/include/llvm/Support/GenericDomTreeConstruction.h +++ b/include/llvm/Support/GenericDomTreeConstruction.h @@ -200,7 +200,7 @@ void Calculate(DominatorTreeBaseByGraphTraits> &DT, // initialize the semi dominator to point to the parent node WInfo.Semi = WInfo.Parent; - for (const auto &N : inverse_graph_children(W)) + for (const auto &N : inverse_children(W)) if (DT.Info.count(N)) { // Only if this predecessor is reachable! unsigned SemiU = DT.Info[Eval(DT, N, i + 1)].Semi; if (SemiU < WInfo.Semi) diff --git a/lib/Analysis/IteratedDominanceFrontier.cpp b/lib/Analysis/IteratedDominanceFrontier.cpp index 27249664bce..2a736ec0379 100644 --- a/lib/Analysis/IteratedDominanceFrontier.cpp +++ b/lib/Analysis/IteratedDominanceFrontier.cpp @@ -64,7 +64,7 @@ void IDFCalculator::calculate( BasicBlock *BB = Node->getBlock(); // Succ is the successor in the direction we are calculating IDF, so it is // successor for IDF, and predecessor for Reverse IDF. - for (auto *Succ : graph_children(BB)) { + for (auto *Succ : children(BB)) { DomTreeNode *SuccNode = DT.getNode(Succ); // Quickly skip all CFG edges that are also dominator tree edges instead diff --git a/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp b/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp index e83faea6c05..d150984f882 100644 --- a/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp +++ b/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp @@ -912,7 +912,7 @@ void AMDGPUCFGStructurizer::orderBlocks(MachineFunction *MF) { } // walk through all the block in func to check for unreachable - for (auto *MBB : graph_nodes(MF)) { + for (auto *MBB : nodes(MF)) { SccNum = getSCCNum(MBB); if (SccNum == INVALIDSCCNUM) dbgs() << "unreachable block BB" << MBB->getNumber() << "\n"; @@ -1078,7 +1078,7 @@ int AMDGPUCFGStructurizer::mergeLoop(MachineLoop *LoopRep) { MachineBasicBlock *ExitBlk = *ExitBlks.begin(); assert(ExitBlk && "Loop has several exit block"); MBBVector LatchBlks; - for (auto *LB : inverse_graph_children(LoopHeader)) + for (auto *LB : inverse_children(LoopHeader)) if (LoopRep->contains(LB)) LatchBlks.push_back(LB); diff --git a/lib/Target/Hexagon/HexagonBitSimplify.cpp b/lib/Target/Hexagon/HexagonBitSimplify.cpp index 895889ce4c2..fda7f7fd884 100644 --- a/lib/Target/Hexagon/HexagonBitSimplify.cpp +++ b/lib/Target/Hexagon/HexagonBitSimplify.cpp @@ -260,7 +260,7 @@ bool HexagonBitSimplify::visitBlock(MachineBasicBlock &B, Transformation &T, RegisterSet NewAVs = AVs; NewAVs.insert(Defs); - for (auto *DTN : graph_children(MDT->getNode(&B))) + for (auto *DTN : children(MDT->getNode(&B))) Changed |= visitBlock(*(DTN->getBlock()), T, NewAVs); if (!T.TopDown) @@ -982,7 +982,7 @@ bool DeadCodeElimination::isDead(unsigned R) const { bool DeadCodeElimination::runOnNode(MachineDomTreeNode *N) { bool Changed = false; - for (auto *DTN : graph_children(N)) + for (auto *DTN : children(N)) Changed |= runOnNode(DTN); MachineBasicBlock *B = N->getBlock(); diff --git a/lib/Target/Hexagon/HexagonCommonGEP.cpp b/lib/Target/Hexagon/HexagonCommonGEP.cpp index d3174b2f08b..a07ba77e6f3 100644 --- a/lib/Target/Hexagon/HexagonCommonGEP.cpp +++ b/lib/Target/Hexagon/HexagonCommonGEP.cpp @@ -315,7 +315,7 @@ void HexagonCommonGEP::getBlockTraversalOrder(BasicBlock *Root, // visited". Order.push_back(Root); - for (auto *DTN : graph_children(DT->getNode(Root))) + for (auto *DTN : children(DT->getNode(Root))) getBlockTraversalOrder(DTN->getBlock(), Order); } @@ -1232,7 +1232,7 @@ void HexagonCommonGEP::removeDeadCode() { for (unsigned i = 0; i < BO.size(); ++i) { BasicBlock *B = cast(BO[i]); - for (auto DTN : graph_children(DT->getNode(B))) + for (auto DTN : children(DT->getNode(B))) BO.push_back(DTN->getBlock()); } diff --git a/lib/Target/Hexagon/HexagonGenExtract.cpp b/lib/Target/Hexagon/HexagonGenExtract.cpp index 7fd52c949f3..f6f3a593428 100644 --- a/lib/Target/Hexagon/HexagonGenExtract.cpp +++ b/lib/Target/Hexagon/HexagonGenExtract.cpp @@ -221,7 +221,7 @@ bool HexagonGenExtract::convert(Instruction *In) { bool HexagonGenExtract::visitBlock(BasicBlock *B) { // Depth-first, bottom-up traversal. - for (auto *DTN : graph_children(DT->getNode(B))) + for (auto *DTN : children(DT->getNode(B))) visitBlock(DTN->getBlock()); // Allow limiting the number of generated extracts for debugging purposes. diff --git a/lib/Target/Hexagon/HexagonGenInsert.cpp b/lib/Target/Hexagon/HexagonGenInsert.cpp index 60b4fe68eb8..54d99d399f8 100644 --- a/lib/Target/Hexagon/HexagonGenInsert.cpp +++ b/lib/Target/Hexagon/HexagonGenInsert.cpp @@ -947,7 +947,7 @@ void HexagonGenInsert::collectInBlock(MachineBasicBlock *B, BlockDefs.insert(InsDefs); } - for (auto *DTN : graph_children(MDT->getNode(B))) { + for (auto *DTN : children(MDT->getNode(B))) { MachineBasicBlock *SB = DTN->getBlock(); collectInBlock(SB, AVs); } @@ -1420,7 +1420,7 @@ bool HexagonGenInsert::generateInserts() { bool HexagonGenInsert::removeDeadCode(MachineDomTreeNode *N) { bool Changed = false; - for (auto *DTN : graph_children(N)) + for (auto *DTN : children(N)) Changed |= removeDeadCode(DTN); MachineBasicBlock *B = N->getBlock(); -- 2.11.0