fix minsize detection: minsize attribute implies optimizing for size

llvm-svn: 244631

2 files changed, 7 insertions, 17 deletions

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 805e68ff11e..244cc7bc227 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3971,10 +3971,9 @@ static SDValue ExpandPowI(SDLoc DL, SDValue LHS, SDValue RHS,
       return DAG.getConstantFP(1.0, DL, LHS.getValueType());
 
     const Function *F = DAG.getMachineFunction().getFunction();
-    // FIXME: Use Function::optForSize().
-    if (!F->hasFnAttribute(Attribute::OptimizeForSize) ||
-        // If optimizing for size, don't insert too many multiplies.  This
-        // inserts up to 5 multiplies.
+    if (!F->optForSize() ||
+        // If optimizing for size, don't insert too many multiplies.
+        // This inserts up to 5 multiplies.
         countPopulation(Val) + Log2_32(Val) < 7) {
       // We use the simple binary decomposition method to generate the multiply
       // sequence.  There are more optimal ways to do this (for example,
diff --git a/llvm/test/CodeGen/X86/powi.ll b/llvm/test/CodeGen/X86/powi.ll
index bb1cf4fd7f9..88b5f4eb14b 100644
--- a/llvm/test/CodeGen/X86/powi.ll
+++ b/llvm/test/CodeGen/X86/powi.ll
@@ -17,7 +17,7 @@ define double @pow_wrapper(double %a) nounwind readonly ssp noredzone {
   ret double %ret
 }
 
-define double @pow_wrapper_optsize(double %a) optsize  {
+define double @pow_wrapper_optsize(double %a) optsize {
 ; CHECK-LABEL: pow_wrapper_optsize:
 ; CHECK:       # BB#0:
 ; CHECK-NEXT:    movl  $15, %edi
@@ -26,20 +26,11 @@ define double @pow_wrapper_optsize(double %a) optsize  {
   ret double %ret
 }
 
-; FIXME: Should not expand with minsize
-
-define double @pow_wrapper_minsize(double %a) minsize  {
+define double @pow_wrapper_minsize(double %a) minsize {
 ; CHECK-LABEL: pow_wrapper_minsize:
 ; CHECK:       # BB#0:
-; CHECK-NEXT:    movapd %xmm0, %xmm1
-; CHECK-NEXT:    mulsd %xmm1, %xmm1
-; CHECK-NEXT:    mulsd %xmm1, %xmm0
-; CHECK-NEXT:    mulsd %xmm1, %xmm1
-; CHECK-NEXT:    mulsd %xmm1, %xmm0
-; CHECK-NEXT:    mulsd %xmm1, %xmm1
-; CHECK-NEXT:    mulsd %xmm0, %xmm1
-; CHECK-NEXT:    movapd %xmm1, %xmm0
-; CHECK-NEXT:    retq
+; CHECK-NEXT:    movl  $15, %edi
+; CHECK-NEXT:    jmp
   %ret = tail call double @llvm.powi.f64(double %a, i32 15) nounwind ; <double> [#uses=1]
   ret double %ret
 }