maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Get the MispredictPenalty from MCSchedModel. 

Thanks, Andy!

llvm-svn: 161507
This commit is contained in:
Jakob Stoklund Olesen 2012-08-08 18:19:58 +00:00
parent 661d7ff913
commit e71b6c6b20
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/CodeGen/EarlyIfConversion.cpp
View File

@ -31,6 +31,7 @@
#include "llvm/CodeGen/MachineLoopInfo.h" #include "llvm/CodeGen/MachineLoopInfo.h"
#include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/Passes.h"
#include "llvm/MC/MCInstrItineraries.h"
#include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
@ -513,6 +514,7 @@ namespace {
class EarlyIfConverter : public MachineFunctionPass { class EarlyIfConverter : public MachineFunctionPass {
const TargetInstrInfo *TII; const TargetInstrInfo *TII;
const TargetRegisterInfo *TRI; const TargetRegisterInfo *TRI;
const MCSchedModel *SchedModel;
MachineRegisterInfo *MRI; MachineRegisterInfo *MRI;
MachineDominatorTree *DomTree; MachineDominatorTree *DomTree;
MachineLoopInfo *Loops; MachineLoopInfo *Loops;
@ -602,9 +604,6 @@ bool EarlyIfConverter::shouldConvertIf() {
if (!MinInstr) if (!MinInstr)
MinInstr = Traces->getEnsemble(MachineTraceMetrics::TS_MinInstrCount); MinInstr = Traces->getEnsemble(MachineTraceMetrics::TS_MinInstrCount);
// MCSchedModel doesn't yet provide a misprediction penalty.
unsigned MispredictPenalty = 10;
// Compare the critical path through TBB and FBB. If the difference is // Compare the critical path through TBB and FBB. If the difference is
// greater than the branch misprediction penalty, it would never pay to // greater than the branch misprediction penalty, it would never pay to
// if-convert. The triangle/diamond topology guarantees that these traces // if-convert. The triangle/diamond topology guarantees that these traces
@ -615,8 +614,9 @@ bool EarlyIfConverter::shouldConvertIf() {
unsigned TBBCrit = TBBTrace.getCriticalPath(); unsigned TBBCrit = TBBTrace.getCriticalPath();
unsigned FBBCrit = FBBTrace.getCriticalPath(); unsigned FBBCrit = FBBTrace.getCriticalPath();
unsigned ExtraCrit = TBBCrit > FBBCrit ? TBBCrit-FBBCrit : FBBCrit-TBBCrit; unsigned ExtraCrit = TBBCrit > FBBCrit ? TBBCrit-FBBCrit : FBBCrit-TBBCrit;
if (ExtraCrit >= MispredictPenalty) { if (ExtraCrit >= SchedModel->MispredictPenalty) {
DEBUG(dbgs() << "Critical path difference too large.\n"); DEBUG(dbgs() << "Critical path difference larger than "
<< SchedModel->MispredictPenalty << ".\n");
return false; return false;
} }
return true; return true;
@ -644,6 +644,7 @@ bool EarlyIfConverter::runOnMachineFunction(MachineFunction &MF) {
<< ((Value*)MF.getFunction())->getName() << '\n'); << ((Value*)MF.getFunction())->getName() << '\n');
TII = MF.getTarget().getInstrInfo(); TII = MF.getTarget().getInstrInfo();
TRI = MF.getTarget().getRegisterInfo(); TRI = MF.getTarget().getRegisterInfo();
SchedModel = MF.getTarget().getInstrItineraryData()->SchedModel;
MRI = &MF.getRegInfo(); MRI = &MF.getRegInfo();
DomTree = &getAnalysis<MachineDominatorTree>(); DomTree = &getAnalysis<MachineDominatorTree>();
Loops = getAnalysisIfAvailable<MachineLoopInfo>(); Loops = getAnalysisIfAvailable<MachineLoopInfo>();