X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FAnalysis%2FIntervalIterator.h;h=0968c7468e68b902697152b9780a33f2c9138d2f;hb=b09c146b116359616f6cbd4c8b3328607e00ff42;hp=2d67ded1962d79842d35d35b75017add24e7b1cf;hpb=6fbcc26f1460eaee4e0eb8b426fc1ff0c7af11be;p=oota-llvm.git diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h index 2d67ded1962..0968c7468e6 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -1,16 +1,16 @@ //===- IntervalIterator.h - Interval Iterator Declaration -------*- C++ -*-===// -// +// // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. -// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// //===----------------------------------------------------------------------===// // // This file defines an iterator that enumerates the intervals in a control flow // graph of some sort. This iterator is parametric, allowing iterator over the // following types of graphs: -// +// // 1. A Function* object, composed of BasicBlock nodes. // 2. An IntervalPartition& object, composed of Interval nodes. // @@ -18,9 +18,9 @@ // in depth first order. These intervals are completely filled in except for // the predecessor fields (the successor information is filled in however). // -// By default, the intervals created by this iterator are deleted after they +// By default, the intervals created by this iterator are deleted after they // are no longer any use to the iterator. This behavior can be changed by -// passing a false value into the intervals_begin() function. This causes the +// passing a false value into the intervals_begin() function. This causes the // IOwnMem member to be set, and the intervals to not be deleted. // // It is only safe to use this if all of the intervals are deleted by the caller @@ -36,31 +36,33 @@ #include "llvm/Analysis/IntervalPartition.h" #include "llvm/Function.h" #include "llvm/Support/CFG.h" -#include -#include #include +#include +#include + +namespace llvm { -// getNodeHeader - Given a source graph node and the source graph, return the +// getNodeHeader - Given a source graph node and the source graph, return the // BasicBlock that is the header node. This is the opposite of // getSourceGraphNode. // inline BasicBlock *getNodeHeader(BasicBlock *BB) { return BB; } inline BasicBlock *getNodeHeader(Interval *I) { return I->getHeaderNode(); } -// getSourceGraphNode - Given a BasicBlock and the source graph, return the +// getSourceGraphNode - Given a BasicBlock and the source graph, return the // source graph node that corresponds to the BasicBlock. This is the opposite // of getNodeHeader. // inline BasicBlock *getSourceGraphNode(Function *, BasicBlock *BB) { - return BB; + return BB; } -inline Interval *getSourceGraphNode(IntervalPartition *IP, BasicBlock *BB) { +inline Interval *getSourceGraphNode(IntervalPartition *IP, BasicBlock *BB) { return IP->getBlockInterval(BB); } // addNodeToInterval - This method exists to assist the generic ProcessNode -// with the task of adding a node to the new interval, depending on the -// type of the source node. In the case of a CFG source graph (BasicBlock +// with the task of adding a node to the new interval, depending on the +// type of the source node. In the case of a CFG source graph (BasicBlock // case), the BasicBlock itself is added to the interval. // inline void addNodeToInterval(Interval *Int, BasicBlock *BB) { @@ -68,8 +70,8 @@ inline void addNodeToInterval(Interval *Int, BasicBlock *BB) { } // addNodeToInterval - This method exists to assist the generic ProcessNode -// with the task of adding a node to the new interval, depending on the -// type of the source node. In the case of a CFG source graph (BasicBlock +// with the task of adding a node to the new interval, depending on the +// type of the source node. In the case of a CFG source graph (BasicBlock // case), the BasicBlock itself is added to the interval. In the case of // an IntervalPartition source graph (Interval case), all of the member // BasicBlocks are added to the interval. @@ -86,45 +88,43 @@ inline void addNodeToInterval(Interval *Int, Interval *I) { template, class IGT = GraphTraits > > class IntervalIterator { - std::stack > IntStack; + std::vector > IntStack; std::set Visited; OrigContainer_t *OrigContainer; bool IOwnMem; // If True, delete intervals when done with them // See file header for conditions of use public: - typedef BasicBlock* _BB; - typedef IntervalIterator _Self; typedef std::forward_iterator_tag iterator_category; - + IntervalIterator() {} // End iterator, empty stack IntervalIterator(Function *M, bool OwnMemory) : IOwnMem(OwnMemory) { OrigContainer = M; if (!ProcessInterval(&M->front())) { - assert(0 && "ProcessInterval should never fail for first interval!"); + llvm_unreachable("ProcessInterval should never fail for first interval!"); } } IntervalIterator(IntervalPartition &IP, bool OwnMemory) : IOwnMem(OwnMemory) { OrigContainer = &IP; if (!ProcessInterval(IP.getRootInterval())) { - assert(0 && "ProcessInterval should never fail for first interval!"); + llvm_unreachable("ProcessInterval should never fail for first interval!"); } } inline ~IntervalIterator() { if (IOwnMem) while (!IntStack.empty()) { - delete operator*(); - IntStack.pop(); + delete operator*(); + IntStack.pop_back(); } } inline bool operator==(const _Self& x) const { return IntStack == x.IntStack;} inline bool operator!=(const _Self& x) const { return !operator==(x); } - inline const Interval *operator*() const { return IntStack.top().first; } - inline Interval *operator*() { return IntStack.top().first; } + inline const Interval *operator*() const { return IntStack.back().first; } + inline Interval *operator*() { return IntStack.back().first; } inline const Interval *operator->() const { return operator*(); } inline Interval *operator->() { return operator*(); } @@ -133,29 +133,29 @@ public: do { // All of the intervals on the stack have been visited. Try visiting // their successors now. - Interval::succ_iterator &SuccIt = IntStack.top().second, - EndIt = succ_end(IntStack.top().first); + Interval::succ_iterator &SuccIt = IntStack.back().second, + EndIt = succ_end(IntStack.back().first); while (SuccIt != EndIt) { // Loop over all interval succs - bool Done = ProcessInterval(getSourceGraphNode(OrigContainer, *SuccIt)); - ++SuccIt; // Increment iterator - if (Done) return *this; // Found a new interval! Use it! + bool Done = ProcessInterval(getSourceGraphNode(OrigContainer, *SuccIt)); + ++SuccIt; // Increment iterator + if (Done) return *this; // Found a new interval! Use it! } // Free interval memory... if necessary - if (IOwnMem) delete IntStack.top().first; + if (IOwnMem) delete IntStack.back().first; // We ran out of successors for this interval... pop off the stack - IntStack.pop(); + IntStack.pop_back(); } while (!IntStack.empty()); - return *this; + return *this; } inline _Self operator++(int) { // Postincrement - _Self tmp = *this; ++*this; return tmp; + _Self tmp = *this; ++*this; return tmp; } private: - // ProcessInterval - This method is used during the construction of the + // ProcessInterval - This method is used during the construction of the // interval graph. It walks through the source graph, recursively creating // an interval per invokation until the entire graph is covered. This uses // the ProcessNode method to add all of the nodes to the interval. @@ -175,10 +175,10 @@ private: E = GT::child_end(Node); I != E; ++I) ProcessNode(Int, getSourceGraphNode(OrigContainer, *I)); - IntStack.push(make_pair(Int, succ_begin(Int))); + IntStack.push_back(std::make_pair(Int, succ_begin(Int))); return true; } - + // ProcessNode - This method is called by ProcessInterval to add nodes to the // interval being constructed, and it is also called recursively as it walks // the source graph. A node is added to the current interval only if all of @@ -191,52 +191,53 @@ private: void ProcessNode(Interval *Int, NodeTy *Node) { assert(Int && "Null interval == bad!"); assert(Node && "Null Node == bad!"); - + BasicBlock *NodeHeader = getNodeHeader(Node); if (Visited.count(NodeHeader)) { // Node already been visited? if (Int->contains(NodeHeader)) { // Already in this interval... - return; + return; } else { // In other interval, add as successor - if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set - Int->Successors.push_back(NodeHeader); + if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set + Int->Successors.push_back(NodeHeader); } } else { // Otherwise, not in interval yet - for (typename IGT::ChildIteratorType I = IGT::child_begin(Node), + for (typename IGT::ChildIteratorType I = IGT::child_begin(Node), E = IGT::child_end(Node); I != E; ++I) { - if (!Int->contains(*I)) { // If pred not in interval, we can't be - if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set - Int->Successors.push_back(NodeHeader); - return; // See you later - } + if (!Int->contains(*I)) { // If pred not in interval, we can't be + if (!Int->isSuccessor(NodeHeader)) // Add only if not already in set + Int->Successors.push_back(NodeHeader); + return; // See you later + } } // If we get here, then all of the predecessors of BB are in the interval // already. In this case, we must add BB to the interval! addNodeToInterval(Int, Node); Visited.insert(NodeHeader); // The node has now been visited! - + if (Int->isSuccessor(NodeHeader)) { - // If we were in the successor list from before... remove from succ list - Int->Successors.erase(remove(Int->Successors.begin(), - Int->Successors.end(), NodeHeader), - Int->Successors.end()); + // If we were in the successor list from before... remove from succ list + Int->Successors.erase(std::remove(Int->Successors.begin(), + Int->Successors.end(), NodeHeader), + Int->Successors.end()); } - + // Now that we have discovered that Node is in the interval, perhaps some // of its successors are as well? for (typename GT::ChildIteratorType It = GT::child_begin(Node), - End = GT::child_end(Node); It != End; ++It) - ProcessNode(Int, getSourceGraphNode(OrigContainer, *It)); + End = GT::child_end(Node); It != End; ++It) + ProcessNode(Int, getSourceGraphNode(OrigContainer, *It)); } } }; typedef IntervalIterator function_interval_iterator; -typedef IntervalIterator interval_part_interval_iterator; +typedef IntervalIterator + interval_part_interval_iterator; -inline function_interval_iterator intervals_begin(Function *F, +inline function_interval_iterator intervals_begin(Function *F, bool DeleteInts = true) { return function_interval_iterator(F, DeleteInts); } @@ -244,7 +245,7 @@ inline function_interval_iterator intervals_end(Function *) { return function_interval_iterator(); } -inline interval_part_interval_iterator +inline interval_part_interval_iterator intervals_begin(IntervalPartition &IP, bool DeleteIntervals = true) { return interval_part_interval_iterator(IP, DeleteIntervals); } @@ -253,4 +254,6 @@ inline interval_part_interval_iterator intervals_end(IntervalPartition &IP) { return interval_part_interval_iterator(); } +} // End llvm namespace + #endif