mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
Add option to disable scheduling.
Destroy live-variable information after scheduling so it is recomputed before later phases (e.g., reg. allocation). Use deterministic iterator to enumerate sched graphs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1972 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
cf8a98f2c2
commit
802cec485f
@ -31,6 +31,7 @@ using std::vector;
|
|||||||
cl::Enum<enum SchedDebugLevel_t> SchedDebugLevel("dsched", cl::NoFlags,
|
cl::Enum<enum SchedDebugLevel_t> SchedDebugLevel("dsched", cl::NoFlags,
|
||||||
"enable instruction scheduling debugging information",
|
"enable instruction scheduling debugging information",
|
||||||
clEnumValN(Sched_NoDebugInfo, "n", "disable debug output"),
|
clEnumValN(Sched_NoDebugInfo, "n", "disable debug output"),
|
||||||
|
clEnumValN(Sched_Disable, "off", "disable instruction scheduling"),
|
||||||
clEnumValN(Sched_PrintMachineCode, "y", "print machine code after scheduling"),
|
clEnumValN(Sched_PrintMachineCode, "y", "print machine code after scheduling"),
|
||||||
clEnumValN(Sched_PrintSchedTrace, "t", "print trace of scheduling actions"),
|
clEnumValN(Sched_PrintSchedTrace, "t", "print trace of scheduling actions"),
|
||||||
clEnumValN(Sched_PrintSchedGraphs, "g", "print scheduling graphs"), 0);
|
clEnumValN(Sched_PrintSchedGraphs, "g", "print scheduling graphs"), 0);
|
||||||
@ -1491,30 +1492,41 @@ instrIsFeasible(const SchedulingManager& S,
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class InstructionSchedulingWithSSA : public MethodPass {
|
class InstructionSchedulingWithSSA : public MethodPass {
|
||||||
const TargetMachine &Target;
|
const TargetMachine ⌖
|
||||||
public:
|
public:
|
||||||
inline InstructionSchedulingWithSSA(const TargetMachine &T) : Target(T) {}
|
inline InstructionSchedulingWithSSA(const TargetMachine &T) : target(T) {}
|
||||||
|
|
||||||
// getAnalysisUsageInfo - We use LiveVarInfo...
|
// getAnalysisUsageInfo - We use LiveVarInfo...
|
||||||
virtual void getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
|
virtual void getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
|
||||||
Pass::AnalysisSet &Destroyed,
|
Pass::AnalysisSet &Destroyed,
|
||||||
Pass::AnalysisSet &Provided) {
|
Pass::AnalysisSet &Provided) {
|
||||||
Requires.push_back(MethodLiveVarInfo::ID);
|
Requires.push_back(MethodLiveVarInfo::ID);
|
||||||
|
Destroyed.push_back(MethodLiveVarInfo::ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool runOnMethod(Method *M) {
|
bool runOnMethod(Method *M);
|
||||||
cerr << "Instr scheduling failed for method " << ((Value*)M)->getName()
|
};
|
||||||
<< "\n\n";
|
} // end anonymous namespace
|
||||||
SchedGraphSet graphSet(M, Target);
|
|
||||||
|
|
||||||
if (SchedDebugLevel >= Sched_PrintSchedGraphs) {
|
|
||||||
|
bool
|
||||||
|
InstructionSchedulingWithSSA::runOnMethod(Method *M)
|
||||||
|
{
|
||||||
|
if (SchedDebugLevel == Sched_Disable)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
SchedGraphSet graphSet(M, target);
|
||||||
|
|
||||||
|
if (SchedDebugLevel >= Sched_PrintSchedGraphs)
|
||||||
|
{
|
||||||
cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
|
cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
|
||||||
graphSet.dump();
|
graphSet.dump();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (SchedGraphSet::const_iterator GI=graphSet.begin();
|
for (SchedGraphSet::const_iterator GI=graphSet.begin(), GE=graphSet.end();
|
||||||
GI != graphSet.end(); ++GI) {
|
GI != GE; ++GI)
|
||||||
SchedGraph* graph = GI->second;
|
{
|
||||||
|
SchedGraph* graph = (*GI);
|
||||||
const vector<const BasicBlock*> &bbvec = graph->getBasicBlocks();
|
const vector<const BasicBlock*> &bbvec = graph->getBasicBlocks();
|
||||||
assert(bbvec.size() == 1 && "Cannot schedule multiple basic blocks");
|
assert(bbvec.size() == 1 && "Cannot schedule multiple basic blocks");
|
||||||
const BasicBlock* bb = bbvec[0];
|
const BasicBlock* bb = bbvec[0];
|
||||||
@ -1523,26 +1535,28 @@ namespace {
|
|||||||
cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
|
cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
|
||||||
|
|
||||||
// expensive!
|
// expensive!
|
||||||
SchedPriorities schedPrio(M, graph, getAnalysis<MethodLiveVarInfo>());
|
SchedPriorities schedPrio(M, graph,getAnalysis<MethodLiveVarInfo>());
|
||||||
SchedulingManager S(Target, graph, schedPrio);
|
SchedulingManager S(target, graph, schedPrio);
|
||||||
|
|
||||||
ChooseInstructionsForDelaySlots(S, bb, graph); // modifies graph
|
ChooseInstructionsForDelaySlots(S, bb, graph); // modifies graph
|
||||||
|
|
||||||
ForwardListSchedule(S); // computes schedule in S
|
ForwardListSchedule(S); // computes schedule in S
|
||||||
|
|
||||||
RecordSchedule(GI->first, S); // records schedule in BB
|
RecordSchedule(bb, S); // records schedule in BB
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SchedDebugLevel >= Sched_PrintMachineCode) {
|
if (SchedDebugLevel >= Sched_PrintMachineCode)
|
||||||
|
{
|
||||||
cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
|
cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
|
||||||
MachineCodeForMethod::get(M).dump();
|
MachineCodeForMethod::get(M).dump();
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
} // end anonymous namespace
|
|
||||||
|
MethodPass*
|
||||||
MethodPass *createInstructionSchedulingWithSSAPass(const TargetMachine &T) {
|
createInstructionSchedulingWithSSAPass(const TargetMachine &tgt)
|
||||||
return new InstructionSchedulingWithSSA(T);
|
{
|
||||||
|
return new InstructionSchedulingWithSSA(tgt);
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,7 @@ using std::vector;
|
|||||||
cl::Enum<enum SchedDebugLevel_t> SchedDebugLevel("dsched", cl::NoFlags,
|
cl::Enum<enum SchedDebugLevel_t> SchedDebugLevel("dsched", cl::NoFlags,
|
||||||
"enable instruction scheduling debugging information",
|
"enable instruction scheduling debugging information",
|
||||||
clEnumValN(Sched_NoDebugInfo, "n", "disable debug output"),
|
clEnumValN(Sched_NoDebugInfo, "n", "disable debug output"),
|
||||||
|
clEnumValN(Sched_Disable, "off", "disable instruction scheduling"),
|
||||||
clEnumValN(Sched_PrintMachineCode, "y", "print machine code after scheduling"),
|
clEnumValN(Sched_PrintMachineCode, "y", "print machine code after scheduling"),
|
||||||
clEnumValN(Sched_PrintSchedTrace, "t", "print trace of scheduling actions"),
|
clEnumValN(Sched_PrintSchedTrace, "t", "print trace of scheduling actions"),
|
||||||
clEnumValN(Sched_PrintSchedGraphs, "g", "print scheduling graphs"), 0);
|
clEnumValN(Sched_PrintSchedGraphs, "g", "print scheduling graphs"), 0);
|
||||||
@ -1491,30 +1492,41 @@ instrIsFeasible(const SchedulingManager& S,
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class InstructionSchedulingWithSSA : public MethodPass {
|
class InstructionSchedulingWithSSA : public MethodPass {
|
||||||
const TargetMachine &Target;
|
const TargetMachine ⌖
|
||||||
public:
|
public:
|
||||||
inline InstructionSchedulingWithSSA(const TargetMachine &T) : Target(T) {}
|
inline InstructionSchedulingWithSSA(const TargetMachine &T) : target(T) {}
|
||||||
|
|
||||||
// getAnalysisUsageInfo - We use LiveVarInfo...
|
// getAnalysisUsageInfo - We use LiveVarInfo...
|
||||||
virtual void getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
|
virtual void getAnalysisUsageInfo(Pass::AnalysisSet &Requires,
|
||||||
Pass::AnalysisSet &Destroyed,
|
Pass::AnalysisSet &Destroyed,
|
||||||
Pass::AnalysisSet &Provided) {
|
Pass::AnalysisSet &Provided) {
|
||||||
Requires.push_back(MethodLiveVarInfo::ID);
|
Requires.push_back(MethodLiveVarInfo::ID);
|
||||||
|
Destroyed.push_back(MethodLiveVarInfo::ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool runOnMethod(Method *M) {
|
bool runOnMethod(Method *M);
|
||||||
cerr << "Instr scheduling failed for method " << ((Value*)M)->getName()
|
};
|
||||||
<< "\n\n";
|
} // end anonymous namespace
|
||||||
SchedGraphSet graphSet(M, Target);
|
|
||||||
|
|
||||||
if (SchedDebugLevel >= Sched_PrintSchedGraphs) {
|
|
||||||
|
bool
|
||||||
|
InstructionSchedulingWithSSA::runOnMethod(Method *M)
|
||||||
|
{
|
||||||
|
if (SchedDebugLevel == Sched_Disable)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
SchedGraphSet graphSet(M, target);
|
||||||
|
|
||||||
|
if (SchedDebugLevel >= Sched_PrintSchedGraphs)
|
||||||
|
{
|
||||||
cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
|
cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
|
||||||
graphSet.dump();
|
graphSet.dump();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (SchedGraphSet::const_iterator GI=graphSet.begin();
|
for (SchedGraphSet::const_iterator GI=graphSet.begin(), GE=graphSet.end();
|
||||||
GI != graphSet.end(); ++GI) {
|
GI != GE; ++GI)
|
||||||
SchedGraph* graph = GI->second;
|
{
|
||||||
|
SchedGraph* graph = (*GI);
|
||||||
const vector<const BasicBlock*> &bbvec = graph->getBasicBlocks();
|
const vector<const BasicBlock*> &bbvec = graph->getBasicBlocks();
|
||||||
assert(bbvec.size() == 1 && "Cannot schedule multiple basic blocks");
|
assert(bbvec.size() == 1 && "Cannot schedule multiple basic blocks");
|
||||||
const BasicBlock* bb = bbvec[0];
|
const BasicBlock* bb = bbvec[0];
|
||||||
@ -1523,26 +1535,28 @@ namespace {
|
|||||||
cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
|
cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
|
||||||
|
|
||||||
// expensive!
|
// expensive!
|
||||||
SchedPriorities schedPrio(M, graph, getAnalysis<MethodLiveVarInfo>());
|
SchedPriorities schedPrio(M, graph,getAnalysis<MethodLiveVarInfo>());
|
||||||
SchedulingManager S(Target, graph, schedPrio);
|
SchedulingManager S(target, graph, schedPrio);
|
||||||
|
|
||||||
ChooseInstructionsForDelaySlots(S, bb, graph); // modifies graph
|
ChooseInstructionsForDelaySlots(S, bb, graph); // modifies graph
|
||||||
|
|
||||||
ForwardListSchedule(S); // computes schedule in S
|
ForwardListSchedule(S); // computes schedule in S
|
||||||
|
|
||||||
RecordSchedule(GI->first, S); // records schedule in BB
|
RecordSchedule(bb, S); // records schedule in BB
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SchedDebugLevel >= Sched_PrintMachineCode) {
|
if (SchedDebugLevel >= Sched_PrintMachineCode)
|
||||||
|
{
|
||||||
cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
|
cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
|
||||||
MachineCodeForMethod::get(M).dump();
|
MachineCodeForMethod::get(M).dump();
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
} // end anonymous namespace
|
|
||||||
|
MethodPass*
|
||||||
MethodPass *createInstructionSchedulingWithSSAPass(const TargetMachine &T) {
|
createInstructionSchedulingWithSSAPass(const TargetMachine &tgt)
|
||||||
return new InstructionSchedulingWithSSA(T);
|
{
|
||||||
|
return new InstructionSchedulingWithSSA(tgt);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user