public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Patrick Palka <ppalka@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Patrick Palka <ppalka@redhat.com>
Subject: [PATCH 5/6] libstdc++: Use fast_float in std::from_chars for binary32/64
Date: Sun, 16 Jan 2022 13:06:51 -0500	[thread overview]
Message-ID: <20220116180652.3694791-5-ppalka@redhat.com> (raw)
In-Reply-To: <20220116180652.3694791-1-ppalka@redhat.com>

This makes our std::from_chars implementation use fast_float for parsing
chars_format::scientific/fixed/general parsing into binary32/64 values.
For other floating-point formats we still use the fallback implementation
that goes through the strtod family of functions.

libstdc++-v3/ChangeLog:

	* src/c++17/floating_from_chars.cc: (USE_LIB_FAST_FLOAT):
	Conditionally define, and use it to conditionally include
	fast_float.
	(from_chars): Use fast_float for float and double when
	USE_LIB_FAST_FLOAT.
---
 libstdc++-v3/src/c++17/floating_from_chars.cc | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/src/c++17/floating_from_chars.cc b/libstdc++-v3/src/c++17/floating_from_chars.cc
index b186da9a955..c340eb18ea8 100644
--- a/libstdc++-v3/src/c++17/floating_from_chars.cc
+++ b/libstdc++-v3/src/c++17/floating_from_chars.cc
@@ -35,6 +35,7 @@
 #include <string>
 #include <memory_resource>
 #include <cfenv>
+#include <cfloat>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
@@ -53,6 +54,18 @@
 extern "C" __ieee128 __strtoieee128(const char*, char**);
 #endif
 
+#if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
+# define USE_LIB_FAST_FLOAT 1
+#endif
+
+#if USE_LIB_FAST_FLOAT
+# define FASTFLOAT_DEBUG_ASSERT __glibcxx_assert
+namespace
+{
+# include "fast_float/fast_float.h"
+} // anon namespace
+#endif
+
 #if _GLIBCXX_HAVE_USELOCALE
 namespace std _GLIBCXX_VISIBILITY(default)
 {
@@ -775,8 +788,12 @@ from_chars(const char* first, const char* last, float& value,
 #if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
   if (fmt == chars_format::hex)
     return __floating_from_chars_hex(first, last, value);
-#endif
-
+  else
+    {
+      static_assert(USE_LIB_FAST_FLOAT);
+      return fast_float::from_chars(first, last, value, fmt);
+    }
+#else
   errc ec = errc::invalid_argument;
 #if _GLIBCXX_USE_CXX11_ABI
   buffer_resource mr;
@@ -797,6 +814,7 @@ from_chars(const char* first, const char* last, float& value,
       fmt = chars_format{};
     }
   return make_result(first, len, fmt, ec);
+#endif
 }
 
 from_chars_result
@@ -806,8 +824,12 @@ from_chars(const char* first, const char* last, double& value,
 #if _GLIBCXX_FLOAT_IS_IEEE_BINARY32 && _GLIBCXX_DOUBLE_IS_IEEE_BINARY64
   if (fmt == chars_format::hex)
     return __floating_from_chars_hex(first, last, value);
-#endif
-
+  else
+    {
+      static_assert(USE_LIB_FAST_FLOAT);
+      return fast_float::from_chars(first, last, value, fmt);
+    }
+#else
   errc ec = errc::invalid_argument;
 #if _GLIBCXX_USE_CXX11_ABI
   buffer_resource mr;
@@ -828,6 +850,7 @@ from_chars(const char* first, const char* last, double& value,
       fmt = chars_format{};
     }
   return make_result(first, len, fmt, ec);
+#endif
 }
 
 from_chars_result
-- 
2.35.0.rc1


  parent reply	other threads:[~2022-01-16 18:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-16 18:06 [PATCH 1/6 v2] libstdc++: Directly implement hexfloat " Patrick Palka
2022-01-16 18:06 ` [PATCH 2/6] libstdc++: Import the fast_float library Patrick Palka
2022-01-17 10:45   ` Jonathan Wakely
2022-01-18  3:10   ` Hans-Peter Nilsson
2022-01-16 18:06 ` [PATCH 3/6] libstdc++: Apply modifications to our local copy of fast_float Patrick Palka
2022-01-17 10:46   ` Jonathan Wakely
2022-01-16 18:06 ` [PATCH 4/6] libstdc++: Adjust fast_float's over/underflow behavior for conformnace Patrick Palka
2022-01-17 10:49   ` Jonathan Wakely
2022-01-17 20:05     ` Patrick Palka
2022-01-16 18:06 ` Patrick Palka [this message]
2022-01-17 10:50   ` [PATCH 5/6] libstdc++: Use fast_float in std::from_chars for binary32/64 Jonathan Wakely
2022-01-16 18:06 ` [PATCH 6/6] libstdc++: Import MSVC floating-point std::from_chars testcases Patrick Palka
2022-01-17 10:54   ` Jonathan Wakely
2022-01-17 20:23     ` Patrick Palka
2022-01-17 10:34 ` [PATCH 1/6 v2] libstdc++: Directly implement hexfloat std::from_chars for binary32/64 Jonathan Wakely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220116180652.3694791-5-ppalka@redhat.com \
    --to=ppalka@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).