6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-19 03:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Just some code beautification changes I had sitting around in my tree.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5859 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Misha Brukman
2003-04-22 23:00:08 +00:00
parent b581148bd9
commit 63e04f3ccb
4 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CodeGen/ModuloScheduling/ModuloSchedGraph.cpp
View File

@ -19,14 +19,12 @@
#include <algorithm> #include <algorithm>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
// FIXME: Should be using #include <cmath> // FIXME: Should be using #include <cmath>
#include <math.h> #include <math.h>
//#include <swig.h> //#include <swig.h>
#define UNIDELAY 1 #define UNIDELAY 1
//*********************** Internal Data Structures *************************/ //*********************** Internal Data Structures *************************/
// The following two types need to be classes, not typedefs, so we can use // The following two types need to be classes, not typedefs, so we can use
@ -52,7 +50,6 @@ struct ValueToDefVecMap:public hash_map<const Instruction*,RefVec> {
// class Modulo SchedGraphNode // class Modulo SchedGraphNode
/*ctor*/
ModuloSchedGraphNode::ModuloSchedGraphNode(unsigned int _nodeId, ModuloSchedGraphNode::ModuloSchedGraphNode(unsigned int _nodeId,
const BasicBlock * _bb, const BasicBlock * _bb,
const Instruction * _inst, const Instruction * _inst,
@ -113,8 +110,8 @@ void ModuloSchedGraph::addDefUseEdges(const BasicBlock *bb)
for (unsigned int i = 0; i < defVec.size(); i++) { for (unsigned int i = 0; i < defVec.size(); i++) {
for (Value::use_const_iterator I = defVec[i]->getInst()->use_begin(); for (Value::use_const_iterator I = defVec[i]->getInst()->use_begin();
I != defVec[i]->getInst()->use_end(); I++) { I != defVec[i]->getInst()->use_end(); I++) {
//for each use of a def, add a flow edge from the def instruction to the ref instruction //for each use of a def, add a flow edge from the def instruction to the
//ref instruction
const Instruction *value = defVec[i]->getInst(); const Instruction *value = defVec[i]->getInst();
Instruction *inst = (Instruction *) (*I); Instruction *inst = (Instruction *) (*I);
@ -969,7 +966,6 @@ ModuloSchedGraphNode *ModuloSchedGraph::getNode(const unsigned nodeId) const
int ModuloSchedGraph::computeRecII(const BasicBlock *bb) int ModuloSchedGraph::computeRecII(const BasicBlock *bb)
{ {
int RecII = 0; int RecII = 0;
//os<<"begining computerRecII()"<<"\n"; //os<<"begining computerRecII()"<<"\n";
@ -1269,7 +1265,6 @@ void ModuloSchedGraph::dump(const BasicBlock * bb)
DEBUG(std::cerr << "dumping basic block:"); DEBUG(std::cerr << "dumping basic block:");
DEBUG(std::cerr << (bb->hasName()? bb->getName() : "block") DEBUG(std::cerr << (bb->hasName()? bb->getName() : "block")
<< " (" << bb << ")" << "\n"); << " (" << bb << ")" << "\n");
} }
void ModuloSchedGraph::dump(const BasicBlock * bb, std::ostream & os) void ModuloSchedGraph::dump(const BasicBlock * bb, std::ostream & os)
@ -1319,16 +1314,15 @@ void ModuloSchedGraph::dumpNodeProperty() const
} }
} }
void ModuloSchedGraphSet::buildGraphsForMethod(const Function * F, void ModuloSchedGraphSet::buildGraphsForMethod(const Function *F,
const TargetMachine & const TargetMachine &target)
target)
{ {
for (Function::const_iterator BI = F->begin(); BI != F->end(); ++BI) for (Function::const_iterator BI = F->begin(); BI != F->end(); ++BI)
addGraph(new ModuloSchedGraph(BI, target)); addGraph(new ModuloSchedGraph(BI, target));
} }
std::ostream & operator<<(std::ostream & os, std::ostream& operator<<(std::ostream &os,
const ModuloSchedGraphNode & node) const ModuloSchedGraphNode &node)
{ {
os << std::string(8, ' ') os << std::string(8, ' ')
<< "Node " << node.nodeId << " : " << "Node " << node.nodeId << " : "
@ -1348,6 +1342,5 @@ std::ostream & operator<<(std::ostream & os,
os << std::string(16, ' ') << *node.outEdges[i]; os << std::string(16, ' ') << *node.outEdges[i];
} }
return os; return os;
} }

18
lib/CodeGen/ModuloScheduling/ModuloSchedGraph.h
View File

@ -235,14 +235,15 @@ public:
const unsigned int getNumNodes() const { const unsigned int getNumNodes() const {
return size() + 2; return size() + 2;
} }
//return wether the BasicBlock 'bb' contains a loop //return wether the BasicBlock 'bb' contains a loop
bool isLoop(const BasicBlock * bb); bool isLoop(const BasicBlock *bb);
//return this basibBlock contains a loop //return this basibBlock contains a loop
bool isLoop(); bool isLoop();
//return the node for the input instruction //return the node for the input instruction
ModuloSchedGraphNode *getGraphNodeForInst(const Instruction * inst) const { ModuloSchedGraphNode *getGraphNodeForInst(const Instruction *inst) const {
const_iterator onePair = this->find(inst); const_iterator onePair = this->find(inst);
return (onePair != this->end()) ? (*onePair).second : NULL; return (onePair != this->end()) ? (*onePair).second : NULL;
} }
@ -252,10 +253,10 @@ public:
void dump() const; void dump() const;
// dump the basicBlock // dump the basicBlock
void dump(const BasicBlock * bb); void dump(const BasicBlock *bb);
//dump the basicBlock into 'os' stream //dump the basicBlock into 'os' stream
void dump(const BasicBlock * bb, std::ostream & os); void dump(const BasicBlock *bb, std::ostream &os);
//dump the node property //dump the node property
void dumpNodeProperty() const; void dumpNodeProperty() const;
@ -287,14 +288,13 @@ public:
(*this)[inst] = node; (*this)[inst] = node;
} }
//Graph builder // Graph builder
ModuloSchedGraphNode *getNode(const unsigned nodeId) const; ModuloSchedGraphNode *getNode(const unsigned nodeId) const;
//build the graph from the basicBlock // Build the graph from the basicBlock
void buildGraph(const TargetMachine & target); void buildGraph(const TargetMachine &target);
//Build nodes for BasicBlock // Build nodes for BasicBlock
void buildNodesforBB(const TargetMachine &target, void buildNodesforBB(const TargetMachine &target,
const BasicBlock *bb, const BasicBlock *bb,
NodeVec &memNode, NodeVec &memNode,

19
lib/Target/SparcV9/ModuloScheduling/ModuloSchedGraph.cpp
View File

@ -19,14 +19,12 @@
#include <algorithm> #include <algorithm>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
// FIXME: Should be using #include <cmath> // FIXME: Should be using #include <cmath>
#include <math.h> #include <math.h>
//#include <swig.h> //#include <swig.h>
#define UNIDELAY 1 #define UNIDELAY 1
//*********************** Internal Data Structures *************************/ //*********************** Internal Data Structures *************************/
// The following two types need to be classes, not typedefs, so we can use // The following two types need to be classes, not typedefs, so we can use
@ -52,7 +50,6 @@ struct ValueToDefVecMap:public hash_map<const Instruction*,RefVec> {
// class Modulo SchedGraphNode // class Modulo SchedGraphNode
/*ctor*/
ModuloSchedGraphNode::ModuloSchedGraphNode(unsigned int _nodeId, ModuloSchedGraphNode::ModuloSchedGraphNode(unsigned int _nodeId,
const BasicBlock * _bb, const BasicBlock * _bb,
const Instruction * _inst, const Instruction * _inst,
@ -113,8 +110,8 @@ void ModuloSchedGraph::addDefUseEdges(const BasicBlock *bb)
for (unsigned int i = 0; i < defVec.size(); i++) { for (unsigned int i = 0; i < defVec.size(); i++) {
for (Value::use_const_iterator I = defVec[i]->getInst()->use_begin(); for (Value::use_const_iterator I = defVec[i]->getInst()->use_begin();
I != defVec[i]->getInst()->use_end(); I++) { I != defVec[i]->getInst()->use_end(); I++) {
//for each use of a def, add a flow edge from the def instruction to the ref instruction //for each use of a def, add a flow edge from the def instruction to the
//ref instruction
const Instruction *value = defVec[i]->getInst(); const Instruction *value = defVec[i]->getInst();
Instruction *inst = (Instruction *) (*I); Instruction *inst = (Instruction *) (*I);
@ -969,7 +966,6 @@ ModuloSchedGraphNode *ModuloSchedGraph::getNode(const unsigned nodeId) const
int ModuloSchedGraph::computeRecII(const BasicBlock *bb) int ModuloSchedGraph::computeRecII(const BasicBlock *bb)
{ {
int RecII = 0; int RecII = 0;
//os<<"begining computerRecII()"<<"\n"; //os<<"begining computerRecII()"<<"\n";
@ -1269,7 +1265,6 @@ void ModuloSchedGraph::dump(const BasicBlock * bb)
DEBUG(std::cerr << "dumping basic block:"); DEBUG(std::cerr << "dumping basic block:");
DEBUG(std::cerr << (bb->hasName()? bb->getName() : "block") DEBUG(std::cerr << (bb->hasName()? bb->getName() : "block")
<< " (" << bb << ")" << "\n"); << " (" << bb << ")" << "\n");
} }
void ModuloSchedGraph::dump(const BasicBlock * bb, std::ostream & os) void ModuloSchedGraph::dump(const BasicBlock * bb, std::ostream & os)
@ -1319,16 +1314,15 @@ void ModuloSchedGraph::dumpNodeProperty() const
} }
} }
void ModuloSchedGraphSet::buildGraphsForMethod(const Function * F, void ModuloSchedGraphSet::buildGraphsForMethod(const Function *F,
const TargetMachine & const TargetMachine &target)
target)
{ {
for (Function::const_iterator BI = F->begin(); BI != F->end(); ++BI) for (Function::const_iterator BI = F->begin(); BI != F->end(); ++BI)
addGraph(new ModuloSchedGraph(BI, target)); addGraph(new ModuloSchedGraph(BI, target));
} }
std::ostream & operator<<(std::ostream & os, std::ostream& operator<<(std::ostream &os,
const ModuloSchedGraphNode & node) const ModuloSchedGraphNode &node)
{ {
os << std::string(8, ' ') os << std::string(8, ' ')
<< "Node " << node.nodeId << " : " << "Node " << node.nodeId << " : "
@ -1348,6 +1342,5 @@ std::ostream & operator<<(std::ostream & os,
os << std::string(16, ' ') << *node.outEdges[i]; os << std::string(16, ' ') << *node.outEdges[i];
} }
return os; return os;
} }

18
lib/Target/SparcV9/ModuloScheduling/ModuloSchedGraph.h
View File

@ -235,14 +235,15 @@ public:
const unsigned int getNumNodes() const { const unsigned int getNumNodes() const {
return size() + 2; return size() + 2;
} }
//return wether the BasicBlock 'bb' contains a loop //return wether the BasicBlock 'bb' contains a loop
bool isLoop(const BasicBlock * bb); bool isLoop(const BasicBlock *bb);
//return this basibBlock contains a loop //return this basibBlock contains a loop
bool isLoop(); bool isLoop();
//return the node for the input instruction //return the node for the input instruction
ModuloSchedGraphNode *getGraphNodeForInst(const Instruction * inst) const { ModuloSchedGraphNode *getGraphNodeForInst(const Instruction *inst) const {
const_iterator onePair = this->find(inst); const_iterator onePair = this->find(inst);
return (onePair != this->end()) ? (*onePair).second : NULL; return (onePair != this->end()) ? (*onePair).second : NULL;
} }
@ -252,10 +253,10 @@ public:
void dump() const; void dump() const;
// dump the basicBlock // dump the basicBlock
void dump(const BasicBlock * bb); void dump(const BasicBlock *bb);
//dump the basicBlock into 'os' stream //dump the basicBlock into 'os' stream
void dump(const BasicBlock * bb, std::ostream & os); void dump(const BasicBlock *bb, std::ostream &os);
//dump the node property //dump the node property
void dumpNodeProperty() const; void dumpNodeProperty() const;
@ -287,14 +288,13 @@ public:
(*this)[inst] = node; (*this)[inst] = node;
} }
//Graph builder // Graph builder
ModuloSchedGraphNode *getNode(const unsigned nodeId) const; ModuloSchedGraphNode *getNode(const unsigned nodeId) const;
//build the graph from the basicBlock // Build the graph from the basicBlock
void buildGraph(const TargetMachine & target); void buildGraph(const TargetMachine &target);
//Build nodes for BasicBlock // Build nodes for BasicBlock
void buildNodesforBB(const TargetMachine &target, void buildNodesforBB(const TargetMachine &target,
const BasicBlock *bb, const BasicBlock *bb,
NodeVec &memNode, NodeVec &memNode,