diff options
Diffstat (limited to 'libc/src')
-rw-r--r-- | libc/src/__support/math/CMakeLists.txt | 18 | ||||
-rw-r--r-- | libc/src/__support/math/exp2f.h (renamed from libc/src/math/generic/exp2f_impl.h) | 22 | ||||
-rw-r--r-- | libc/src/math/generic/CMakeLists.txt | 22 | ||||
-rw-r--r-- | libc/src/math/generic/exp2f.cpp | 4 | ||||
-rw-r--r-- | libc/src/math/generic/powf.cpp | 5 | ||||
-rw-r--r-- | libc/src/sys/resource/linux/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libc/src/sys/resource/linux/getrlimit.cpp | 5 | ||||
-rw-r--r-- | libc/src/sys/resource/linux/setrlimit.cpp | 5 |
8 files changed, 42 insertions, 41 deletions
diff --git a/libc/src/__support/math/CMakeLists.txt b/libc/src/__support/math/CMakeLists.txt index 4130fdf..203ebb4 100644 --- a/libc/src/__support/math/CMakeLists.txt +++ b/libc/src/__support/math/CMakeLists.txt @@ -736,6 +736,24 @@ add_header_library( ) add_header_library( + exp2f + HDRS + exp2f.h + DEPENDS + .exp10f_utils + libc.src.__support.FPUtil.except_value_utils + libc.src.__support.FPUtil.fenv_impl + libc.src.__support.FPUtil.fp_bits + libc.src.__support.FPUtil.multiply_add + libc.src.__support.FPUtil.nearest_integer + libc.src.__support.FPUtil.polyeval + libc.src.__support.FPUtil.rounding_mode + libc.src.__support.macros.optimization + libc.src.__support.common + libc.src.errno.errno +) + +add_header_library( exp10 HDRS exp10.h diff --git a/libc/src/math/generic/exp2f_impl.h b/libc/src/__support/math/exp2f.h index b85bb15..ef2aad0 100644 --- a/libc/src/math/generic/exp2f_impl.h +++ b/libc/src/__support/math/exp2f.h @@ -1,4 +1,4 @@ -//===-- Single-precision 2^x function -------------------------------------===// +//===-- Implementation header for exp2f -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,9 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIBC_SRC_MATH_GENERIC_EXP2F_IMPL_H -#define LLVM_LIBC_SRC_MATH_GENERIC_EXP2F_IMPL_H +#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_EXP2F_H +#define LLVM_LIBC_SRC___SUPPORT_MATH_EXP2F_H +#include "exp10f_utils.h" #include "src/__support/FPUtil/FEnvImpl.h" #include "src/__support/FPUtil/FPBits.h" #include "src/__support/FPUtil/PolyEval.h" @@ -20,12 +21,12 @@ #include "src/__support/macros/config.h" #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY #include "src/__support/macros/properties/cpu_features.h" -#include "src/__support/math/exp10f_utils.h" namespace LIBC_NAMESPACE_DECL { -namespace generic { -LIBC_INLINE float exp2f(float x) { +namespace math { + +LIBC_INLINE static constexpr float exp2f(float x) { using FPBits = typename fputil::FPBits<float>; FPBits xbits(x); @@ -120,8 +121,8 @@ LIBC_INLINE float exp2f(float x) { // of 2^mid. // kf = (hi + mid) * 2^5 = round(x * 2^5) - float kf; - int k; + float kf = 0; + int k = 0; #ifdef LIBC_TARGET_CPU_HAS_NEAREST_INT kf = fputil::nearest_integer(x * 32.0f); k = static_cast<int>(kf); @@ -161,7 +162,8 @@ LIBC_INLINE float exp2f(float x) { return static_cast<float>(fputil::multiply_add(p, dx_sq * mh, c1 * mh)); } -} // namespace generic +} // namespace math + } // namespace LIBC_NAMESPACE_DECL -#endif // LLVM_LIBC_SRC_MATH_GENERIC_EXP2F_IMPL_H +#endif // LLVM_LIBC_SRC___SUPPORT_MATH_EXP2F_H diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt index 28ea475..5738fe8 100644 --- a/libc/src/math/generic/CMakeLists.txt +++ b/libc/src/math/generic/CMakeLists.txt @@ -1451,24 +1451,6 @@ add_entrypoint_object( libc.src.__support.math.exp2 ) -add_header_library( - exp2f_impl - HDRS - exp2f_impl.h - DEPENDS - libc.src.__support.FPUtil.except_value_utils - libc.src.__support.FPUtil.fenv_impl - libc.src.__support.FPUtil.fp_bits - libc.src.__support.FPUtil.multiply_add - libc.src.__support.FPUtil.nearest_integer - libc.src.__support.FPUtil.polyeval - libc.src.__support.FPUtil.rounding_mode - libc.src.__support.macros.optimization - libc.src.__support.math.exp10f_utils - libc.src.__support.common - libc.src.errno.errno -) - add_entrypoint_object( exp2f SRCS @@ -1476,7 +1458,7 @@ add_entrypoint_object( HDRS ../exp2f.h DEPENDS - .exp2f_impl + libc.src.__support.math.exp2f ) add_entrypoint_object( @@ -1659,8 +1641,8 @@ add_entrypoint_object( HDRS ../powf.h DEPENDS - .exp2f_impl libc.src.__support.math.exp10f + libc.src.__support.math.exp2f libc.src.__support.CPP.bit libc.src.__support.FPUtil.fenv_impl libc.src.__support.FPUtil.fp_bits diff --git a/libc/src/math/generic/exp2f.cpp b/libc/src/math/generic/exp2f.cpp index 60d6510..3117f73 100644 --- a/libc/src/math/generic/exp2f.cpp +++ b/libc/src/math/generic/exp2f.cpp @@ -9,10 +9,10 @@ #include "src/math/exp2f.h" #include "src/__support/common.h" // for LLVM_LIBC_FUNCTION #include "src/__support/macros/config.h" -#include "src/math/generic/exp2f_impl.h" +#include "src/__support/math/exp2f.h" namespace LIBC_NAMESPACE_DECL { -LLVM_LIBC_FUNCTION(float, exp2f, (float x)) { return generic::exp2f(x); } +LLVM_LIBC_FUNCTION(float, exp2f, (float x)) { return math::exp2f(x); } } // namespace LIBC_NAMESPACE_DECL diff --git a/libc/src/math/generic/powf.cpp b/libc/src/math/generic/powf.cpp index 12246e9..dd2b6aa 100644 --- a/libc/src/math/generic/powf.cpp +++ b/libc/src/math/generic/powf.cpp @@ -20,10 +20,9 @@ #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY #include "src/__support/math/common_constants.h" // Lookup tables EXP_M1 and EXP_M2. #include "src/__support/math/exp10f.h" // Speedup for powf(10, y) = exp10f(y) +#include "src/__support/math/exp2f.h" // Speedup for powf(2, y) = exp2f(y) #include "src/__support/math/exp_constants.h" -#include "exp2f_impl.h" // Speedup for powf(2, y) = exp2f(y) - namespace LIBC_NAMESPACE_DECL { using fputil::DoubleDouble; @@ -779,7 +778,7 @@ LLVM_LIBC_FUNCTION(float, powf, (float x, float y)) { #ifndef LIBC_MATH_HAS_SKIP_ACCURATE_PASS case 0x4000'0000: // x = 2.0f // pow(2, y) = exp2(y) - return generic::exp2f(y); + return math::exp2f(y); case 0x4120'0000: // x = 10.0f // pow(10, y) = exp10(y) return math::exp10f(y); diff --git a/libc/src/sys/resource/linux/CMakeLists.txt b/libc/src/sys/resource/linux/CMakeLists.txt index 19f3901..9f0fdad 100644 --- a/libc/src/sys/resource/linux/CMakeLists.txt +++ b/libc/src/sys/resource/linux/CMakeLists.txt @@ -5,6 +5,7 @@ add_entrypoint_object( HDRS ../getrlimit.h DEPENDS + libc.hdr.types.struct_rlimit libc.include.sys_resource libc.include.sys_syscall libc.src.__support.OSUtil.osutil @@ -18,6 +19,7 @@ add_entrypoint_object( HDRS ../setrlimit.h DEPENDS + libc.hdr.types.struct_rlimit libc.include.sys_resource libc.include.sys_syscall libc.src.__support.OSUtil.osutil diff --git a/libc/src/sys/resource/linux/getrlimit.cpp b/libc/src/sys/resource/linux/getrlimit.cpp index d272134..a3234eb 100644 --- a/libc/src/sys/resource/linux/getrlimit.cpp +++ b/libc/src/sys/resource/linux/getrlimit.cpp @@ -8,13 +8,12 @@ #include "src/sys/resource/getrlimit.h" +#include "hdr/types/struct_rlimit.h" #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/__support/common.h" - #include "src/__support/libc_errno.h" #include "src/__support/macros/config.h" -#include <sys/resource.h> // For struct rlimit -#include <sys/syscall.h> // For syscall numbers. +#include <sys/syscall.h> // For syscall numbers. namespace LIBC_NAMESPACE_DECL { diff --git a/libc/src/sys/resource/linux/setrlimit.cpp b/libc/src/sys/resource/linux/setrlimit.cpp index 300bad7..e2c2b37 100644 --- a/libc/src/sys/resource/linux/setrlimit.cpp +++ b/libc/src/sys/resource/linux/setrlimit.cpp @@ -8,13 +8,12 @@ #include "src/sys/resource/setrlimit.h" +#include "hdr/types/struct_rlimit.h" #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/__support/common.h" - #include "src/__support/libc_errno.h" #include "src/__support/macros/config.h" -#include <sys/resource.h> // For struct rlimit -#include <sys/syscall.h> // For syscall numbers. +#include <sys/syscall.h> // For syscall numbers. namespace LIBC_NAMESPACE_DECL { |