Skip to content

use libm for acosh and asinh for f16, f32, and f64 #154051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malezjaa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use libm for acosh and asinh for f16, f32, and f64 #154051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions library/coretests/tests/num/floats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub(crate) trait TestableFloat: Sized {
const NEG_MUL_ADD_RESULT: Self;
/// Reciprocal of the maximum val
const MAX_RECIP: Self;
const ASINH_ACOSH_MAX: Self;
}

impl TestableFloat for f16 {
Expand Down Expand Up @@ -103,6 +104,7 @@ impl TestableFloat for f16 {
const MUL_ADD_RESULT: Self = 62.031;
const NEG_MUL_ADD_RESULT: Self = 48.625;
const MAX_RECIP: Self = 1.526624e-5;
const ASINH_ACOSH_MAX: Self = 11.781;
}

impl TestableFloat for f32 {
Expand Down Expand Up @@ -149,6 +151,7 @@ impl TestableFloat for f32 {
const MUL_ADD_RESULT: Self = 62.05;
const NEG_MUL_ADD_RESULT: Self = 48.65;
const MAX_RECIP: Self = 2.938736e-39;
const ASINH_ACOSH_MAX: Self = 89.4159851;
}

impl TestableFloat for f64 {
Expand Down Expand Up @@ -180,6 +183,7 @@ impl TestableFloat for f64 {
const MUL_ADD_RESULT: Self = 62.050000000000004;
const NEG_MUL_ADD_RESULT: Self = 48.650000000000006;
const MAX_RECIP: Self = 5.562684646268003e-309;
const ASINH_ACOSH_MAX: Self = 710.47586007394398;
}

impl TestableFloat for f128 {
Expand Down Expand Up @@ -221,6 +225,7 @@ impl TestableFloat for f128 {
const MUL_ADD_RESULT: Self = 62.0500000000000000000000000000000037;
const NEG_MUL_ADD_RESULT: Self = 48.6500000000000000000000000000000049;
const MAX_RECIP: Self = 8.40525785778023376565669454330438228902076605e-4933;
const ASINH_ACOSH_MAX: Self = 11357.216553474703894801348310092223;
}

/// Determine the tolerance for values of the argument type.
Expand Down Expand Up @@ -1705,6 +1710,9 @@ float_test! {

assert_approx_eq!(flt(-200.0).asinh(), -5.991470797049389, Float::ASINH_APPROX);

// issue 153878: large values were rounding to infinity
assert_approx_eq!(Float::MAX.asinh(), Float::ASINH_ACOSH_MAX, Float::ASINH_APPROX);

#[allow(overflowing_literals)]
if Float::MAX > flt(66000.0) {
// regression test for the catastrophic cancellation fixed in 72486
Expand Down Expand Up @@ -1733,6 +1741,9 @@ float_test! {
assert_approx_eq!(flt(2.0).acosh(), 1.31695789692481670862504634730796844, Float::ACOSH_APPROX);
assert_approx_eq!(flt(3.0).acosh(), 1.76274717403908605046521864995958461, Float::ACOSH_APPROX);

// issue 153878: large values were rounding to infinity
assert_approx_eq!(Float::MAX.acosh(), Float::ASINH_ACOSH_MAX, Float::ACOSH_APPROX);

#[allow(overflowing_literals)]
if Float::MAX > flt(66000.0) {
// test for low accuracy from issue 104548
Expand Down
10 changes: 2 additions & 8 deletions library/std/src/num/f128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,7 @@ impl f128 {
#[unstable(feature = "f128", issue = "116909")]
#[must_use = "method returns a new number and does not mutate the original value"]
pub fn asinh(self) -> f128 {
let ax = self.abs();
let ix = 1.0 / ax;
(ax + (ax / (Self::hypot(1.0, ix) + ix))).ln_1p().copysign(self)
cmath::asinhf128(self)
}

/// Inverse hyperbolic cosine function.
Expand Down Expand Up @@ -900,11 +898,7 @@ impl f128 {
#[unstable(feature = "f128", issue = "116909")]
#[must_use = "method returns a new number and does not mutate the original value"]
pub fn acosh(self) -> f128 {
if self < 1.0 {
Self::NAN
} else {
(self + ((self - 1.0).sqrt() * (self + 1.0).sqrt())).ln()
}
cmath::acoshf128(self)
}

/// Inverse hyperbolic tangent function.
Expand Down
10 changes: 2 additions & 8 deletions library/std/src/num/f16.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,9 +832,7 @@ impl f16 {
#[unstable(feature = "f16", issue = "116909")]
#[must_use = "method returns a new number and does not mutate the original value"]
pub fn asinh(self) -> f16 {
let ax = self.abs();
let ix = 1.0 / ax;
(ax + (ax / (Self::hypot(1.0, ix) + ix))).ln_1p().copysign(self)
cmath::asinhf(self as f32) as f16
}

/// Inverse hyperbolic cosine function.
Expand Down Expand Up @@ -865,11 +863,7 @@ impl f16 {
#[unstable(feature = "f16", issue = "116909")]
#[must_use = "method returns a new number and does not mutate the original value"]
pub fn acosh(self) -> f16 {
if self < 1.0 {
Self::NAN
} else {
(self + ((self - 1.0).sqrt() * (self + 1.0).sqrt())).ln()
}
cmath::acoshf(self as f32) as f16
}

/// Inverse hyperbolic tangent function.
Expand Down
10 changes: 2 additions & 8 deletions library/std/src/num/f32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,9 +1091,7 @@ impl f32 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn asinh(self) -> f32 {
let ax = self.abs();
let ix = 1.0 / ax;
(ax + (ax / (Self::hypot(1.0, ix) + ix))).ln_1p().copysign(self)
cmath::asinhf(self)
}

/// Inverse hyperbolic cosine function.
Expand All @@ -1119,11 +1117,7 @@ impl f32 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn acosh(self) -> f32 {
if self < 1.0 {
Self::NAN
} else {
(self + ((self - 1.0).sqrt() * (self + 1.0).sqrt())).ln()
}
cmath::acoshf(self)
}

/// Inverse hyperbolic tangent function.
Expand Down
10 changes: 2 additions & 8 deletions library/std/src/num/f64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,9 +1091,7 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn asinh(self) -> f64 {
let ax = self.abs();
let ix = 1.0 / ax;
(ax + (ax / (Self::hypot(1.0, ix) + ix))).ln_1p().copysign(self)
cmath::asinh(self)
}

/// Inverse hyperbolic cosine function.
Expand All @@ -1119,11 +1117,7 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn acosh(self) -> f64 {
if self < 1.0 {
Self::NAN
} else {
(self + ((self - 1.0).sqrt() * (self + 1.0).sqrt())).ln()
}
cmath::acosh(self)
}

/// Inverse hyperbolic tangent function.
Expand Down
16 changes: 16 additions & 0 deletions library/std/src/sys/cmath.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
// or by `compiler-builtins` on unsupported platforms.
unsafe extern "C" {
pub safe fn acos(n: f64) -> f64;
pub safe fn acosh(n: f64) -> f64;
pub safe fn asin(n: f64) -> f64;
pub safe fn asinh(n: f64) -> f64;
pub safe fn atan(n: f64) -> f64;
pub safe fn atan2(a: f64, b: f64) -> f64;
pub safe fn cosh(n: f64) -> f64;
Expand All @@ -30,7 +32,9 @@ unsafe extern "C" {
pub safe fn erfcf(n: f32) -> f32;

pub safe fn acosf128(n: f128) -> f128;
pub safe fn acoshf128(n: f128) -> f128;
pub safe fn asinf128(n: f128) -> f128;
pub safe fn asinhf128(n: f128) -> f128;
pub safe fn atanf128(n: f128) -> f128;
pub safe fn atan2f128(a: f128, b: f128) -> f128;
pub safe fn cbrtf128(n: f128) -> f128;
Expand All @@ -57,6 +61,16 @@ cfg_select! {
f64::acos(n as f64) as f32
}

#[inline]
pub fn acoshf(n: f32) -> f32 {
f64::acosh(n as f64) as f32
}

#[inline]
pub fn asinhf(n: f32) -> f32 {
f64::asinh(n as f64) as f32
}

#[inline]
pub fn asinf(n: f32) -> f32 {
f64::asin(n as f64) as f32
Expand Down Expand Up @@ -95,7 +109,9 @@ cfg_select! {
_ => {
unsafe extern "C" {
pub safe fn acosf(n: f32) -> f32;
pub safe fn acoshf(n: f32) -> f32;
pub safe fn asinf(n: f32) -> f32;
pub safe fn asinhf(n: f32) -> f32;
pub safe fn atan2f(a: f32, b: f32) -> f32;
pub safe fn atanf(n: f32) -> f32;
pub safe fn coshf(n: f32) -> f32;
Expand Down
8 changes: 8 additions & 0 deletions src/tools/miri/src/shims/math.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
| "acosf"
| "asinf"
| "atanf"
| "acoshf"
| "asinhf"
| "log1pf"
| "expm1f"
| "tgammaf"
Expand All @@ -52,6 +54,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
"acosf" => f_host.acos(),
"asinf" => f_host.asin(),
"atanf" => f_host.atan(),
"acoshf" => f_host.acosh(),
"asinhf" => f_host.asinh(),
"log1pf" => f_host.ln_1p(),
"expm1f" => f_host.exp_m1(),
"tgammaf" => f_host.gamma(),
Expand Down Expand Up @@ -113,6 +117,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
| "acos"
| "asin"
| "atan"
| "acosh"
| "asinh"
| "log1p"
| "expm1"
| "tgamma"
Expand All @@ -135,6 +141,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
"acos" => f_host.acos(),
"asin" => f_host.asin(),
"atan" => f_host.atan(),
"acosh" => f_host.acosh(),
"asinh" => f_host.asinh(),
"log1p" => f_host.ln_1p(),
"expm1" => f_host.exp_m1(),
"tgamma" => f_host.gamma(),
Expand Down
4 changes: 2 additions & 2 deletions src/tools/miri/tests/pass/float.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,9 +1607,9 @@ fn test_non_determinism() {
check_nondet(|| 1.0f32.sinh());
check_nondet(|| 1.0f32.cosh());
check_nondet(|| 1.0f32.tanh());
check_nondet(|| 1.0f32.asinh());
check_nondet(|| 2.0f32.acosh());
}
check_nondet(|| 1.0f32.asinh());
check_nondet(|| 2.0f32.acosh());
check_nondet(|| 0.5f32.atanh());
check_nondet(|| 5.0f32.gamma());
check_nondet(|| 5.0f32.ln_gamma());
Expand Down
Loading