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

[Hexagon] Use MachineInstrBuilder instead of changing instruction in place 

llvm-svn: 305953
This commit is contained in:
Krzysztof Parzyszek 2017-06-21 21:03:34 +00:00
parent 9fa8af6f82
commit 5b933fee3c
1 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
llvm/lib/Target/Hexagon/HexagonPeephole.cpp
View File

@ -100,9 +100,6 @@ namespace {
void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
MachineFunctionPass::getAnalysisUsage(AU); MachineFunctionPass::getAnalysisUsage(AU);
} }
private:
void ChangeOpInto(MachineOperand &Dst, MachineOperand &Src);
}; };
} }
@ -132,7 +129,9 @@ bool HexagonPeephole::runOnMachineFunction(MachineFunction &MF) {
PeepholeDoubleRegsMap.clear(); PeepholeDoubleRegsMap.clear();
// Traverse the basic block. // Traverse the basic block.
for (MachineInstr &MI : *MBB) { for (auto I = MBB->begin(), E = MBB->end(), NextI = I; I != E; I = NextI) {
NextI = std::next(I);
MachineInstr &MI = *I;
// Look for sign extends: // Look for sign extends:
// %vreg170<def> = SXTW %vreg166 // %vreg170<def> = SXTW %vreg166
if (!DisableOptSZExt && MI.getOpcode() == Hexagon::A2_sxtw) { if (!DisableOptSZExt && MI.getOpcode() == Hexagon::A2_sxtw) {
@ -280,14 +279,13 @@ bool HexagonPeephole::runOnMachineFunction(MachineFunction &MF) {
if (NewOp) { if (NewOp) {
unsigned PSrc = MI.getOperand(PR).getReg(); unsigned PSrc = MI.getOperand(PR).getReg();
if (unsigned POrig = PeepholeMap.lookup(PSrc)) { if (unsigned POrig = PeepholeMap.lookup(PSrc)) {
MI.getOperand(PR).setReg(POrig); BuildMI(*MBB, MI.getIterator(), MI.getDebugLoc(),
QII->get(NewOp), MI.getOperand(0).getReg())
.addReg(POrig)
.add(MI.getOperand(S2))
.add(MI.getOperand(S1));
MRI->clearKillFlags(POrig); MRI->clearKillFlags(POrig);
MI.setDesc(QII->get(NewOp)); MI.eraseFromParent();
// Swap operands S1 and S2.
MachineOperand Op1 = MI.getOperand(S1);
MachineOperand Op2 = MI.getOperand(S2);
ChangeOpInto(MI.getOperand(S1), Op2);
ChangeOpInto(MI.getOperand(S2), Op1);
} }
} // if (NewOp) } // if (NewOp)
} // if (!Done) } // if (!Done)
@ -299,40 +297,6 @@ bool HexagonPeephole::runOnMachineFunction(MachineFunction &MF) {
return true; return true;
} }
void HexagonPeephole::ChangeOpInto(MachineOperand &Dst, MachineOperand &Src) {
assert (&Dst != &Src && "Cannot duplicate into itself");
switch (Dst.getType()) {
case MachineOperand::MO_Register:
if (Src.isReg()) {
Dst.setReg(Src.getReg());
Dst.setSubReg(Src.getSubReg());
MRI->clearKillFlags(Src.getReg());
} else if (Src.isImm()) {
Dst.ChangeToImmediate(Src.getImm());
} else {
llvm_unreachable("Unexpected src operand type");
}
break;
case MachineOperand::MO_Immediate:
if (Src.isImm()) {
Dst.setImm(Src.getImm());
} else if (Src.isReg()) {
Dst.ChangeToRegister(Src.getReg(), Src.isDef(), Src.isImplicit(),
false, Src.isDead(), Src.isUndef(),
Src.isDebug());
Dst.setSubReg(Src.getSubReg());
} else {
llvm_unreachable("Unexpected src operand type");
}
break;
default:
llvm_unreachable("Unexpected dst operand type");
break;
}
}
FunctionPass *llvm::createHexagonPeephole() { FunctionPass *llvm::createHexagonPeephole() {
return new HexagonPeephole(); return new HexagonPeephole();
} }