[llvm-branch-commits] [llvm-branch] r89144 - in /llvm/branches/Apple/Leela: lib/Target/ARM/ARMConstantIslandPass.cpp test/CodeGen/Thumb2/thumb2-jtb.ll test/CodeGen/Thumb2/thumb2-tbh.ll

[Jim Grosbach]

Author: grosbach
Date: Tue Nov 17 15:25:57 2009
New Revision: 89144

URL: http://llvm.org/viewvc/llvm-project?rev=89144&view=rev
Log:
Merge 89143

Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp
    llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-jtb.ll
    llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp?rev=89144&r1=89143&r2=89144&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMConstantIslandPass.cpp Tue Nov 17 15:25:57 2009
@@ -48,7 +48,7 @@
 
 
 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 {

Modified: llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-jtb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-jtb.ll?rev=89144&r1=89143&r2=89144&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-jtb.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-jtb.ll Tue Nov 17 15:25:57 2009
@@ -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

Modified: llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll?rev=89144&r1=89143&r2=89144&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll Tue Nov 17 15:25:57 2009
@@ -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* }