From: Chris Lattner Date: Fri, 9 Aug 2002 18:55:18 +0000 (+0000) Subject: Very minor cleanups X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b0cfa6dfecc882866a45353466a57db4ea937d95;p=oota-llvm.git Very minor cleanups git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3271 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 781604eaae7..11c627af58e 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -1,16 +1,10 @@ -// $Id$ -//*************************************************************************** -// File: -// SchedGraph.cpp -// -// Purpose: -// Scheduling graph based on SSA graph plus extra dependence edges -// capturing dependences due to machine resources (machine registers, -// CC registers, and any others). -// -// History: -// 7/20/01 - Vikram Adve - Created -//**************************************************************************/ +//===- SchedGraph.cpp - Scheduling Graph Implementation -------------------===// +// +// Scheduling graph based on SSA graph plus extra dependence edges capturing +// dependences due to machine resources (machine registers, CC registers, and +// any others). +// +//===----------------------------------------------------------------------===// #include "SchedGraph.h" #include "llvm/CodeGen/InstrSelection.h" @@ -18,12 +12,10 @@ #include "llvm/CodeGen/MachineCodeForBasicBlock.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/BasicBlock.h" #include "llvm/Function.h" #include "llvm/iOther.h" #include "Support/StringExtras.h" #include "Support/STLExtras.h" -#include using std::vector; using std::pair; @@ -356,21 +348,21 @@ SchedGraph::addCDEdges(const TerminatorInst* term, if (first == termMvec.size()) return; - SchedGraphNode* firstBrNode = this->getGraphNodeForInstr(termMvec[first]); + SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]); // Add CD edges from each instruction in the sequence to the // *last preceding* branch instr. in the sequence // Use a latency of 0 because we only need to prevent out-of-order issue. // - for (int i = (int) termMvec.size()-1; i > (int) first; i--) + for (unsigned i = termMvec.size(); i > first+1; --i) { - SchedGraphNode* toNode = this->getGraphNodeForInstr(termMvec[i]); + SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]); assert(toNode && "No node for instr generated for branch?"); - for (int j = i-1; j >= 0; j--) - if (mii.isBranch(termMvec[j]->getOpCode())) + for (unsigned j = i-1; j != 0; --j) + if (mii.isBranch(termMvec[j-1]->getOpCode())) { - SchedGraphNode* brNode = this->getGraphNodeForInstr(termMvec[j]); + SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]); assert(brNode && "No node for instr generated for branch?"); (void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0); @@ -381,9 +373,9 @@ SchedGraph::addCDEdges(const TerminatorInst* term, // Add CD edges from each instruction preceding the first branch // to the first branch. Use a latency of 0 as above. // - for (int i = first-1; i >= 0; i--) + for (unsigned i = first; i != 0; --i) { - SchedGraphNode* fromNode = this->getGraphNodeForInstr(termMvec[i]); + SchedGraphNode* fromNode = getGraphNodeForInstr(termMvec[i-1]); assert(fromNode && "No node for instr generated for branch?"); (void) new SchedGraphEdge(fromNode, firstBrNode, SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0); diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 781604eaae7..11c627af58e 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -1,16 +1,10 @@ -// $Id$ -//*************************************************************************** -// File: -// SchedGraph.cpp -// -// Purpose: -// Scheduling graph based on SSA graph plus extra dependence edges -// capturing dependences due to machine resources (machine registers, -// CC registers, and any others). -// -// History: -// 7/20/01 - Vikram Adve - Created -//**************************************************************************/ +//===- SchedGraph.cpp - Scheduling Graph Implementation -------------------===// +// +// Scheduling graph based on SSA graph plus extra dependence edges capturing +// dependences due to machine resources (machine registers, CC registers, and +// any others). +// +//===----------------------------------------------------------------------===// #include "SchedGraph.h" #include "llvm/CodeGen/InstrSelection.h" @@ -18,12 +12,10 @@ #include "llvm/CodeGen/MachineCodeForBasicBlock.h" #include "llvm/Target/MachineRegInfo.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/BasicBlock.h" #include "llvm/Function.h" #include "llvm/iOther.h" #include "Support/StringExtras.h" #include "Support/STLExtras.h" -#include using std::vector; using std::pair; @@ -356,21 +348,21 @@ SchedGraph::addCDEdges(const TerminatorInst* term, if (first == termMvec.size()) return; - SchedGraphNode* firstBrNode = this->getGraphNodeForInstr(termMvec[first]); + SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]); // Add CD edges from each instruction in the sequence to the // *last preceding* branch instr. in the sequence // Use a latency of 0 because we only need to prevent out-of-order issue. // - for (int i = (int) termMvec.size()-1; i > (int) first; i--) + for (unsigned i = termMvec.size(); i > first+1; --i) { - SchedGraphNode* toNode = this->getGraphNodeForInstr(termMvec[i]); + SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]); assert(toNode && "No node for instr generated for branch?"); - for (int j = i-1; j >= 0; j--) - if (mii.isBranch(termMvec[j]->getOpCode())) + for (unsigned j = i-1; j != 0; --j) + if (mii.isBranch(termMvec[j-1]->getOpCode())) { - SchedGraphNode* brNode = this->getGraphNodeForInstr(termMvec[j]); + SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]); assert(brNode && "No node for instr generated for branch?"); (void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0); @@ -381,9 +373,9 @@ SchedGraph::addCDEdges(const TerminatorInst* term, // Add CD edges from each instruction preceding the first branch // to the first branch. Use a latency of 0 as above. // - for (int i = first-1; i >= 0; i--) + for (unsigned i = first; i != 0; --i) { - SchedGraphNode* fromNode = this->getGraphNodeForInstr(termMvec[i]); + SchedGraphNode* fromNode = getGraphNodeForInstr(termMvec[i-1]); assert(fromNode && "No node for instr generated for branch?"); (void) new SchedGraphEdge(fromNode, firstBrNode, SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0);