Revert 354564: [ARM] Add some missing thumb1 opcodes to enable peephole optimisation of CMPs
I believe it's causing bootstrap failures for A32 code. I'll take a look at
what's wrong.
llvm-svn: 354569
diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
index f2d81aa..a23ae20 100644
--- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -2542,7 +2542,6 @@
return true;
case ARM::CMPrr:
case ARM::t2CMPrr:
- case ARM::tCMPr:
SrcReg = MI.getOperand(0).getReg();
SrcReg2 = MI.getOperand(1).getReg();
CmpMask = ~0;
@@ -2619,61 +2618,28 @@
/// This function can be extended later on.
inline static bool isRedundantFlagInstr(const MachineInstr *CmpI,
unsigned SrcReg, unsigned SrcReg2,
- int ImmValue, const MachineInstr *OI,
- bool &IsThumb1) {
+ int ImmValue, const MachineInstr *OI) {
if ((CmpI->getOpcode() == ARM::CMPrr || CmpI->getOpcode() == ARM::t2CMPrr) &&
(OI->getOpcode() == ARM::SUBrr || OI->getOpcode() == ARM::t2SUBrr) &&
((OI->getOperand(1).getReg() == SrcReg &&
OI->getOperand(2).getReg() == SrcReg2) ||
(OI->getOperand(1).getReg() == SrcReg2 &&
- OI->getOperand(2).getReg() == SrcReg))) {
- IsThumb1 = false;
+ OI->getOperand(2).getReg() == SrcReg)))
return true;
- }
-
- if (CmpI->getOpcode() == ARM::tCMPr && OI->getOpcode() == ARM::tSUBrr &&
- ((OI->getOperand(2).getReg() == SrcReg &&
- OI->getOperand(3).getReg() == SrcReg2) ||
- (OI->getOperand(2).getReg() == SrcReg2 &&
- OI->getOperand(3).getReg() == SrcReg))) {
- IsThumb1 = true;
- return true;
- }
if ((CmpI->getOpcode() == ARM::CMPri || CmpI->getOpcode() == ARM::t2CMPri) &&
(OI->getOpcode() == ARM::SUBri || OI->getOpcode() == ARM::t2SUBri) &&
OI->getOperand(1).getReg() == SrcReg &&
- OI->getOperand(2).getImm() == ImmValue) {
- IsThumb1 = false;
+ OI->getOperand(2).getImm() == ImmValue)
return true;
- }
-
- if (CmpI->getOpcode() == ARM::tCMPi8 &&
- (OI->getOpcode() == ARM::tSUBi8 || OI->getOpcode() == ARM::tSUBi3) &&
- OI->getOperand(2).getReg() == SrcReg &&
- OI->getOperand(3).getImm() == ImmValue) {
- IsThumb1 = true;
- return true;
- }
if ((CmpI->getOpcode() == ARM::CMPrr || CmpI->getOpcode() == ARM::t2CMPrr) &&
(OI->getOpcode() == ARM::ADDrr || OI->getOpcode() == ARM::t2ADDrr ||
OI->getOpcode() == ARM::ADDri || OI->getOpcode() == ARM::t2ADDri) &&
+ OI->getOperand(0).isReg() && OI->getOperand(1).isReg() &&
OI->getOperand(0).getReg() == SrcReg &&
- OI->getOperand(1).getReg() == SrcReg2) {
- IsThumb1 = false;
+ OI->getOperand(1).getReg() == SrcReg2)
return true;
- }
-
- if (CmpI->getOpcode() == ARM::tCMPr &&
- (OI->getOpcode() == ARM::tADDi3 || OI->getOpcode() == ARM::tADDi8 ||
- OI->getOpcode() == ARM::tADDrr) &&
- OI->getOperand(0).getReg() == SrcReg &&
- OI->getOperand(2).getReg() == SrcReg2) {
- IsThumb1 = true;
- return true;
- }
-
return false;
}
@@ -2790,8 +2756,7 @@
// For CMPri w/ CmpValue != 0, a SubAdd may still be a candidate.
// Thus we cannot return here.
if (CmpInstr.getOpcode() == ARM::CMPri ||
- CmpInstr.getOpcode() == ARM::t2CMPri ||
- CmpInstr.getOpcode() == ARM::tCMPi8)
+ CmpInstr.getOpcode() == ARM::t2CMPri)
MI = nullptr;
else
return false;
@@ -2835,13 +2800,11 @@
// Check that CPSR isn't set between the comparison instruction and the one we
// want to change. At the same time, search for SubAdd.
const TargetRegisterInfo *TRI = &getRegisterInfo();
- bool SubAddIsThumb1 = false;
do {
const MachineInstr &Instr = *--I;
// Check whether CmpInstr can be made redundant by the current instruction.
- if (isRedundantFlagInstr(&CmpInstr, SrcReg, SrcReg2, CmpValue, &Instr,
- SubAddIsThumb1)) {
+ if (isRedundantFlagInstr(&CmpInstr, SrcReg, SrcReg2, CmpValue, &Instr)) {
SubAdd = &*I;
break;
}
@@ -2865,7 +2828,7 @@
// If we found a SubAdd, use it as it will be closer to the CMP
if (SubAdd) {
MI = SubAdd;
- IsThumb1 = SubAddIsThumb1;
+ IsThumb1 = false;
}
// We can't use a predicated instruction - it doesn't always write the flags.
@@ -2934,13 +2897,9 @@
// operands will be modified.
unsigned Opc = SubAdd->getOpcode();
bool IsSub = Opc == ARM::SUBrr || Opc == ARM::t2SUBrr ||
- Opc == ARM::SUBri || Opc == ARM::t2SUBri ||
- Opc == ARM::tSUBrr || Opc == ARM::tSUBi3 ||
- Opc == ARM::tSUBi8;
- unsigned OpI = Opc != ARM::tSUBrr ? 1 : 2;
- if (!IsSub ||
- (SrcReg2 != 0 && SubAdd->getOperand(OpI).getReg() == SrcReg2 &&
- SubAdd->getOperand(OpI + 1).getReg() == SrcReg)) {
+ Opc == ARM::SUBri || Opc == ARM::t2SUBri;
+ if (!IsSub || (SrcReg2 != 0 && SubAdd->getOperand(1).getReg() == SrcReg2 &&
+ SubAdd->getOperand(2).getReg() == SrcReg)) {
// VSel doesn't support condition code update.
if (IsInstrVSel)
return false;
@@ -3018,10 +2977,9 @@
++Next;
unsigned SrcReg, SrcReg2;
int CmpMask, CmpValue;
- bool IsThumb1;
if (Next != MI.getParent()->end() &&
analyzeCompare(*Next, SrcReg, SrcReg2, CmpMask, CmpValue) &&
- isRedundantFlagInstr(&*Next, SrcReg, SrcReg2, CmpValue, &MI, IsThumb1))
+ isRedundantFlagInstr(&*Next, SrcReg, SrcReg2, CmpValue, &MI))
return false;
return true;
}