[llvm-branch-commits] [llvm-branch] r89749 - in /llvm/branches/Apple/Zoidberg: lib/Target/ARM/ARMBaseInstrInfo.cpp test/CodeGen/Thumb2/ifcvt-neon.ll

[Evan Cheng]

Author: evancheng
Date: Tue Nov 24 02:10:57 2009
New Revision: 89749

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

Added:
    llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/ifcvt-neon.ll
Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseInstrInfo.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseInstrInfo.cpp?rev=89749&r1=89748&r2=89749&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseInstrInfo.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMBaseInstrInfo.cpp Tue Nov 24 02:10:57 2009
@@ -39,10 +39,6 @@
 EnableARM3Addr("enable-arm-3-addr-conv", cl::Hidden,
                cl::desc("Enable ARM 2-addr to 3-addr conv"));
 
-static cl::opt<bool>
-PredicateNEON("predicate-neon", cl::Hidden,
-              cl::desc("Allow NEON instructions to be predicated"));
-
 ARMBaseInstrInfo::ARMBaseInstrInfo(const ARMSubtarget& STI)
   : TargetInstrInfoImpl(ARMInsts, array_lengthof(ARMInsts)),
     Subtarget(STI) {
@@ -417,7 +413,7 @@
   if ((TID.TSFlags & ARMII::DomainMask) == ARMII::DomainNEON) {
     ARMFunctionInfo *AFI =
       MI->getParent()->getParent()->getInfo<ARMFunctionInfo>();
-    return PredicateNEON && AFI->isThumb2Function();
+    return AFI->isThumb2Function();
   }
   return true;
 }

Added: llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/ifcvt-neon.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/ifcvt-neon.ll?rev=89749&view=auto

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/ifcvt-neon.ll (added)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb2/ifcvt-neon.ll Tue Nov 24 02:10:57 2009
@@ -0,0 +1,29 @@
+; RUN: llc < %s -march=thumb -mcpu=cortex-a8 | FileCheck %s
+; rdar://7368193
+
+ at a = common global float 0.000000e+00             ; <float*> [#uses=2]
+ at b = common global float 0.000000e+00             ; <float*> [#uses=1]
+
+define arm_apcscc float @t(i32 %c) nounwind {
+entry:
+  %0 = icmp sgt i32 %c, 1                         ; <i1> [#uses=1]
+  %1 = load float* @a, align 4                    ; <float> [#uses=2]
+  %2 = load float* @b, align 4                    ; <float> [#uses=2]
+  br i1 %0, label %bb, label %bb1
+
+bb:                                               ; preds = %entry
+; CHECK:      ite lt
+; CHECK:      vsublt.f32
+; CHECK-NEXT: vaddge.f32
+  %3 = fadd float %1, %2                          ; <float> [#uses=1]
+  br label %bb2
+
+bb1:                                              ; preds = %entry
+  %4 = fsub float %1, %2                          ; <float> [#uses=1]
+  br label %bb2
+
+bb2:                                              ; preds = %bb1, %bb
+  %storemerge = phi float [ %4, %bb1 ], [ %3, %bb ] ; <float> [#uses=2]
+  store float %storemerge, float* @a
+  ret float %storemerge
+}