[llvm-commits] CVS: llvm/lib/Transforms/Utils/Local.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Utils:

Local.cpp updated: 1.22 -> 1.23

---
Log message:

Restructure call constant folding code a bit to make it simpler
Add support for acos/asin/atan.  188.ammp contains three calls to acos with
constant arguments.  Constant folding it allows elimination of those 3 calls 
and three FP divisions of the results.


---
Diffs of the changes:  (+40 -39)

Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.22 llvm/lib/Transforms/Utils/Local.cpp:1.23
--- llvm/lib/Transforms/Utils/Local.cpp:1.22	Wed Apr 21 11:11:40 2004
+++ llvm/lib/Transforms/Utils/Local.cpp	Thu May 27 01:26:28 2004
@@ -235,7 +235,17 @@
 bool llvm::canConstantFoldCallTo(Function *F) {
   const std::string &Name = F->getName();
   return Name == "sin" || Name == "cos" || Name == "tan" || Name == "sqrt" ||
-         Name == "log" || Name == "log10" || Name == "exp" || Name == "pow";
+         Name == "log" || Name == "log10" || Name == "exp" || Name == "pow" ||
+         Name == "acos" || Name == "asin";
+}
+
+static Constant *ConstantFoldFP(double (*NativeFP)(double), double V,
+                                const Type *Ty) {
+  errno = 0;
+  V = NativeFP(V);
+  if (errno == 0)
+    return ConstantFP::get(Ty, V);
+  return 0;
 }
 
 /// ConstantFoldCall - Attempt to constant fold a call to the specified function
@@ -245,49 +255,40 @@
   const std::string &Name = F->getName();
   const Type *Ty = F->getReturnType();
 
-  if (Name == "sin") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        return ConstantFP::get(Ty, sin(CFP->getValue()));
-    
-  } else if (Name == "cos") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        return ConstantFP::get(Ty, cos(CFP->getValue()));
-
-  } else if (Name == "tan") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        return ConstantFP::get(Ty, tan(CFP->getValue()));
-
-  } else if (Name == "sqrt") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        if (CFP->getValue() >= 0)
-          return ConstantFP::get(Ty, sqrt(CFP->getValue()));
-  } else if (Name == "exp") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        return ConstantFP::get(Ty, exp(CFP->getValue()));
-  } else if (Name == "log") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        if (CFP->getValue() > 0)
-          return ConstantFP::get(Ty, log(CFP->getValue()));
-  } else if (Name == "log10") {
-    if (Operands.size() == 1)
-      if (ConstantFP *CFP = dyn_cast<ConstantFP>(Operands[0]))
-        if (CFP->getValue() > 0)
-          return ConstantFP::get(Ty, log10(CFP->getValue()));
-  } else if (Name == "pow") {
-    if (Operands.size() == 2)
-      if (ConstantFP *Op1 = dyn_cast<ConstantFP>(Operands[0]))
-        if (ConstantFP *Op2 = dyn_cast<ConstantFP>(Operands[1])) {
+  if (Operands.size() == 1) {
+    if (ConstantFP *Op = dyn_cast<ConstantFP>(Operands[0])) {
+      double V = Op->getValue();
+      if (Name == "sin")
+        return ConstantFP::get(Ty, sin(V));
+      else if (Name == "cos")
+        return ConstantFP::get(Ty, cos(V));
+      else if (Name == "tan")
+        return ConstantFP::get(Ty, tan(V));
+      else if (Name == "sqrt" && V >= 0)
+        return ConstantFP::get(Ty, sqrt(V));
+      else if (Name == "exp")
+        return ConstantFP::get(Ty, exp(V));
+      else if (Name == "log" && V > 0)
+        return ConstantFP::get(Ty, log(V));
+      else if (Name == "log10")
+        return ConstantFoldFP(log10, V, Ty);
+      else if (Name == "acos")
+        return ConstantFoldFP(acos, V, Ty);
+      else if (Name == "asin")
+        return ConstantFoldFP(asin, V, Ty);
+      else if (Name == "atan")
+        return ConstantFP::get(Ty, atan(V));
+    }
+  } else if (Operands.size() == 2) {
+    if (ConstantFP *Op1 = dyn_cast<ConstantFP>(Operands[0]))
+      if (ConstantFP *Op2 = dyn_cast<ConstantFP>(Operands[1])) {
+        if (Name == "pow") {
           errno = 0;
           double V = pow(Op1->getValue(), Op2->getValue());
           if (errno == 0)
             return ConstantFP::get(Ty, V);
         }
+      }
   }
   return 0;
 }