diff options
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/InstrSched/SchedGraph.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 03771fe01d..e3b3cba524 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -21,6 +21,7 @@ #include "llvm/Target/TargetMachine.h" #include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" +#include "../../Target/SparcV9/SparcV9InstrInfo.h" #include "Support/STLExtras.h" #include <iostream> @@ -561,7 +562,7 @@ void SchedGraph::buildNodesForBB(const TargetMachine& target, unsigned i = 0; for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end(); I != E; ++I, ++i) - if (!mii.isDummyPhiInstr(I->getOpcode())) { + if (I->getOpcode() != V9::PHI) { SchedGraphNode* node = new SchedGraphNode(getNumNodes(), &MBB, i, target); noteGraphNodeForInstr(I, node); diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp index 8e11dd1da5..dadc38570c 100644 --- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp @@ -1444,8 +1444,7 @@ void ModuloSchedulingPass::removePHIs(const MachineBasicBlock *origBB, std::vect //Start with the kernel and for each phi insert a copy for the phi def and for each arg for(MachineBasicBlock::iterator I = kernelBB->begin(), E = kernelBB->end(); I != E; ++I) { //Get op code and check if its a phi - MachineOpCode OC = I->getOpcode(); - if(TMI->isDummyPhiInstr(OC)) { + if(I->getOpcode() == V9::PHI) { Instruction *tmp = 0; for(unsigned i = 0; i < I->getNumOperands(); ++i) { //Get Operand @@ -1491,8 +1490,7 @@ void ModuloSchedulingPass::removePHIs(const MachineBasicBlock *origBB, std::vect for(std::vector<MachineBasicBlock*>::iterator MB = epilogues.begin(), ME = epilogues.end(); MB != ME; ++MB) { for(MachineBasicBlock::iterator I = (*MB)->begin(), E = (*MB)->end(); I != E; ++I) { //Get op code and check if its a phi - MachineOpCode OC = I->getOpcode(); - if(TMI->isDummyPhiInstr(OC)) { + if(I->getOpcode() == V9::PHI) { Instruction *tmp = 0; for(unsigned i = 0; i < I->getNumOperands(); ++i) { //Get Operand |