Revert r284580+r284917. ("Synthesize TBB/TBH instructions")

The optimization has correctness issues, so reverting for now to fix tests
on thumb1 targets.

llvm-svn: 284993

6 files changed, 23 insertions, 127 deletions

diff --git a/llvm/test/CodeGen/ARM/arm-position-independence-jump-table.ll b/llvm/test/CodeGen/ARM/arm-position-independence-jump-table.ll
index d5b8618be19..507f399c1f7 100644
--- a/llvm/test/CodeGen/ARM/arm-position-independence-jump-table.ll
+++ b/llvm/test/CodeGen/ARM/arm-position-independence-jump-table.ll
@@ -8,9 +8,9 @@
 ; RUN: llc -relocation-model=ropi      -mtriple=thumbv7m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB2
 ; RUN: llc -relocation-model=ropi-rwpi -mtriple=thumbv7m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB2
 
-; RUN: llc -relocation-model=static    -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1
-; RUN: llc -relocation-model=ropi      -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1
-; RUN: llc -relocation-model=ropi-rwpi -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1
+; RUN: llc -relocation-model=static    -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1 --check-prefix=THUMB1_ABS
+; RUN: llc -relocation-model=ropi      -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1 --check-prefix=THUMB1_PC
+; RUN: llc -relocation-model=ropi-rwpi -mtriple=thumbv6m--none-eabi -disable-block-placement < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB1 --check-prefix=THUMB1_PC
 
 
 declare void @exit0()
@@ -85,22 +85,30 @@ lab4:
 ; THUMB2: [[LBB4]]
 ; THUMB2-NEXT: b exit4
 
-
-; THUMB1: add     r[[x:[0-9]+]], pc
-; THUMB1: ldrb    r[[x]], [r[[x]], #4]
-; THUMB1: lsls    r[[x]], r[[x]], #1
-; THUMB1: [[LCPI:\.LCPI[0-9]+_[0-9]+]]:
-; THUMB1: add     pc, r[[x]]
-; THUMB1: .byte   ([[LBB1:\.LBB[0-9]+_[0-9]+]]-([[LCPI]]+4))/2
-; THUMB1: .byte   ([[LBB2:\.LBB[0-9]+_[0-9]+]]-([[LCPI]]+4))/2
-; THUMB1: .byte   ([[LBB3:\.LBB[0-9]+_[0-9]+]]-([[LCPI]]+4))/2
-; THUMB1: .byte   ([[LBB4:\.LBB[0-9]+_[0-9]+]]-([[LCPI]]+4))/2
+; THUMB1: lsls    r[[R_TAB_INDEX:[0-9]+]], r{{[0-9]+}}, #2 
+; THUMB1: adr     r[[R_TAB_BASE:[0-9]+]], [[LJTI:\.LJTI[0-9]+_[0-9]+]]
+; THUMB1: ldr     r[[R_BB_ADDR:[0-9]+]], [r[[R_TAB_INDEX]], r[[R_TAB_BASE]]]
+; THUMB1_PC: adds    r[[R_BB_ADDR]], r[[R_BB_ADDR]], r[[R_TAB_BASE]]
+; THUMB1: mov     pc, r[[R_BB_ADDR]]
+; THUMB1: [[LJTI]]
+; THUMB1_ABS: .long [[LBB1:\.LBB[0-9]+_[0-9]+]]+1
+; THUMB1_ABS: .long [[LBB2:\.LBB[0-9]+_[0-9]+]]+1
+; THUMB1_ABS: .long [[LBB3:\.LBB[0-9]+_[0-9]+]]+1
+; THUMB1_ABS: .long [[LBB4:\.LBB[0-9]+_[0-9]+]]+1
+; THUMB1_PC:  .long [[LBB1:\.LBB[0-9]+_[0-9]+]]-[[LJTI]]
+; THUMB1_PC:  .long [[LBB2:\.LBB[0-9]+_[0-9]+]]-[[LJTI]]
+; THUMB1_PC:  .long [[LBB3:\.LBB[0-9]+_[0-9]+]]-[[LJTI]]
+; THUMB1_PC:  .long [[LBB4:\.LBB[0-9]+_[0-9]+]]-[[LJTI]]
 ; THUMB1: [[LBB1]]
 ; THUMB1-NEXT: bl exit1
+; THUMB1-NEXT: pop
 ; THUMB1: [[LBB2]]
 ; THUMB1-NEXT: bl exit2
+; THUMB1-NEXT: pop
 ; THUMB1: [[LBB3]]
 ; THUMB1-NEXT: bl exit3
+; THUMB1-NEXT: pop
 ; THUMB1: [[LBB4]]
 ; THUMB1-NEXT: bl exit4
+; THUMB1-NEXT: pop
 }
diff --git a/llvm/test/CodeGen/ARM/constant-island-crash.ll b/llvm/test/CodeGen/ARM/constant-island-crash.ll
deleted file mode 100644
index 0d14caeaaed..00000000000
--- a/llvm/test/CodeGen/ARM/constant-island-crash.ll
+++ /dev/null
@@ -1,43 +0,0 @@
-; RUN: llc < %s
-; No FileCheck - testing for crash.
-
-target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
-target triple = "thumbv5e-none-linux-gnueabi"
-
-%struct.blam = type { [4 x %struct.eggs], [6 x [15 x i16]], [6 x i32], i32, i32, i32, i32, i32, i32, %struct.eggs, [4 x %struct.eggs], [4 x %struct.eggs], [4 x i32], i32, i32, i32, [4 x %struct.eggs], [4 x %struct.eggs], i32, %struct.eggs, i32 }
-%struct.eggs = type { i32, i32 }
-
-define void @spam(%struct.blam* %arg, i32 %arg1) {
-bb:
-  %tmp = getelementptr inbounds %struct.blam, %struct.blam* %arg, i32 undef, i32 2, i32 %arg1
-  switch i32 %arg1, label %bb8 [
-    i32 0, label %bb2
-    i32 1, label %bb3
-    i32 2, label %bb4
-    i32 3, label %bb5
-    i32 4, label %bb6
-    i32 5, label %bb7
-  ]
-
-bb2:                                              ; preds = %bb
-  unreachable
-
-bb3:                                              ; preds = %bb
-  unreachable
-
-bb4:                                              ; preds = %bb
-  unreachable
-
-bb5:                                              ; preds = %bb
-  unreachable
-
-bb6:                                              ; preds = %bb
-  unreachable
-
-bb7:                                              ; preds = %bb
-  unreachable
-
-bb8:                                              ; preds = %bb
-  store i32 1, i32* %tmp, align 4
-  unreachable
-}
diff --git a/llvm/test/CodeGen/ARM/jump-table-tbh.ll b/llvm/test/CodeGen/ARM/jump-table-tbh.ll
deleted file mode 100644
index 0a38e3b97a8..00000000000
--- a/llvm/test/CodeGen/ARM/jump-table-tbh.ll
+++ /dev/null
@@ -1,55 +0,0 @@
-; RUN: llc -mtriple=thumbv7m-linux-gnu -o - %s | FileCheck %s --check-prefix=T2
-; RUN: llc -mtriple=thumbv6m-linux-gnu -o - %s | FileCheck %s --check-prefix=T1
-
-declare void @foo(double)
-declare i32 @llvm.arm.space(i32, i32)
-
-define i32 @test_tbh(i1 %tst, i32 %sw, i32 %l) {
-  br label %complex
-
-; T2-LABEL: test_tbh:
-; T2: [[ANCHOR:.LCPI[0-9_]+]]:
-; T2: tbh [pc, r{{[0-9]+}}, lsl #1]
-; T2-NEXT: @ BB#1
-; T2-NEXT: LJTI
-; T2-NEXT: .short	(.LBB0_[[x:[0-9]+]]-([[ANCHOR]]+4))/2
-; T2-NEXT: .short	(.LBB0_{{[0-9]+}}-([[ANCHOR]]+4))/2
-; T2-NEXT: .short	(.LBB0_{{[0-9]+}}-([[ANCHOR]]+4))/2
-; T2-NEXT: .short	(.LBB0_[[x]]-([[ANCHOR]]+4))/2
-
-; T1-LABEL: test_tbh:
-; T1: lsls [[x:r[0-9]+]], r4, #1
-; T1: add [[x]], pc
-; T1: ldrh [[x]], {{\[}}[[x]], #4]
-; T1: lsls [[x]], [[x]], #1
-; T1: [[ANCHOR:.LCPI[0-9_]+]]:
-; T1: add pc, [[x]]
-; T1-NEXT: @ BB#2
-; T1-NEXT: LJTI
-; T1-NEXT: .short	(.LBB0_[[x:[0-9]+]]-([[ANCHOR]]+4))/2
-; T1-NEXT: .short	(.LBB0_{{[0-9]+}}-([[ANCHOR]]+4))/2
-; T1-NEXT: .short	(.LBB0_{{[0-9]+}}-([[ANCHOR]]+4))/2
-; T1-NEXT: .short	(.LBB0_[[x]]-([[ANCHOR]]+4))/2
-
-complex:
-  call void @foo(double 12345.0)
-  switch i32 %sw, label %second [ i32 0, label %other
-                                  i32 1, label %third
-                                  i32 2, label %end
-                                  i32 3, label %other ]
-
-second:
-  ret i32 43
-third:
-  call i32 @llvm.arm.space(i32 970, i32 undef)
-  ret i32 0
-
-other:
-  call void @bar()
-  unreachable
-
-end:
-  ret i32 42
-}
-
-declare void @bar()
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
index c71f37cee91..ce7fb9f10fe 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
@@ -1,5 +1,4 @@
 ; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 -arm-adjust-jump-tables=0 %s -o - | FileCheck %s
-; RUN: llc -mtriple=thumbv6-eabi -mcpu=cortex-m0 -arm-adjust-jump-tables=0 %s -o - | FileCheck %s
 
 ; Do not use tbb / tbh if any destination is before the jumptable.
 ; rdar://7102917
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-tbb.ll b/llvm/test/CodeGen/Thumb2/thumb2-tbb.ll
index 94e93387524..9e628519913 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-tbb.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-tbb.ll
@@ -1,7 +1,5 @@
 ; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s
 ; RUN: llc < %s -mtriple=thumbv7-apple-darwin -relocation-model=pic | FileCheck %s
-; RUN: llc < %s -mtriple=thumbv6m-apple-darwin -relocation-model=static | FileCheck %s --check-prefix=THUMB1
-; RUN: llc < %s -mtriple=thumbv6m-apple-darwin -relocation-model=pic | FileCheck %s --check-prefix=THUMB1
 
 define void @bar(i32 %n.u) {
 entry:
@@ -11,13 +9,6 @@ entry:
 ; CHECK: .end_data_region
 ; CHECK-NEXT: .p2align 1
 
-; THUMB1-LABEL: bar:
-; THUMB1: add pc, r0
-; THUMB1: .data_region jt8
-; THUMB1: .byte (LBB0_3-(LCPI0_0+4))/2
-; THUMB1: .end_data_region
-; THUMB1-NEXT: .p2align 1
-
     switch i32 %n.u, label %bb12 [i32 1, label %bb i32 2, label %bb6 i32 4, label %bb7 i32 5, label %bb8 i32 6, label %bb10 i32 7, label %bb1 i32 8, label %bb3 i32 9, label %bb4 i32 10, label %bb9 i32 11, label %bb2 i32 12, label %bb5 i32 13, label %bb11 ]
 bb:
     tail call void(...) @foo1()
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll b/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
index c67efa09b90..0761ed589a2 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
@@ -1,6 +1,4 @@
-; RUN: llc < %s -mtriple=thumbv7-apple-darwin -relocation-model=pic | FileCheck %s --check-prefix=CHECK --check-prefix=T2
-; RUN: llc < %s -mtriple=thumbv6m-apple-darwin -relocation-model=pic | FileCheck %s --check-prefix=CHECK --check-prefix=T1
-; RUN: llc < %s -mtriple=thumbv6m-apple-darwin -relocation-model=static | FileCheck %s --check-prefix=CHECK --check-prefix=T1
+; RUN: llc < %s -mtriple=thumbv7-apple-darwin -relocation-model=pic | FileCheck %s
 
 ; Thumb2 target should reorder the bb's in order to use tbb / tbh.
 
@@ -22,10 +20,8 @@ declare noalias i8* @calloc(i32, i32) nounwind
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind {
 ; CHECK-LABEL: main:
 ; CHECK-NOT: adr {{r[0-9]+}}, LJTI
-; T1:          lsls r[[x:[0-9]+]], {{r[0-9]+}}, #1
 ; CHECK: [[PCREL_ANCHOR:LCPI[0-9]+_[0-9]+]]:
-; T2-NEXT:     tbb [pc, {{r[0-9]+}}]
-; T1-NEXT:     add  pc, r[[x]]
+; CHECK-NEXT:     tbb [pc, {{r[0-9]+}}]
 
 ; CHECK: LJTI0_0:
 ; CHECK-NEXT: .data_region jt8