diff options
| author | Tom Stellard <[email protected]> | 2012-07-27 19:18:04 +0000 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2012-07-30 20:31:57 +0000 |
| commit | ac669c32c6e80841e3ee63d65b58c0031b22e7b8 (patch) | |
| tree | d330cb840e7398030ab97231f3deed34a88f8508 /src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp | |
| parent | 3a0187b1b53eca3143286a5ae7917cd71117b902 (diff) | |
radeon/llvm: Merge AMDILInstrInfo.cpp into AMDGPUInstrInfo.cpp
Diffstat (limited to 'src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp')
| -rw-r--r-- | src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp b/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp index 79063635c16..fe94328d452 100644 --- a/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp +++ b/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp @@ -10,8 +10,8 @@ #define DEBUGME 0 #define DEBUG_TYPE "structcfg" +#include "AMDGPUInstrInfo.h" #include "AMDIL.h" -#include "AMDILInstrInfo.h" #include "AMDILUtilityFunctions.h" #include "llvm/ADT/SCCIterator.h" #include "llvm/ADT/SmallVector.h" @@ -1871,8 +1871,8 @@ typename CFGStructurizer<PassT>::BlockT * CFGStructurizer<PassT>::addLoopEndbranchBlock(LoopT *loopRep, BlockTSmallerVector &exitingBlks, BlockTSmallerVector &exitBlks) { - const AMDILInstrInfo *tii = - static_cast<const AMDILInstrInfo *>(passRep->getTargetInstrInfo()); + const AMDGPUInstrInfo *tii = + static_cast<const AMDGPUInstrInfo *>(passRep->getTargetInstrInfo()); const TargetRegisterClass * I32RC = TRI->getCFGStructurizerRegClass(MVT::i32); RegiT endBranchReg = static_cast<int> @@ -2892,7 +2892,7 @@ struct CFGStructTraits<AMDILCFGStructurizer> // instruction. Such move instruction "belong to" the loop backward-edge. // static MachineInstr *getLoopendBlockBranchInstr(MachineBasicBlock *blk) { - const AMDILInstrInfo * TII = static_cast<const AMDILInstrInfo *>( + const AMDGPUInstrInfo * TII = static_cast<const AMDGPUInstrInfo *>( blk->getParent()->getTarget().getInstrInfo()); for (MachineBasicBlock::reverse_iterator iter = blk->rbegin(), @@ -3083,8 +3083,8 @@ struct CFGStructTraits<AMDILCFGStructurizer> AMDILCFGStructurizer *passRep, RegiT regNum, int regVal) { MachineInstr *oldInstr = &(*instrPos); - const AMDILInstrInfo *tii = - static_cast<const AMDILInstrInfo *>(passRep->getTargetInstrInfo()); + const AMDGPUInstrInfo *tii = + static_cast<const AMDGPUInstrInfo *>(passRep->getTargetInstrInfo()); MachineBasicBlock *blk = oldInstr->getParent(); MachineInstr *newInstr = tii->getMovImmInstr(blk->getParent(), regNum, regVal); @@ -3096,8 +3096,8 @@ struct CFGStructTraits<AMDILCFGStructurizer> static void insertAssignInstrBefore(MachineBasicBlock *blk, AMDILCFGStructurizer *passRep, RegiT regNum, int regVal) { - const AMDILInstrInfo *tii = - static_cast<const AMDILInstrInfo *>(passRep->getTargetInstrInfo()); + const AMDGPUInstrInfo *tii = + static_cast<const AMDGPUInstrInfo *>(passRep->getTargetInstrInfo()); MachineInstr *newInstr = tii->getMovImmInstr(blk->getParent(), regNum, regVal); @@ -3116,8 +3116,8 @@ struct CFGStructTraits<AMDILCFGStructurizer> AMDILCFGStructurizer *passRep, RegiT dstReg, RegiT src1Reg, RegiT src2Reg) { - const AMDILInstrInfo *tii = - static_cast<const AMDILInstrInfo *>(passRep->getTargetInstrInfo()); + const AMDGPUInstrInfo *tii = + static_cast<const AMDGPUInstrInfo *>(passRep->getTargetInstrInfo()); MachineInstr *newInstr = blk->getParent()->CreateMachineInstr(tii->get(tii->getIEQOpcode()), DebugLoc()); |