From 418379e229dc491050f7f6292aa8364c29b71301 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Wed, 18 Aug 2004 20:04:24 +0000 Subject: [PATCH] Instead of using isDummyPhiInstr, we just compare the opcode with V9::PHI. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15906 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSched/SchedGraph.cpp | 3 ++- lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp | 6 ++---- lib/Target/SparcV9/InstrSched/SchedGraph.cpp | 3 ++- lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp | 6 ++---- lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp | 4 ++-- lib/Target/SparcV9/SparcV9AsmPrinter.cpp | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 03771fe01d1..e3b3cba5249 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 @@ -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 8e11dd1da5c..dadc38570c6 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::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 diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 03771fe01d1..e3b3cba5249 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/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 @@ -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/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp index 8e11dd1da5c..dadc38570c6 100644 --- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/Target/SparcV9/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::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 diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp index 2fd8e558fdc..02f18fc7389 100644 --- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp +++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp @@ -484,7 +484,7 @@ void PhyRegAlloc::updateMachineCode() // their assigned registers or insert spill code, as appropriate. // Also, fix operands of call/return instructions. for (MachineBasicBlock::iterator MII = MBB.begin(); MII != MBB.end(); ++MII) - if (! TM.getInstrInfo()->isDummyPhiInstr(MII->getOpcode())) + if (MII->getOpcode() != V9::PHI) updateInstruction(MII, MBB); // Now, move code out of delay slots of branches and returns if needed. @@ -552,7 +552,7 @@ void PhyRegAlloc::updateMachineCode() MachineInstr *MInst = MII; // do not process Phis - if (TM.getInstrInfo()->isDummyPhiInstr(MInst->getOpcode())) + if (MInst->getOpcode() == V9::PHI) continue; // if there are any added instructions... diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp index 58f589d485d..36deae09d82 100644 --- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp @@ -283,8 +283,8 @@ SparcV9AsmPrinter::printOneOperand(const MachineOperand &mop, void SparcV9AsmPrinter::emitMachineInst(const MachineInstr *MI) { unsigned Opcode = MI->getOpcode(); - if (TM.getInstrInfo()->isDummyPhiInstr(Opcode)) - return; // IGNORE PHI NODES + if (Opcode == V9::PHI) + return; // Ignore Machine-PHI nodes. O << "\t" << TM.getInstrInfo()->getName(Opcode) << "\t"; -- 2.34.1