Migrate to fputil::cast

Author: overmighty

libc/src/math/generic/CMakeLists.txt

@@ -5316,6 +5316,7 @@ add_header_library(
     expxf16.h
   DEPENDS
     libc.src.__support.CPP.array
+    libc.src.__support.FPUtil.cast
     libc.src.__support.FPUtil.fp_bits
     libc.src.__support.FPUtil.multiply_add
     libc.src.__support.FPUtil.nearest_integer

libc/src/math/generic/expxf16.h

@@ -12,6 +12,7 @@
 #include "src/__support/CPP/array.h"
 #include "src/__support/FPUtil/FPBits.h"
 #include "src/__support/FPUtil/PolyEval.h"
+#include "src/__support/FPUtil/cast.h"
 #include "src/__support/FPUtil/multiply_add.h"
 #include "src/__support/FPUtil/nearest_integer.h"
 #include "src/__support/macros/attributes.h"
@@ -279,11 +280,11 @@ template <bool IsSinh> LIBC_INLINE float16 eval_sinh_or_cosh(float16 x) {
   // sinh(x) = lo * (0.5 * P_odd * (2^(hi + mid) + 2^(-(hi + mid)))) +
   //                (0.5 * P_even * (2^(hi + mid) - 2^(-(hi + mid))))
   if constexpr (IsSinh)
-    return static_cast<float16>(fputil::multiply_add(
+    return fputil::cast<float16>(fputil::multiply_add(
         lo, half_p_odd * exp2_hi_mid_sum, half_p_even * exp2_hi_mid_diff));
   // cosh(x) = lo * (0.5 * P_odd * (2^(hi + mid) - 2^(-(hi + mid)))) +
   //                (0.5 * P_even * (2^(hi + mid) + 2^(-(hi + mid))))
-  return static_cast<float16>(fputil::multiply_add(
+  return fputil::cast<float16>(fputil::multiply_add(
       lo, half_p_odd * exp2_hi_mid_diff, half_p_even * exp2_hi_mid_sum));
 }
 

libc/test/src/math/smoke/CMakeLists.txt

@@ -3727,6 +3727,7 @@ add_fp_unittest(
     libc.hdr.fenv_macros
     libc.src.errno.errno
     libc.src.math.coshf16
+    libc.src.__support.FPUtil.cast
 )
 
 add_fp_unittest(
@@ -3752,6 +3753,7 @@ add_fp_unittest(
     libc.hdr.fenv_macros
     libc.src.errno.errno
     libc.src.math.sinhf16
+    libc.src.__support.FPUtil.cast
 )
 
 add_fp_unittest(

libc/test/src/math/smoke/coshf16_test.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "hdr/fenv_macros.h"
+#include "src/__support/FPUtil/cast.h"
 #include "src/errno/libc_errno.h"
 #include "src/math/coshf16.h"
 #include "test/UnitTest/FPMatcher.h"
@@ -29,11 +30,11 @@ TEST_F(LlvmLibcCoshf16Test, SpecialNumbers) {
   EXPECT_FP_EQ_ALL_ROUNDING(inf, LIBC_NAMESPACE::coshf16(neg_inf));
   EXPECT_MATH_ERRNO(0);
 
-  EXPECT_FP_EQ_ALL_ROUNDING(static_cast<float16>(1.0),
+  EXPECT_FP_EQ_ALL_ROUNDING(LIBC_NAMESPACE::fputil::cast<float16>(1.0),
                             LIBC_NAMESPACE::coshf16(zero));
   EXPECT_MATH_ERRNO(0);
 
-  EXPECT_FP_EQ_ALL_ROUNDING(static_cast<float16>(1.0),
+  EXPECT_FP_EQ_ALL_ROUNDING(LIBC_NAMESPACE::fputil::cast<float16>(1.0),
                             LIBC_NAMESPACE::coshf16(neg_zero));
   EXPECT_MATH_ERRNO(0);
 }
@@ -50,7 +51,7 @@ TEST_F(LlvmLibcCoshf16Test, Overflow) {
   EXPECT_MATH_ERRNO(ERANGE);
 
   // round(acosh(2^16), HP, RU);
-  float16 x = static_cast<float16>(0x1.794p+3);
+  float16 x = LIBC_NAMESPACE::fputil::cast<float16>(0x1.794p+3);
 
   EXPECT_FP_EQ_WITH_EXCEPTION_ROUNDING_NEAREST(inf, LIBC_NAMESPACE::coshf16(x),
                                                FE_OVERFLOW | FE_INEXACT);
@@ -69,7 +70,7 @@ TEST_F(LlvmLibcCoshf16Test, Overflow) {
   EXPECT_MATH_ERRNO(0);
 
   // round(-acosh(2^16), HP, RD);
-  x = static_cast<float16>(-0x1.794p+3);
+  x = LIBC_NAMESPACE::fputil::cast<float16>(-0x1.794p+3);
 
   EXPECT_FP_EQ_WITH_EXCEPTION_ROUNDING_NEAREST(inf, LIBC_NAMESPACE::coshf16(x),
                                                FE_OVERFLOW | FE_INEXACT);

libc/test/src/math/smoke/sinhf16_test.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "hdr/fenv_macros.h"
+#include "src/__support/FPUtil/cast.h"
 #include "src/errno/libc_errno.h"
 #include "src/math/sinhf16.h"
 #include "test/UnitTest/FPMatcher.h"
@@ -48,7 +49,7 @@ TEST_F(LlvmLibcSinhf16Test, Overflow) {
   EXPECT_MATH_ERRNO(ERANGE);
 
   // round(asinh(2^16), HP, RU);
-  float16 x = static_cast<float16>(0x1.794p+3);
+  float16 x = LIBC_NAMESPACE::fputil::cast<float16>(0x1.794p+3);
 
   EXPECT_FP_EQ_WITH_EXCEPTION_ROUNDING_NEAREST(inf, LIBC_NAMESPACE::sinhf16(x),
                                                FE_OVERFLOW | FE_INEXACT);
@@ -67,7 +68,7 @@ TEST_F(LlvmLibcSinhf16Test, Overflow) {
   EXPECT_MATH_ERRNO(0);
 
   // round(asinh(-2^16), HP, RD);
-  x = static_cast<float16>(-0x1.794p+3);
+  x = LIBC_NAMESPACE::fputil::cast<float16>(-0x1.794p+3);
 
   EXPECT_FP_EQ_WITH_EXCEPTION_ROUNDING_NEAREST(
       neg_inf, LIBC_NAMESPACE::sinhf16(x), FE_OVERFLOW | FE_INEXACT);