summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2009-11-17 21:24:11 +0000
committerJim Grosbach <grosbach@apple.com>2009-11-17 21:24:11 +0000
commitcdde77c6a369d66951528e58889961dba8e1a590 (patch)
tree311502ede63ae099c61bae5d2105823b1b96ceeb
parent31e24b2d0c791d6afc0ca702d404c19403176188 (diff)
downloadbcm5719-llvm-cdde77c6a369d66951528e58889961dba8e1a590.tar.gz
bcm5719-llvm-cdde77c6a369d66951528e58889961dba8e1a590.zip
Enable arm jumpt table adjustment.
llvm-svn: 89143
-rw-r--r--llvm/lib/Target/ARM/ARMConstantIslandPass.cpp2
-rw-r--r--llvm/test/CodeGen/Thumb2/thumb2-jtb.ll2
-rw-r--r--llvm/test/CodeGen/Thumb2/thumb2-tbh.ll1
3 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
index 734e33d2e6e..d22c43afc5f 100644
--- a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
+++ b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
@@ -48,7 +48,7 @@ STATISTIC(NumJTInserted, "Number of jump table intermediate blocks inserted");
static cl::opt<bool>
-AdjustJumpTableBlocks("arm-adjust-jump-tables", cl::Hidden, cl::init(false),
+AdjustJumpTableBlocks("arm-adjust-jump-tables", cl::Hidden, cl::init(true),
cl::desc("Adjust basic block layout to better use TB[BH]"));
namespace {
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
index 7d093ecce20..f5a56e5ace0 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | not grep tbb
+; RUN: llc < %s -march=thumb -mattr=+thumb2 -arm-adjust-jump-tables=0 | not grep tbb
; Do not use tbb / tbh if any destination is before the jumptable.
; rdar://7102917
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll b/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
index 916d4679994..2cf1d6a2afd 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-tbh.ll
@@ -1,7 +1,6 @@
; 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.
-; XFAIL: *
%struct.R_flstr = type { i32, i32, i8* }
%struct._T_tstr = type { i32, %struct.R_flstr*, %struct._T_tstr* }
OpenPOWER on IntegriCloud