Merge branch 'cpp_double_fp_backend' into develop

Author: ckormanyos

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
       - BOOST_LIBRARY=multiprecision
       - CXX_STANDARD=gnu++11
     docker:
-      - image: gcc:7
+      - image: cimg/base:current
     steps:
       - checkout
       - run:
@@ -24,8 +24,8 @@ jobs:
       - run:
           name: install pre dependencies
           command: |
-            apt-get update -yqq
-            apt-get install git xsltproc docbook-xsl docbook-xml -y
+            sudo apt-get update -yqq
+            sudo apt-get install git xsltproc docbook-xsl docbook-xml -y
       - run:
           name: Initializing git repo for boost
           command: |
@@ -46,11 +46,11 @@ jobs:
       - run:
           name: Building inspect
           command: |
-            cd $BOOST/boost/tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin
+            cd $BOOST/boost/tools/inspect && ../../b2 toolset=gcc variant=release dist-bin
       - run:
           name: Building docs
           command: |
-            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release
+            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2
       - run:
           name: Running Inspect
           command: |

build.jam

@@ -0,0 +1,33 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/integer//boost_integer
+    /boost/lexical_cast//boost_lexical_cast
+    /boost/math//boost_math
+    /boost/predef//boost_predef
+    /boost/random//boost_random
+    /boost/throw_exception//boost_throw_exception ;
+
+project /boost/multiprecision
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_multiprecision : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_multiprecision test example performance ]
+    ;
+
+call-if : boost-library multiprecision
+    ;
+
+use-project /boost/multiprecision/config : config ;
+

config/Jamfile.v2

@@ -1,32 +1,33 @@
 # copyright John Maddock 2008
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt.
 
+import-search /boost/config/checks ;
+
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 local gmp_path = [ modules.peek : GMP_PATH ] ;
 local mpfr_path = [ modules.peek : MPFR_PATH ] ;
 local mpfi_path = [ modules.peek : MPFI_PATH ] ;
 local tommath_path = [ modules.peek : TOMMATH_PATH ] ;
 
-project : requirements 
-   <include>$(gmp_path) 
-   <include>$(gmp_path)/mpfr 
-   <include>$(gmp_path)/gmpfrxx 
+project : requirements
+   <include>$(gmp_path)
+   <include>$(gmp_path)/mpfr
+   <include>$(gmp_path)/gmpfrxx
    <include>$(mpfr_path)
    <include>$(mpfi_path)
    <include>$(mpfi_path)/src
    <include>$(tommath_path)
-   <include>../../.. 
-   <search>$(gmp_path) 
-   <search>$(mpfr_path) 
+   <search>$(gmp_path)
+   <search>$(mpfr_path)
    <search>$(mpfr_path)/build.vc10/lib/Win32/Debug
-   <search>$(tommath_path) 
-   <search>$(mpfi_path) 
-   <search>$(mpfi_path)/src 
+   <search>$(tommath_path)
+   <search>$(mpfi_path)
+   <search>$(mpfi_path)/src
    # We set these to make it easier to set up and test GMP and MPFR under Win32:
    <toolset>msvc:<runtime-link>static
    <toolset>msvc:<link>static

doc/Jamfile.v2

@@ -17,7 +17,7 @@ boostbook standalone
     :
         # Path for links to Boost:
         <xsl:param>boost.root=../../../..
-        
+
         # Some general style settings:
         <xsl:param>table.footnote.number.format=1
         <xsl:param>footnote.number.format=1
@@ -42,8 +42,8 @@ boostbook standalone
         # extending 'standard' BOOST_ROOT/doc/src/boostbook.css with
         # @import url('../../../../doc/src/boostbook.css');
         # in location multiprecision/doc/html/multiprecision.css
-    
-       
+
+
         # PDF Options:
         # TOC Generation: this is needed for FOP-0.9 and later:
         <xsl:param>fop1.extensions=0
@@ -65,7 +65,7 @@ boostbook standalone
         # default PNG graphics are awful in PDF form,
         # better use SVGs instead:
         <format>pdf:<xsl:param>admon.graphics.extension=".svg"
-        <format>pdf:<xsl:param>use.role.for.mediaobject=1 
+        <format>pdf:<xsl:param>use.role.for.mediaobject=1
         <format>pdf:<xsl:param>preferred.mediaobject.role=print
         <format>pdf:<xsl:param>img.src.path=$(images_location)/
         <format>pdf:<xsl:param>draft.mode="no"
@@ -76,19 +76,19 @@ boostbook standalone
 #  .SVG files are roughly twice the .png size and so a bit gross.
 # This also changes the admonitions icons.
 #       <format>html:<xsl:param>admon.graphics.extension=".svg"
-        <format>html:<xsl:param>use.role.for.mediaobject=1 
+        <format>html:<xsl:param>use.role.for.mediaobject=1
         <format>html:<xsl:param>preferred.mediaobject.role=print
      #   <format>html:<xsl:param>img.src.path=$(images_location)/ isn't right for html.
         <format>html:<xsl:param>draft.mode="no"
         <format>html:<xsl:param>boost.url.prefix=http\://www.boost.org/doc/libs/release/libs/multiprecision/doc/html
-        
+
         # Index generation:
         <auto-index>on
         <auto-index-script>$(here)/index.idx
-        <auto-index-prefix>$(here)/../../.. 
+        <auto-index-prefix>$(here)/../include
         <auto-index-verbose>on
         <format>html:<auto-index-internal>on
-        <quickbook-define>enable_index 
+        <quickbook-define>enable_index
         <format>pdf:<xsl:param>index.on.type=1
     ;
 

doc/multiprecision.qbk

@@ -60,7 +60,7 @@
 [template mpf_class[] [@http://gmplib.org/manual/C_002b_002b-Interface-Floats.html#C_002b_002b-Interface-Floats mpf_class]]
 [template mpfr_class[] [@http://math.berkeley.edu/~wilken/code/gmpfrxx/ mpfr_class]]
 [template mpreal[] [@http://www.holoborodko.com/pavel/mpfr/ mpreal]]
-[template mpir[] [@http://mpir.org/ MPIR]]
+[template mpir[] [@https://github.com/wbhart/mpir/ MPIR]]
 [template tommath[] [@http://libtom.net libtommath]]
 [template quadmath[] [@http://gcc.gnu.org/onlinedocs/libquadmath/ libquadmath]]
 

example/Jamfile.v2

@@ -11,7 +11,8 @@
 import testing ;
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import-search /boost/config/checks ;
+import config : requires ;
 
 local ntl-path = [ modules.peek : NTL_PATH ] ;
 local gmp_path = [ modules.peek : GMP_PATH ] ;
@@ -21,16 +22,16 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ;
 
 project
     : requirements
+        <library>/boost/multiprecision//boost_multiprecision
+
      <include>$(gmp_path)
      <include>$(gmp_path)/mpfr
      <include>$(gmp_path)/gmpfrxx
      <include>$(mpfr_path)
      <include>$(mpfi_path)
      <include>$(mpfi_path)/src
      <include>$(tommath_path)
-     <include>../include
-     <include>../../..
-     
+
       <toolset>gcc:<cxxflags>-Wno-missing-braces
       <toolset>darwin:<cxxflags>-Wno-missing-braces
       <toolset>acc:<cxxflags>+W2068,2461,2236,4070
@@ -51,7 +52,7 @@ project
       <toolset>msvc:<cxxflags>/wd4701
       <toolset>msvc:<cxxflags>/wd4305
       <toolset>clang:<link>static
-      [ requires  
+      [ requires
          cxx11_rvalue_references cxx11_template_aliases cxx11_hdr_array cxx11_allocator cxx11_constexpr cxx11_explicit_conversion_operators cxx11_ref_qualifiers
          cxx11_hdr_functional cxx11_variadic_templates cxx11_user_defined_literals cxx11_decltype cxx11_static_assert cxx11_defaulted_functions
          cxx11_noexcept cxx11_ref_qualifiers cxx11_user_defined_literals cxx11_hdr_type_traits
@@ -95,7 +96,7 @@ test-suite examples :
       [ run integer_examples.cpp no_eh_eg_support ]
       [ run logged_adaptor.cpp no_eh_eg_support mpfi mpfr gmp :  :  : [ check-target-builds ../config//has_mpfi : : <build>no ] ]
       [ run mixed_integer_arithmetic.cpp no_eh_eg_support ]
-      [ run numeric_limits_snips.cpp no_eh_eg_support /boost//test_exec_monitor : : : [ requires cxx11_numeric_limits ]  [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
+      [ run numeric_limits_snips.cpp no_eh_eg_support /boost/test//boost_test_exec_monitor : : : [ requires cxx11_numeric_limits ]  [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
       [ run random_snips.cpp gmp no_eh_eg_support : : : [ requires cxx11_explicit_conversion_operators ] [ check-target-builds ../config//has_gmp : : <build>no ] ]
       [ run safe_prime.cpp no_eh_eg_support ]
 
@@ -104,7 +105,7 @@ test-suite examples :
       [ run mpfr_snips.cpp mpfr gmp no_eh_eg_support : : : [ check-target-builds ../config//has_mpfr : : <build>no ] ]
       [ run tommath_snips.cpp $(TOMMATH) no_eh_eg_support : : : [ check-target-builds ../config//has_tommath : : <build>no ] ]
       [ compile constexpr_float_arithmetic_examples.cpp : [ requires cxx14_constexpr cxx17_if_constexpr ] ]
-      
+
       [ run big_seventh.cpp no_eh_eg_support ]
 
       [ run exercise_threading_log_agm.cpp : : : <define>BOOST_MULTIPRECISION_EXERCISE_THREADING_BACKEND_TYPE=101 release [ requires cxx11_hdr_atomic cxx11_hdr_thread ] : exercise_threading_log_agm_cpp_dec_float ]

include/boost/multiprecision/cpp_bin_float.hpp

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////
-//  Copyright 2013 - 2022 John Maddock.
-//  Copyright 2022 Christopher Kormanyos.
+//  Copyright 2013 - 2025 John Maddock.
+//  Copyright 2022 - 2025 Christopher Kormanyos.
 //  Distributed under the Boost Software License,
 //  Version 1.0. (See accompanying file LICENSE_1_0.txt
 //  or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -1626,15 +1626,34 @@ inline void convert_to_unsigned_int(I* res, const cpp_bin_float<Digits, DigitBas
    }
    typename cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::rep_type                                                                                                                                                              man(arg.bits());
    using shift_type = typename std::conditional<sizeof(typename cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::exponent_type) < sizeof(int), int, typename cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::exponent_type>::type;
-   shift_type                                                                                                                                                                                                                                        shift = (shift_type)cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - 1 - arg.exponent();
-   if (shift > (shift_type)cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - 1)
+
+   const shift_type shift = (shift_type)cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - 1 - arg.exponent();
+
+   if (arg.sign())
+   {
+      using si_type = typename boost::multiprecision::detail::make_signed<I>::type;
+
+      si_type val;
+
+      convert_to_signed_int(&val, arg);
+
+      *res = static_cast<I>(val);
+
+      return;
+   }
+   else if (shift > (shift_type)cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - 1)
    {
       *res = 0;
       return;
    }
+   else if (arg.compare(max_val) >= 0)
+   {
+      *res = max_val;
+      return;
+   }
    else if (shift < 0)
    {
-      if (cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - shift <= digits)
+      if ((shift_type)cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - shift <= (shift_type)digits)
       {
          // We have more bits in ulong_long_type than the float, so it's OK to left shift:
          eval_convert_to(res, man);
@@ -1644,7 +1663,7 @@ inline void convert_to_unsigned_int(I* res, const cpp_bin_float<Digits, DigitBas
       *res = max_val;
       return;
    }
-   eval_right_shift(man, shift);
+   eval_right_shift(man, static_cast<unsigned>(shift));
    eval_convert_to(res, man);
 }
 
@@ -2035,18 +2054,18 @@ inline void eval_ceil(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE
    }
    bool fractional = (shift_type)eval_lsb(arg.bits()) < shift;
    res             = arg;
-   eval_right_shift(res.bits(), shift);
+   eval_right_shift(res.bits(), static_cast<unsigned>(shift));
    if (fractional && !res.sign())
    {
       eval_increment(res.bits());
-      if ((std::ptrdiff_t)eval_msb(res.bits()) != cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count - 1 - shift)
+      if ((std::ptrdiff_t)eval_msb(res.bits()) != (std::ptrdiff_t)(static_cast<shift_type>(cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinE, MaxE>::bit_count) - 1 - shift))
       {
          // Must have extended result by one bit in the increment:
          --shift;
          ++res.exponent();
       }
    }
-   eval_left_shift(res.bits(), shift);
+   eval_left_shift(res.bits(), static_cast<unsigned>(shift));
 }
 
 template <unsigned D1, backends::digit_base_type B1, class A1, class E1, E1 M1, E1 M2>

include/boost/multiprecision/cpp_dec_float.hpp

@@ -1713,7 +1713,7 @@ long long cpp_dec_float<Digits10, ExponentType, Allocator>::extract_signed_long_
       // See https://svn.boost.org/trac/boost/ticket/9740.
       //
       long long sval = static_cast<long long>(val - 1);
-      sval                       = -sval;
+      sval           = -sval;
       --sval;
       return sval;
    }
@@ -1749,14 +1749,14 @@ unsigned long long cpp_dec_float<Digits10, ExponentType, Allocator>::extract_uns
    else
    {
       // Extract the data into an unsigned long long value.
-      val = static_cast<unsigned long long>(xn.data[0]);
+      val = static_cast<unsigned long long>(xn.data[std::size_t { 0U }]);
 
       const std::int32_t imax = (std::min)(static_cast<std::int32_t>(static_cast<std::int32_t>(xn.exp) / cpp_dec_float_elem_digits10), static_cast<std::int32_t>(cpp_dec_float_elem_number - static_cast<std::int32_t>(1)));
 
       for (std::int32_t i = static_cast<std::int32_t>(1); i <= imax; i++)
       {
          val *= static_cast<unsigned long long>(cpp_dec_float_elem_mask);
-         val += static_cast<unsigned long long>(xn.data[i]);
+         val += static_cast<unsigned long long>(xn.data[static_cast<std::size_t>(i)]);
       }
    }
 

include/boost/multiprecision/cpp_int/bitwise.hpp

@@ -700,7 +700,7 @@ BOOST_MP_FORCEINLINE BOOST_MP_CXX14_CONSTEXPR typename std::enable_if<is_trivial
 eval_left_shift(cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>& result, T s) noexcept((is_non_throwing_cpp_int<cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1> >::value))
 {
    is_valid_bitwise_op(result, typename cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>::checked_type());
-   *result.limbs() = detail::checked_left_shift(*result.limbs(), s, typename cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>::checked_type());
+   *result.limbs() = detail::checked_left_shift(*result.limbs(), static_cast<unsigned long long>(s), typename cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>::checked_type());
    result.normalize();
 }
 
@@ -710,7 +710,7 @@ eval_right_shift(cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Alloca
 {
    // Nothing to check here... just make sure we don't invoke undefined behavior:
    is_valid_bitwise_op(result, typename cpp_int_backend<MinBits1, MaxBits1, SignType1, Checked1, Allocator1>::checked_type());
-   *result.limbs() = (static_cast<unsigned>(s) >= sizeof(*result.limbs()) * CHAR_BIT) ? 0 : (result.sign() ? ((--*result.limbs()) >> s) + 1 : *result.limbs() >> s);
+   *result.limbs() = (static_cast<std::size_t>(s) >= static_cast<std::size_t>(sizeof(*result.limbs()) * CHAR_BIT)) ? 0 : (result.sign() ? ((--*result.limbs()) >> s) + 1 : *result.limbs() >> s);
    if (result.sign() && (*result.limbs() == 0))
       result = static_cast<signed_limb_type>(-1);
 }