[llvm] r252889 - Revert "[ARM] Enable shrink-wrapping by default."
Renato Golin via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 12 05:34:50 PST 2015
Author: rengolin
Date: Thu Nov 12 07:34:50 2015
New Revision: 252889
URL: http://llvm.org/viewvc/llvm-project?rev=252889&view=rev
Log:
Revert "[ARM] Enable shrink-wrapping by default."
This reverts commit r252825, as it broke ASAN on ARM. Investigating...
Modified:
llvm/trunk/lib/Target/ARM/ARMFrameLowering.h
llvm/trunk/test/CodeGen/ARM/call-tc.ll
llvm/trunk/test/CodeGen/ARM/fold-stack-adjust.ll
llvm/trunk/test/CodeGen/ARM/ifcvt5.ll
llvm/trunk/test/CodeGen/ARM/ifcvt6.ll
llvm/trunk/test/CodeGen/ARM/ifcvt8.ll
llvm/trunk/test/CodeGen/ARM/machine-cse-cmp.ll
llvm/trunk/test/CodeGen/ARM/thumb-alignment.ll
llvm/trunk/test/CodeGen/Thumb2/ifcvt-compare.ll
llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt1.ll
llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt2.ll
llvm/trunk/test/CodeGen/Thumb2/v8_IT_5.ll
Modified: llvm/trunk/lib/Target/ARM/ARMFrameLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMFrameLowering.h?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMFrameLowering.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMFrameLowering.h Thu Nov 12 07:34:50 2015
@@ -57,11 +57,6 @@ public:
void adjustForSegmentedStacks(MachineFunction &MF,
MachineBasicBlock &MBB) const override;
- /// Returns true if the target will correctly handle shrink wrapping.
- bool enableShrinkWrapping(const MachineFunction &MF) const override {
- return true;
- }
-
private:
void emitPushInst(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
const std::vector<CalleeSavedInfo> &CSI, unsigned StmOpc,
Modified: llvm/trunk/test/CodeGen/ARM/call-tc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/call-tc.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/call-tc.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/call-tc.ll Thu Nov 12 07:34:50 2015
@@ -83,11 +83,9 @@ declare void @foo() nounwind
define void @t7() nounwind {
entry:
; CHECKT2D-LABEL: t7:
-; CHECKT2D: it ne
-; CHECKT2D-NEXT: bne.w _foo
-; CHECKT2D-NEXT: push
-; CHECKT2D-NEXT: mov r7, sp
-; CHECKT2D-NEXT: blx _foo
+; CHECKT2D: blxeq _foo
+; CHECKT2D-NEXT: pop.w
+; CHECKT2D-NEXT: b.w _foo
br i1 undef, label %bb, label %bb1.lr.ph
bb1.lr.ph:
Modified: llvm/trunk/test/CodeGen/ARM/fold-stack-adjust.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/fold-stack-adjust.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/fold-stack-adjust.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/fold-stack-adjust.ll Thu Nov 12 07:34:50 2015
@@ -1,6 +1,4 @@
-; Disable shrink-wrapping on the first test otherwise we wouldn't
-; exerce the path for PR18136.
-; RUN: llc -mtriple=thumbv7-apple-none-macho < %s -enable-shrink-wrap=false | FileCheck %s
+; RUN: llc -mtriple=thumbv7-apple-none-macho < %s | FileCheck %s
; RUN: llc -mtriple=thumbv6m-apple-none-macho -disable-fp-elim < %s | FileCheck %s --check-prefix=CHECK-T1
; RUN: llc -mtriple=thumbv7-apple-darwin-ios -disable-fp-elim < %s | FileCheck %s --check-prefix=CHECK-IOS
; RUN: llc -mtriple=thumbv7--linux-gnueabi -disable-fp-elim < %s | FileCheck %s --check-prefix=CHECK-LINUX
Modified: llvm/trunk/test/CodeGen/ARM/ifcvt5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/ifcvt5.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/ifcvt5.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/ifcvt5.ll Thu Nov 12 07:34:50 2015
@@ -13,10 +13,10 @@ entry:
define i32 @t1(i32 %a, i32 %b) {
; A8-LABEL: t1:
-; A8: bxlt lr
+; A8: poplt {r7, pc}
; SWIFT-LABEL: t1:
-; SWIFT: bxlt lr
+; SWIFT: pop {r7, pc}
; SWIFT: pop {r7, pc}
entry:
%tmp1 = icmp sgt i32 %a, 10 ; <i1> [#uses=1]
Modified: llvm/trunk/test/CodeGen/ARM/ifcvt6.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/ifcvt6.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/ifcvt6.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/ifcvt6.ll Thu Nov 12 07:34:50 2015
@@ -3,7 +3,7 @@
define void @foo(i32 %X, i32 %Y) {
entry:
; CHECK: cmpne
-; CHECK: bxhi lr
+; CHECK: pophi
%tmp1 = icmp ult i32 %X, 4 ; <i1> [#uses=1]
%tmp4 = icmp eq i32 %Y, 0 ; <i1> [#uses=1]
%tmp7 = or i1 %tmp4, %tmp1 ; <i1> [#uses=1]
Modified: llvm/trunk/test/CodeGen/ARM/ifcvt8.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/ifcvt8.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/ifcvt8.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/ifcvt8.ll Thu Nov 12 07:34:50 2015
@@ -5,9 +5,7 @@
declare void @abort()
define fastcc void @t(%struct.SString* %word, i8 signext %c) {
-; CHECK-NOT: pop
-; CHECK: bxne
-; CHECK-NOT: pop
+; CHECK: popne
entry:
%tmp1 = icmp eq %struct.SString* %word, null ; <i1> [#uses=1]
br i1 %tmp1, label %cond_true, label %cond_false
Modified: llvm/trunk/test/CodeGen/ARM/machine-cse-cmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/machine-cse-cmp.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/machine-cse-cmp.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/machine-cse-cmp.ll Thu Nov 12 07:34:50 2015
@@ -27,7 +27,7 @@ define void @f2() nounwind ssp {
entry:
; CHECK-LABEL: f2:
; CHECK: cmp
-; CHECK: bxlt
+; CHECK: poplt
; CHECK-NOT: cmp
; CHECK: movle
%0 = load i32, i32* @foo, align 4
Modified: llvm/trunk/test/CodeGen/ARM/thumb-alignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/thumb-alignment.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/thumb-alignment.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/thumb-alignment.ll Thu Nov 12 07:34:50 2015
@@ -23,7 +23,7 @@ define i32* @bar() {
; CHECK: .globl baz
; CHECK-NEXT: .align 2
-; CHECK: tbb
+; CHECK: adr.w
define i32 @baz() {
%1 = load i32, i32* @c, align 4
switch i32 %1, label %7 [
Modified: llvm/trunk/test/CodeGen/Thumb2/ifcvt-compare.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/ifcvt-compare.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/ifcvt-compare.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/ifcvt-compare.ll Thu Nov 12 07:34:50 2015
@@ -19,8 +19,7 @@ f:
define void @f1(i32 %x) optsize {
; CHECK-LABEL: f1:
; CHECK: cmp r0, #1
- ; CHECK: it ne
- ; CHECK-NEXT: bxne lr
+ ; CHECK: it eq
%p = icmp eq i32 %x, 1
br i1 %p, label %t, label %f
@@ -35,8 +34,7 @@ f:
define void @f2(i32 %x) {
; CHECK-LABEL: f2:
; CHECK: cmp r0, #0
- ; CHECK: it ne
- ; CHECK-NEXT: bxne lr
+ ; CHECK: it eq
%p = icmp eq i32 %x, 0
br i1 %p, label %t, label %f
Modified: llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt1.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt1.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt1.ll Thu Nov 12 07:34:50 2015
@@ -72,10 +72,9 @@ entry:
define void @t3(i32 %a, i32 %b) nounwind {
entry:
; CHECK-LABEL: t3:
-; CHECK: it lt
-; CHECK-NEXT: bxlt lr
-; CHECK: mov r0, r1
-; CHECK: bl {{_?}}foo
+; CHECK: itt ge
+; CHECK: movge r0, r1
+; CHECK: blge {{_?}}foo
%tmp1 = icmp sgt i32 %a, 10 ; <i1> [#uses=1]
br i1 %tmp1, label %cond_true, label %UnifiedReturnBlock
Modified: llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt2.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt2.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/thumb2-ifcvt2.ll Thu Nov 12 07:34:50 2015
@@ -8,7 +8,7 @@ entry:
; CHECK: it ne
; CHECK: cmpne
; CHECK: it hi
-; CHECK: bxhi lr
+; CHECK: pophi {r7, pc}
%tmp1 = icmp ult i32 %X, 4 ; <i1> [#uses=1]
%tmp4 = icmp eq i32 %Y, 0 ; <i1> [#uses=1]
%tmp7 = or i1 %tmp4, %tmp1 ; <i1> [#uses=1]
@@ -69,7 +69,7 @@ define fastcc void @t1(%struct.SString*
entry:
; CHECK-LABEL: t1:
; CHECK: it ne
-; CHECK: bxne lr
+; CHECK: popne {r7, pc}
%tmp1 = icmp eq %struct.SString* %word, null ; <i1> [#uses=1]
br i1 %tmp1, label %cond_true, label %cond_false
Modified: llvm/trunk/test/CodeGen/Thumb2/v8_IT_5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/v8_IT_5.ll?rev=252889&r1=252888&r2=252889&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/v8_IT_5.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/v8_IT_5.ll Thu Nov 12 07:34:50 2015
@@ -9,7 +9,7 @@
; CHECK-NEXT: b
; CHECK: [[JUMPTARGET]]:{{.*}}%if.else173
; CHECK-NEXT: mov.w
-; CHECK-NEXT: bx lr
+; CHECK-NEXT: pop
; CHECK-NEXT: %if.else145
; CHECK-NEXT: mov.w
More information about the llvm-commits
mailing list