[GR-54521] Reimplement asinh, acosh, atanh using MathUtils.

PullRequest: graalpython/3359

Author: woess

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CmathModuleBuiltins.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -47,6 +47,7 @@
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.utilities.MathUtils;
 
 @CoreFunctions(defineModule = "cmath")
 public final class CmathModuleBuiltins extends PythonBuiltins {
@@ -634,7 +635,7 @@ static ComplexValue compute(Node inliningTarget, double real, double imag, PRais
                 ComplexValue s1 = SqrtNode.compute(inliningTarget, 1.0 - real, -imag, raiseNode);
                 ComplexValue s2 = SqrtNode.compute(inliningTarget, 1.0 + real, imag, raiseNode);
                 rreal = 2.0 * Math.atan2(s1.real, s2.real);
-                rimag = MathModuleBuiltins.AsinhNode.compute(s2.real * s1.imag - s2.imag * s1.real);
+                rimag = MathUtils.asinh(s2.real * s1.imag - s2.imag * s1.real);
             }
             return new ComplexValue(rreal, rimag);
         }
@@ -677,7 +678,7 @@ static ComplexValue compute(Node inliningTarget, double real, double imag, PRais
             } else {
                 ComplexValue s1 = SqrtNode.compute(inliningTarget, real - 1.0, imag, raiseNode);
                 ComplexValue s2 = SqrtNode.compute(inliningTarget, real + 1.0, imag, raiseNode);
-                rreal = MathModuleBuiltins.AsinhNode.compute(s1.real * s2.real + s1.imag * s2.imag);
+                rreal = MathUtils.asinh(s1.real * s2.real + s1.imag * s2.imag);
                 rimag = 2.0 * Math.atan2(s1.imag, s2.real);
             }
             return new ComplexValue(rreal, rimag);
@@ -743,7 +744,7 @@ static ComplexValue compute(Node inliningTarget, double real, double imag, PRais
             } else {
                 ComplexValue s1 = SqrtNode.compute(inliningTarget, 1.0 + imag, -real, raiseNode);
                 ComplexValue s2 = SqrtNode.compute(inliningTarget, 1.0 - imag, real, raiseNode);
-                rreal = MathModuleBuiltins.AsinhNode.compute(s1.real * s2.imag - s2.real * s1.imag);
+                rreal = MathUtils.asinh(s1.real * s2.imag - s2.real * s1.imag);
                 rimag = Math.atan2(imag, s1.real * s2.real - s1.imag * s2.imag);
             }
             return new ComplexValue(rreal, rimag);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java

@@ -105,6 +105,7 @@
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.profiles.InlinedLoopConditionProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
+import com.oracle.truffle.api.utilities.MathUtils;
 
 @CoreFunctions(defineModule = "math")
 public final class MathModuleBuiltins extends PythonBuiltins {
@@ -1258,7 +1259,6 @@ private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy
     @GenerateNodeFactory
     public abstract static class AcoshNode extends PythonUnaryBuiltinNode {
 
-        private static final double TWO_POW_P28 = 0x1.0p28;
         private static final double LN_2 = 6.93147180559945286227e-01;
 
         @Specialization
@@ -1285,14 +1285,7 @@ static double doGeneric(VirtualFrame frame, Object value,
 
         private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy raiseNode) {
             checkMathDomainError(value < 1, inliningTarget, raiseNode);
-            if (value >= TWO_POW_P28) {
-                return Math.log(value) + LN_2;
-            }
-            if (value <= 2.0) {
-                double t = value - 1.0;
-                return Math.log1p(t + Math.sqrt(2.0 * t + t * t));
-            }
-            return Math.log(value + Math.sqrt(value * value - 1.0));
+            return MathUtils.acosh(value);
         }
     }
 
@@ -1433,8 +1426,6 @@ private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy
     @GenerateNodeFactory
     public abstract static class AtanhNode extends PythonUnaryBuiltinNode {
 
-        private static final double TWO_POW_M28 = 0x1.0p-28;
-
         @Specialization
         static double doGeneric(VirtualFrame frame, Object value,
                         @Bind("this") Node inliningTarget,
@@ -1445,17 +1436,7 @@ static double doGeneric(VirtualFrame frame, Object value,
         private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy raiseNode) {
             double abs = Math.abs(value);
             checkMathDomainError(abs >= 1.0, inliningTarget, raiseNode);
-            if (abs < TWO_POW_M28) {
-                return value;
-            }
-            double t;
-            if (abs < 0.5) {
-                t = abs + abs;
-                t = 0.5 * Math.log1p(t + t * abs / (1.0 - abs));
-            } else {
-                t = 0.5 * Math.log1p((abs + abs) / (1.0 - abs));
-            }
-            return Math.copySign(t, value);
+            return MathUtils.atanh(value);
         }
     }
 
@@ -1465,41 +1446,15 @@ private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy
     @GenerateNodeFactory
     public abstract static class AsinhNode extends PythonUnaryBuiltinNode {
 
-        private static final double LN_2 = 6.93147180559945286227e-01;
-        private static final double TWO_POW_P28 = 0x1.0p28;
-        private static final double TWO_POW_M28 = 0x1.0p-28;
-
         @Specialization
         static double doGeneric(VirtualFrame frame, Object value,
                         @Bind("this") Node inliningTarget,
                         @Cached MathUnaryHelperNode helperNode) {
             return helperNode.execute(frame, inliningTarget, value, AsinhNode::compute);
         }
 
-        @TruffleBoundary
         private static double compute(Node inliningTarget, double value, PRaiseNode.Lazy raiseNode) {
-            return compute(value);
-        }
-
-        static double compute(double value) {
-            double absx = Math.abs(value);
-
-            if (Double.isNaN(value) || Double.isInfinite(value)) {
-                return value + value;
-            }
-            if (absx < TWO_POW_M28) {
-                return value;
-            }
-            double w;
-            if (absx > TWO_POW_P28) {
-                w = Math.log(absx) + LN_2;
-            } else if (absx > 2.0) {
-                w = Math.log(2.0 * absx + 1.0 / (Math.sqrt(value * value + 1.0) + absx));
-            } else {
-                double t = value * value;
-                w = Math.log1p(absx + t / (1.0 + Math.sqrt(1.0 + t)));
-            }
-            return Math.copySign(w, value);
+            return MathUtils.asinh(value);
         }
 
         public static AsinhNode create() {