[llvm-commits] [llvm] r114494 - in /llvm/trunk: lib/Target/ARM/ARMISelLowering.cpp test/CodeGen/Thumb2/thumb2-badreg-operands.ll test/CodeGen/thumb2-mul.ll

[Owen Anderson]

Author: resistor
Date: Tue Sep 21 17:51:46 2010
New Revision: 114494

URL: http://llvm.org/viewvc/llvm-project?rev=114494&view=rev
Log:
Enable target-specific mul-lowering on ARM, even at -Os.  Remove a test that this makes
irrelevant, but add a new test for the new, improved functionality.

Added:
    llvm/trunk/test/CodeGen/thumb2-mul.ll
Removed:
    llvm/trunk/test/CodeGen/Thumb2/thumb2-badreg-operands.ll
Modified:
    llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=114494&r1=114493&r2=114494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Tue Sep 21 17:51:46 2010
@@ -4194,10 +4194,6 @@
   if (Subtarget->isThumb1Only())
     return SDValue();
 
-  if (DAG.getMachineFunction().
-      getFunction()->hasFnAttr(Attribute::OptimizeForSize))
-    return SDValue();
-
   if (DCI.isBeforeLegalize() || DCI.isCalledByLegalizer())
     return SDValue();
 

Removed: llvm/trunk/test/CodeGen/Thumb2/thumb2-badreg-operands.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/thumb2-badreg-operands.ll?rev=114493&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/thumb2-badreg-operands.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/thumb2-badreg-operands.ll (removed)
@@ -1,15 +0,0 @@
-; RUN: llc < %s -mtriple=thumbv7-apple-darwin10 | FileCheck %s
-
-define void @b(i32 %x) nounwind optsize {
-entry:
-; CHECK: b
-; CHECK: mov r2, sp
-; CHECK: mls r0, r0, r1, r2
-; CHECK: mov sp, r0
-  %0 = mul i32 %x, 24                             ; <i32> [#uses=1]
-  %vla = alloca i8, i32 %0, align 1               ; <i8*> [#uses=1]
-  call arm_aapcscc  void @a(i8* %vla) nounwind optsize
-  ret void
-}
-
-declare void @a(i8*) optsize

Added: llvm/trunk/test/CodeGen/thumb2-mul.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/thumb2-mul.ll?rev=114494&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/thumb2-mul.ll (added)
+++ llvm/trunk/test/CodeGen/thumb2-mul.ll Tue Sep 21 17:51:46 2010
@@ -0,0 +1,18 @@
+; RUN: llc < %s -mtriple=thumbv7-apple-darwin10 | FileCheck %s
+
+%struct.CMPoint = type { %struct.Point, float, float, [5 x float] }
+%struct.Point = type { float, float }
+
+define %struct.CMPoint* @t1(i32 %i, i32 %j, i32 %n, %struct.CMPoint* %thePoints) nounwind readnone ssp {
+entry:
+; CHECK: mla     r0, r2, r0, r1
+; CHECK: add.w   r0, r0, r0, lsl #3
+; CHECL: add.w   r0, r3, r0, lsl #2
+  %mul = mul i32 %n, %i
+  %add = add i32 %mul, %j
+  %0 = ptrtoint %struct.CMPoint* %thePoints to i32
+  %mul5 = mul i32 %add, 36
+  %add6 = add i32 %mul5, %0
+  %1 = inttoptr i32 %add6 to %struct.CMPoint*
+  ret %struct.CMPoint* %1
+}