Revert "[MBP] Reduce code size by running tail merging in MBP."

This reverts commit r271930, r271915, r271923.  They break a thumb selfhosting
bot.

llvm-svn: 272017

2 files changed, 1 insertions, 64 deletions

diff --git a/llvm/test/CodeGen/AArch64/tailmerging_in_mbp.ll b/llvm/test/CodeGen/AArch64/tailmerging_in_mbp.ll
deleted file mode 100644
index 29df9def992..00000000000
--- a/llvm/test/CodeGen/AArch64/tailmerging_in_mbp.ll
+++ /dev/null
@@ -1,63 +0,0 @@
-; RUN: llc <%s -march=aarch64 | FileCheck %s
-
-; CHECK-LABEL: test:
-; CHECK:       LBB0_7:
-; CHECK:         b.hi	
-; CHECK-NEXT:    b	
-; CHECK-NEXT:  LBB0_8:
-; CHECK-NEXT:    mov	 x8, x9
-; CHECK-NEXT:  LBB0_9:
-define i64 @test(i64 %n, i64* %a, i64* %b, i64* %c, i64* %d, i64* %e, i64* %f) {
-entry:
-  %cmp28 = icmp sgt i64 %n, 1
-  br i1 %cmp28, label %for.body, label %for.end
-
-for.body:                                         ; preds = %for.body.lr.ph, %if.end
-  %j = phi i64 [ %n, %entry ], [ %div, %if.end ]
-  %div = lshr i64 %j, 1
-  %a.arrayidx = getelementptr inbounds i64, i64* %a, i64 %div
-  %a.j = load i64, i64* %a.arrayidx
-  %b.arrayidx = getelementptr inbounds i64, i64* %b, i64 %div
-  %b.j = load i64, i64* %b.arrayidx
-  %cmp.i = icmp slt i64 %a.j, %b.j
-  br i1 %cmp.i, label %for.end.loopexit, label %cond.false.i
-
-cond.false.i:                                     ; preds = %for.body
-  %cmp4.i = icmp sgt i64 %a.j, %b.j
-  br i1 %cmp4.i, label %if.end, label %cond.false6.i
-
-cond.false6.i:                                    ; preds = %cond.false.i
-  %c.arrayidx = getelementptr inbounds i64, i64* %c, i64 %div
-  %c.j = load i64, i64* %c.arrayidx
-  %d.arrayidx = getelementptr inbounds i64, i64* %d, i64 %div
-  %d.j = load i64, i64* %d.arrayidx
-  %cmp9.i = icmp slt i64 %c.j, %d.j
-  br i1 %cmp9.i, label %for.end.loopexit, label %cond.false11.i
-
-cond.false11.i:                                   ; preds = %cond.false6.i
-  %cmp14.i = icmp sgt i64 %c.j, %d.j
-  br i1 %cmp14.i, label %if.end, label %cond.false12.i
-
-cond.false12.i:                           ; preds = %cond.false11.i
-  %e.arrayidx = getelementptr inbounds i64, i64* %e, i64 %div
-  %e.j = load i64, i64* %e.arrayidx
-  %f.arrayidx = getelementptr inbounds i64, i64* %f, i64 %div
-  %f.j = load i64, i64* %f.arrayidx
-  %cmp19.i = icmp sgt i64 %e.j, %f.j
-  br i1 %cmp19.i, label %if.end, label %for.end.loopexit
-
-if.end:                                           ; preds = %cond.false12.i, %cond.false11.i, %cond.false.i
-  %cmp = icmp ugt i64 %j, 3
-  br i1 %cmp, label %for.body, label %for.end.loopexit
-
-for.end.loopexit:                                 ; preds = %cond.false12.i, %cond.false6.i, %for.body, %if.end
-  %j.0.lcssa.ph = phi i64 [ %j, %cond.false12.i ], [ %j, %cond.false6.i ], [ %j, %for.body ], [ %div, %if.end ]
-  br label %for.end
-
-for.end:                                          ; preds = %for.end.loopexit, %entry
-  %j.0.lcssa = phi i64 [ %n, %entry ], [ %j.0.lcssa.ph, %for.end.loopexit ]
-  %j.2 = add i64 %j.0.lcssa, %n
-  %j.3 = mul i64 %j.2, %n
-  %j.4 = add i64 %j.3, 10
-  ret i64 %j.4 
-}
diff --git a/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll b/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
index 151cc1b12ed..04eae8f9afe 100644
--- a/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
+++ b/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
@@ -49,7 +49,7 @@ tailrecurse.switch:                               ; preds = %tailrecurse
 ; V8-NEXT: beq
 ; V8-NEXT: %tailrecurse.switch
 ; V8: cmp
-; V8-NEXT: beq
+; V8-NEXT: bne
 ; V8-NEXT: b	
 ; The trailing space in the last line checks that the branch is unconditional
   switch i32 %and, label %sw.epilog [