From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id DC9BA3858004; Tue, 16 Nov 2021 17:23:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC9BA3858004 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-5313] libstdc++: Merge latest Ryu sources X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: b96e2ff9d8c56bad68b5dd10e3a601f12496ae36 X-Git-Newrev: 7461b5813126c6dbe11f0f9d06c1bd83b082111e Message-Id: <20211116172351.DC9BA3858004@sourceware.org> Date: Tue, 16 Nov 2021 17:23:51 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2021 17:23:52 -0000 https://gcc.gnu.org/g:7461b5813126c6dbe11f0f9d06c1bd83b082111e commit r12-5313-g7461b5813126c6dbe11f0f9d06c1bd83b082111e Author: Patrick Palka Date: Tue Nov 16 12:23:27 2021 -0500 libstdc++: Merge latest Ryu sources libstdc++-v3/ChangeLog: * src/c++17/ryu/MERGE: Update the commit hash. * src/c++17/ryu/d2s_intrinsics.h: Merge from Ryu's master branch. Signed-off-by: Patrick Palka Diff: --- libstdc++-v3/src/c++17/ryu/MERGE | 2 +- libstdc++-v3/src/c++17/ryu/d2s_intrinsics.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/src/c++17/ryu/MERGE b/libstdc++-v3/src/c++17/ryu/MERGE index 0ea65add2ff..9035502846e 100644 --- a/libstdc++-v3/src/c++17/ryu/MERGE +++ b/libstdc++-v3/src/c++17/ryu/MERGE @@ -1,4 +1,4 @@ -22c887c017a8512abcd4a8f6bfcdb2742829cd7d +150d0c87830756d34e76c42f7f33f811d89903a8 The first line of this file holds the git revision number of the last merge done from the master library sources. diff --git a/libstdc++-v3/src/c++17/ryu/d2s_intrinsics.h b/libstdc++-v3/src/c++17/ryu/d2s_intrinsics.h index bbac4dfd48f..e3206b5d7dd 100644 --- a/libstdc++-v3/src/c++17/ryu/d2s_intrinsics.h +++ b/libstdc++-v3/src/c++17/ryu/d2s_intrinsics.h @@ -181,15 +181,14 @@ static inline uint32_t mod1e9(const uint64_t x) { #endif // defined(RYU_32_BIT_PLATFORM) static inline uint32_t pow5Factor(uint64_t value) { + const uint64_t m_inv_5 = 14757395258967641293u; // 5 * m_inv_5 = 1 (mod 2^64) + const uint64_t n_div_5 = 3689348814741910323u; // #{ n | n = 0 (mod 2^64) } = 2^64 / 5 uint32_t count = 0; for (;;) { assert(value != 0); - const uint64_t q = div5(value); - const uint32_t r = ((uint32_t) value) - 5 * ((uint32_t) q); - if (r != 0) { + value *= m_inv_5; + if (value > n_div_5) break; - } - value = q; ++count; } return count;