RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Perform kill flag calculations in new method. No functional changes.

Browse Source 
llvm-svn: 92052
This commit is contained in:
Jakob Stoklund Olesen 2009-12-23 21:28:31 +00:00
parent 423f1e70e6
commit 55c03c7cef
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Target/ARM/ARMLoadStoreOptimizer.cpp
View File

@ -97,7 +97,6 @@ namespace {
unsigned PredReg, unsigned PredReg,
unsigned Scratch, unsigned Scratch,
DebugLoc dl, DebugLoc dl,
SmallVector<std::pair<unsigned, bool>, 8> &Regs,
MemOpQueue &MemOps, MemOpQueue &MemOps,
unsigned memOpsFrom, unsigned memOpsFrom,
unsigned memOpsTo, unsigned memOpsTo,
@ -276,18 +275,27 @@ MergeOpsUpdate(MachineBasicBlock &MBB,
unsigned PredReg, unsigned PredReg,
unsigned Scratch, unsigned Scratch,
DebugLoc dl, DebugLoc dl,
SmallVector<std::pair<unsigned, bool>, 8> &Regs,
MemOpQueue &MemOps, MemOpQueue &MemOps,
unsigned memOpsFrom, unsigned memOpsFrom,
unsigned memOpsTo, unsigned memOpsTo,
SmallVector<MachineBasicBlock::iterator, 4> &Merges) { SmallVector<MachineBasicBlock::iterator, 4> &Merges) {
// First calculate which of the registers should be killed by the merged
// instruction.
SmallVector<std::pair<unsigned, bool>, 8> Regs;
for (unsigned i = memOpsFrom; i < memOpsTo; ++i) {
const MachineOperand &MO = MemOps[i].MBBI->getOperand(0);
Regs.push_back(std::make_pair(MO.getReg(), MO.isKill()));
}
if (!MergeOps(MBB, MBBI, Offset, Base, BaseKill, Opcode, if (!MergeOps(MBB, MBBI, Offset, Base, BaseKill, Opcode,
Pred, PredReg, Scratch, dl, Regs)) Pred, PredReg, Scratch, dl, Regs))
return; return;
// Merge succeeded, update records.
Merges.push_back(prior(MBBI)); Merges.push_back(prior(MBBI));
for (unsigned j = memOpsFrom; j < memOpsTo; ++j) { for (unsigned i = memOpsFrom; i < memOpsTo; ++i) {
MBB.erase(MemOps[j].MBBI); MBB.erase(MemOps[i].MBBI);
MemOps[j].Merged = true; MemOps[i].Merged = true;
} }
} }
@ -307,26 +315,21 @@ ARMLoadStoreOpt::MergeLDR_STR(MachineBasicBlock &MBB, unsigned SIndex,
DebugLoc dl = Loc->getDebugLoc(); DebugLoc dl = Loc->getDebugLoc();
unsigned PReg = Loc->getOperand(0).getReg(); unsigned PReg = Loc->getOperand(0).getReg();
unsigned PRegNum = ARMRegisterInfo::getRegisterNumbering(PReg); unsigned PRegNum = ARMRegisterInfo::getRegisterNumbering(PReg);
bool isKill = Loc->getOperand(0).isKill();
SmallVector<std::pair<unsigned,bool>, 8> Regs;
Regs.push_back(std::make_pair(PReg, isKill));
for (unsigned i = SIndex+1, e = MemOps.size(); i != e; ++i) { for (unsigned i = SIndex+1, e = MemOps.size(); i != e; ++i) {
int NewOffset = MemOps[i].Offset; int NewOffset = MemOps[i].Offset;
unsigned Reg = MemOps[i].MBBI->getOperand(0).getReg(); unsigned Reg = MemOps[i].MBBI->getOperand(0).getReg();
unsigned RegNum = ARMRegisterInfo::getRegisterNumbering(Reg); unsigned RegNum = ARMRegisterInfo::getRegisterNumbering(Reg);
isKill = MemOps[i].MBBI->getOperand(0).isKill();
// AM4 - register numbers in ascending order. // AM4 - register numbers in ascending order.
// AM5 - consecutive register numbers in ascending order. // AM5 - consecutive register numbers in ascending order.
if (NewOffset == Offset + (int)Size && if (NewOffset == Offset + (int)Size &&
((isAM4 && RegNum > PRegNum) || RegNum == PRegNum+1)) { ((isAM4 && RegNum > PRegNum) || RegNum == PRegNum+1)) {
Offset += Size; Offset += Size;
Regs.push_back(std::make_pair(Reg, isKill));
PRegNum = RegNum; PRegNum = RegNum;
} else { } else {
// Can't merge this in. Try merge the earlier ones first. // Can't merge this in. Try merge the earlier ones first.
MergeOpsUpdate(MBB, ++Loc, SOffset, Base, false, Opcode, Pred, PredReg, MergeOpsUpdate(MBB, ++Loc, SOffset, Base, false, Opcode, Pred, PredReg,
Scratch, dl, Regs, MemOps, SIndex, i, Merges); Scratch, dl, MemOps, SIndex, i, Merges);
MergeLDR_STR(MBB, i, Base, Opcode, Size, Pred, PredReg, Scratch, MergeLDR_STR(MBB, i, Base, Opcode, Size, Pred, PredReg, Scratch,
MemOps, Merges); MemOps, Merges);
return; return;
@ -340,7 +343,7 @@ ARMLoadStoreOpt::MergeLDR_STR(MachineBasicBlock &MBB, unsigned SIndex,
bool BaseKill = Loc->findRegisterUseOperandIdx(Base, true) != -1; bool BaseKill = Loc->findRegisterUseOperandIdx(Base, true) != -1;
MergeOpsUpdate(MBB, ++Loc, SOffset, Base, BaseKill, Opcode, Pred, PredReg, MergeOpsUpdate(MBB, ++Loc, SOffset, Base, BaseKill, Opcode, Pred, PredReg,
Scratch, dl, Regs, MemOps, SIndex, MemOps.size(), Merges); Scratch, dl, MemOps, SIndex, MemOps.size(), Merges);
return; return;
} }