diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp
index f2d81aa6677..a23ae20858e 100644
--- a/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -2542,7 +2542,6 @@ bool ARMBaseInstrInfo::analyzeCompare(const MachineInstr &MI, unsigned &SrcReg,
     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 @@ inline static ARMCC::CondCodes getCmpToAddCondition(ARMCC::CondCodes CC) {
 /// 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 @@ bool ARMBaseInstrInfo::optimizeCompareInstr(
     // 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 @@ bool ARMBaseInstrInfo::optimizeCompareInstr(
   // 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 @@ bool ARMBaseInstrInfo::optimizeCompareInstr(
   // 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 @@ bool ARMBaseInstrInfo::optimizeCompareInstr(
         // 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 @@ bool ARMBaseInstrInfo::shouldSink(const MachineInstr &MI) const {
   ++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;
 }
diff --git a/test/CodeGen/ARM/intrinsics-overflow.ll b/test/CodeGen/ARM/intrinsics-overflow.ll
index c3f64072d7d..d4c20dfacce 100644
--- a/test/CodeGen/ARM/intrinsics-overflow.ll
+++ b/test/CodeGen/ARM/intrinsics-overflow.ll
@@ -38,7 +38,8 @@ define i32 @sadd_overflow(i32 %a, i32 %b) #0 {
   ; ARM: movvc r[[R0]], #0
   ; ARM: mov pc, lr
 
-  ; THUMBV6: adds    r0, r0, r1
+  ; THUMBV6: adds    r1, r0, r1
+  ; THUMBV6: cmp     r1, r0
   ; THUMBV6: bvc     .LBB1_2
 
   ; THUMBV7: adds  r[[R2:[0-9]+]], r[[R0]], r[[R1:[0-9]+]]
diff --git a/test/CodeGen/Thumb/peephole-cmp.mir b/test/CodeGen/Thumb/peephole-cmp.mir
deleted file mode 100644
index 33b1581cdce..00000000000
--- a/test/CodeGen/Thumb/peephole-cmp.mir
+++ /dev/null
@@ -1,226 +0,0 @@
-# RUN: llc -mtriple thumbv8m.base-none-eabi -run-pass=peephole-opt -verify-machineinstrs -o - %s | FileCheck %s
---- |
-  target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
-  target triple = "thumbv8m.base-none-none-eabi"
-
-  define i32 @test_subrr(i32 %a, i32 %b) { ret i32 %a }
-  define i32 @test_subrr_c(i32 %a, i32 %b) { ret i32 %a }
-  define i32 @test_subri3(i32 %a) { ret i32 %a }
-  define i32 @test_subri8(i32 %a) { ret i32 %a }
-  define i32 @test_addrr(i32 %a) { ret i32 %a }
-  define i32 @test_addri3(i32 %a) { ret i32 %a }
-  define i32 @test_addri8(i32 %a) { ret i32 %a }
-
-...
----
-name:            test_subrr
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-  - { reg: '$r1', virtual-reg: '%2' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0, $r1
-
-    %2:tgpr = COPY $r1
-    %1:tgpr = COPY $r0
-    %0:tgpr, $cpsr = tSUBrr %2, %1, 14, $noreg
-    tCMPr %1, %2, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %3:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %3
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_subrr
-# CHECK:      [[COPY1:%[0-9]+]]:tgpr = COPY $r1
-# CHECK-NEXT: [[COPY0:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tSUBrr [[COPY1]], [[COPY0]], 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 8, $cpsr
-...
----
-name:            test_subrr_c
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-  - { reg: '$r1', virtual-reg: '%2' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0, $r1
-
-    %2:tgpr = COPY $r1
-    %1:tgpr = COPY $r0
-    %0:tgpr, $cpsr = tSUBrr %1, %2, 14, $noreg
-    tCMPr %1, %2, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %3:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %3
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_subrr_c
-# CHECK:      [[COPY1:%[0-9]+]]:tgpr = COPY $r1
-# CHECK-NEXT: [[COPY0:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tSUBrr [[COPY0]], [[COPY1]], 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 3, $cpsr
-...
----
-name:            test_subri3
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0
-
-    %1:tgpr = COPY $r0
-    %0:tgpr, $cpsr = tSUBi3 %1, 1, 14, $noreg
-    tCMPi8 %1, 1, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %2:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %2
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_subri3
-# CHECK:      [[COPY:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tSUBi3 [[COPY]], 1, 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 3, $cpsr
-...
----
-name:            test_subri8
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0
-
-    %1:tgpr = COPY $r0
-    %0:tgpr, $cpsr = tSUBi8 %1, 1, 14, $noreg
-    tCMPi8 %1, 1, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %2:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %2
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_subri8
-# CHECK:      [[COPY:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tSUBi8 [[COPY]], 1, 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 3, $cpsr
-...
----
-name:            test_addrr
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-  - { reg: '$r1', virtual-reg: '%2' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0, $r1
-
-    %2:tgpr = COPY $r1
-    %1:tgpr = COPY $r0
-    %0:tgpr, $cpsr = tADDrr %2, %1, 14, $noreg
-    tCMPr %0, %2, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %3:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %3
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_addrr
-# CHECK:      [[COPY1:%[0-9]+]]:tgpr = COPY $r1
-# CHECK-NEXT: [[COPY0:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tADDrr [[COPY1]], [[COPY0]], 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 2, $cpsr
-...
----
-name:            test_addri3
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0
-
-    %0:tgpr = COPY $r0
-    %1:tgpr, $cpsr = tADDi3 %0, 1, 14, $noreg
-    tCMPr %1, %0, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %2:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %2
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_addri3
-# CHECK:      [[COPY:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tADDi3 [[COPY]], 1, 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 2, $cpsr
-...
----
-name:            test_addri8
-liveins:
-  - { reg: '$r0', virtual-reg: '%1' }
-body:             |
-  bb.0:
-    successors: %bb.2(0x40000000), %bb.1(0x40000000)
-    liveins: $r0
-
-    %0:tgpr = COPY $r0
-    %1:tgpr, $cpsr = tADDi8 %0, 10, 14, $noreg
-    tCMPr %1, %0, 14, $noreg, implicit-def $cpsr
-    tBcc %bb.2, 3, $cpsr
-    tB %bb.1, 14, $noreg
-
-  bb.1:
-    $r0 = COPY %0
-    tBX_RET 14, $noreg, implicit $r0
-
-  bb.2:
-    %2:tgpr, dead $cpsr = tMOVi8 0, 14, $noreg
-    $r0 = COPY %2
-    tBX_RET 14, $noreg, implicit $r0
-
-# CHECK-LABEL: name: test_addri8
-# CHECK:      [[COPY:%[0-9]+]]:tgpr = COPY $r0
-# CHECK-NEXT: [[ADD:%[0-9]+]]:tgpr, $cpsr = tADDi8 [[COPY]], 10, 14, $noreg
-# CHECK-NEXT: tBcc %bb.2, 2, $cpsr
-...