Skip to content

Commit bb954cf

Browse files
committed
Auto merge of #27307 - rkruppe:dec2flt, r=pnkfelix
Completely rewrite the conversion of decimal strings to `f64` and `f32`. The code is intended to be absolutely positively completely 100% accurate (when it doesn't give up). To the best of my knowledge, it achieves that goal. Any input that is not rejected is converted to the floating point number that is closest to the true value of the input. This includes overflow, subnormal numbers, and underflow to zero. In other words, the rounding error is less than or equal to 0.5 units in the last place. Half-way cases (exactly 0.5 ULP error) are handled with half-to-even rounding, also known as banker's rounding. This code implements the algorithms from the paper [How to Read Floating Point Numbers Accurately][paper] by William D. Clinger, with extensions to handle underflow, overflow and subnormals, as well as some algorithmic optimizations. # Correctness With such a large amount of tricky code, many bugs are to be expected. Indeed tracking down the obscure causes of various rounding errors accounts for the bulk of the development time. Extensive tests (taking in the order of hours to run through to completion) are included in `src/etc/test-float-parse`: Though exhaustively testing all possible inputs is impossible, I've had good success with generating millions of instances from various "classes" of inputs. These tests take far too long to be run by @bors so contributors who touch this code need the discipline to run them. There are `#[test]`s, but they don't even cover every stupid mistake I made in course of writing this. Another aspect is *integer* overflow. Extreme (or malicious) inputs could cause overflow both in the machine-sized integers used for bookkeeping throughout the algorithms (e.g., the decimal exponent) as well as the arbitrary-precision arithmetic. There is input validation to reject all such cases I know of, and I am quite sure nobody will *accidentally* cause this code to go out of range. Still, no guarantees. # Limitations Noticed the weasel words "(when it doesn't give up)" at the beginning? Some otherwise well-formed decimal strings are rejected because spelling out the value of the input requires too many digits, i.e., `digits * 10^abs(exp)` can't be stored in a bignum. This only applies if the value is not "obviously" zero or infinite, i.e., if you take a near-infinity or near-zero value and add many pointless fractional digits. At least with the algorithm used here, computing the precise value would require computing the full value as a fraction, which would overflow. The precise limit is `number_of_digits + abs(exp) > 375` but could be raised almost arbitrarily. In the future, another algorithm might lift this restriction entirely. This should not be an issue for any realistic inputs. Still, the code does reject inputs that would result in a finite float when evaluated with unlimited precision. Some of these inputs are even regressions that the old code (mostly) handled, such as `0.333...333` with 400+ `3`s. Thus this might qualify as [breaking-change]. # Performance Benchmarks results are... tolerable. Short numbers that hit the fast paths (`f64` multiplication or shortcuts to zero/inf) have performance in the same order of magnitude as the old code tens of nanoseconds. Numbers that are delegated to Algorithm Bellerophon (using floats with 64 bit significand, implemented in software) are slower, but not drastically so (couple hundred nanoseconds). Numbers that need the AlgorithmM fallback (for `f64`, roughly everything below 1e-305 and above 1e305) take far, far longer, hundreds of microseconds. Note that my implementation is not quite as naive as the expository version in the paper (it needs one to four division instead of ~1000), but division is fundamentally pretty expensive and my implementation of it is extremely simple and slow. All benchmarks run on a mediocre laptop with a i5-4200U CPU under light load. # Binary size Unfortunately the implementation needs to duplicate almost all code: Once for `f32` and once for `f64`. Before you ask, no, this cannot be avoided, at least not completely (but see the Future Work section). There's also a precomputed table of powers of ten, weighing in at about six kilobytes. Running a stage1 `rustc` over a stand-alone program that simply parses pi to `f32` and `f64` and outputs both results reveals that the overhead vs. the old parsing code is about 44 KiB normally and about 28 KiB with LTO. It's presumably half of that + 3 KiB when only one of the two code paths is exercised. | rustc options | old | new | delta | |--------------------------- |--------- |--------- |----------- | | [nothing] | 2588375 | 2633828 | 44.39 KiB | | -O | 2585211 | 2630688 | 44.41 KiB | | -O -C lto | 1026353 | 1054981 | 27.96 KiB | | -O -C lto -C link-args=-s | 414208 | 442368 | 27.5 KiB | # Future Work ## Directory layout The `dec2flt` code uses some types embedded deeply in the `flt2dec` module hierarchy, even though nothing about them it formatting-specific. They should be moved to a more conversion-direction-agnostic location at some point. ## Performance It could be much better, especially for large inputs. Some low-hanging fruit has been picked but much more work could be done. Some specific ideas are jotted down in `FIXME`s all over the code. ## Binary size One could try to compress the table further, though I am skeptical. Another avenue would be reducing the code duplication from basically everything being generic over `T: RawFloat`. Perhaps one can reduce the magnitude of the duplication by pushing the parts that don't need to know the target type into separate functions, but this is finicky and probably makes some code read less naturally. ## Other bases This PR leaves `f{32,64}::from_str_radix` alone. It only replaces `FromStr` (and thus `.parse()`). I am convinced that `from_str_radix` should not exist, and have proposed its [deprecation and speedy removal][deprecate-radix]. Whatever the outcome of that discussion, it is independent from, and out of scope for, this PR. Fixes #24557 Fixes #14353 r? @pnkfelix cc @lifthrasiir @huonw [paper]: http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.45.4152 [deprecate-radix]: https://internals.rust-lang.org/t/deprecate-f-32-64-from-str-radix/2405
2 parents e9205a2 + 15518a9 commit bb954cf

29 files changed

+3828
-18
lines changed

src/etc/dec2flt_table.py

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
#!/usr/bin/env python2.7
2+
#
3+
# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
4+
# file at the top-level directory of this distribution and at
5+
# http://rust-lang.org/COPYRIGHT.
6+
#
7+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
8+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
9+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
10+
# option. This file may not be copied, modified, or distributed
11+
# except according to those terms.
12+
13+
"""
14+
Generate powers of ten using William Clinger's ``AlgorithmM`` for use in
15+
decimal to floating point conversions.
16+
17+
Specifically, computes and outputs (as Rust code) a table of 10^e for some
18+
range of exponents e. The output is one array of 64 bit significands and
19+
another array of corresponding base two exponents. The approximations are
20+
normalized and rounded perfectly, i.e., within 0.5 ULP of the true value.
21+
22+
The representation ([u64], [i16]) instead of the more natural [(u64, i16)]
23+
is used because (u64, i16) has a ton of padding which would make the table
24+
even larger, and it's already uncomfortably large (6 KiB).
25+
"""
26+
from __future__ import print_function
27+
import sys
28+
from fractions import Fraction
29+
from collections import namedtuple
30+
31+
32+
N = 64 # Size of the significand field in bits
33+
MIN_SIG = 2 ** (N - 1)
34+
MAX_SIG = (2 ** N) - 1
35+
36+
37+
# Hand-rolled fp representation without arithmetic or any other operations.
38+
# The significand is normalized and always N bit, but the exponent is
39+
# unrestricted in range.
40+
Fp = namedtuple('Fp', 'sig exp')
41+
42+
43+
def algorithm_m(f, e):
44+
assert f > 0
45+
if e < 0:
46+
u = f
47+
v = 10 ** abs(e)
48+
else:
49+
u = f * 10 ** e
50+
v = 1
51+
k = 0
52+
x = u // v
53+
while True:
54+
if x < MIN_SIG:
55+
u <<= 1
56+
k -= 1
57+
elif x >= MAX_SIG:
58+
v <<= 1
59+
k += 1
60+
else:
61+
break
62+
x = u // v
63+
return ratio_to_float(u, v, k)
64+
65+
66+
def ratio_to_float(u, v, k):
67+
q, r = divmod(u, v)
68+
v_r = v - r
69+
z = Fp(q, k)
70+
if r < v_r:
71+
return z
72+
elif r > v_r:
73+
return next_float(z)
74+
elif q % 2 == 0:
75+
return z
76+
else:
77+
return next_float(z)
78+
79+
80+
def next_float(z):
81+
if z.sig == MAX_SIG:
82+
return Fp(MIN_SIG, z.exp + 1)
83+
else:
84+
return Fp(z.sig + 1, z.exp)
85+
86+
87+
def error(f, e, z):
88+
decimal = f * Fraction(10) ** e
89+
binary = z.sig * Fraction(2) ** z.exp
90+
abs_err = abs(decimal - binary)
91+
# The unit in the last place has value z.exp
92+
ulp_err = abs_err / Fraction(2) ** z.exp
93+
return float(ulp_err)
94+
95+
LICENSE = """
96+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
97+
// file at the top-level directory of this distribution and at
98+
// http://rust-lang.org/COPYRIGHT.
99+
//
100+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
101+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
102+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
103+
// option. This file may not be copied, modified, or distributed
104+
// except according to those terms.
105+
"""
106+
107+
def main():
108+
MIN_E = -305
109+
MAX_E = 305
110+
e_range = range(MIN_E, MAX_E+1)
111+
powers = []
112+
for e in e_range:
113+
z = algorithm_m(1, e)
114+
err = error(1, e, z)
115+
assert err < 0.5
116+
powers.append(z)
117+
typ = "([u64; {0}], [i16; {0}])".format(len(e_range))
118+
print(LICENSE.strip())
119+
print("// Table of approximations of powers of ten.")
120+
print("// DO NOT MODIFY: Generated by a src/etc/dec2flt_table.py")
121+
print("pub const MIN_E: i16 = {};".format(MIN_E))
122+
print("pub const MAX_E: i16 = {};".format(MAX_E))
123+
print()
124+
print("pub const POWERS: ", typ, " = ([", sep='')
125+
for z in powers:
126+
print(" 0x{:x},".format(z.sig))
127+
print("], [")
128+
for z in powers:
129+
print(" {},".format(z.exp))
130+
print("]);")
131+
132+
133+
if __name__ == '__main__':
134+
main()

src/etc/test-float-parse/_common.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::io;
12+
use std::io::prelude::*;
13+
use std::mem::transmute;
14+
15+
// Nothing up my sleeve: Just (PI - 3) in base 16.
16+
#[allow(dead_code)]
17+
pub const SEED: [u32; 3] = [0x243f_6a88, 0x85a3_08d3, 0x1319_8a2e];
18+
19+
pub fn validate(text: String) {
20+
let mut out = io::stdout();
21+
let x: f64 = text.parse().unwrap();
22+
let f64_bytes: u64 = unsafe { transmute(x) };
23+
let x: f32 = text.parse().unwrap();
24+
let f32_bytes: u32 = unsafe { transmute(x) };
25+
writeln!(&mut out, "{:016x} {:08x} {}", f64_bytes, f32_bytes, text).unwrap();
26+
}

src/etc/test-float-parse/few-ones.rs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
mod _common;
12+
13+
use _common::validate;
14+
15+
fn main() {
16+
let mut pow = vec![];
17+
for i in 0..63 {
18+
pow.push(1u64 << i);
19+
}
20+
for a in &pow {
21+
for b in &pow {
22+
for c in &pow {
23+
validate((a | b | c).to_string());
24+
}
25+
}
26+
}
27+
}
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
mod _common;
12+
13+
use _common::validate;
14+
15+
fn main() {
16+
for e in 300..310 {
17+
for i in 0..100000 {
18+
validate(format!("{}e{}", i, e));
19+
}
20+
}
21+
}
+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(rand)]
12+
13+
extern crate rand;
14+
15+
mod _common;
16+
17+
use std::char;
18+
use rand::{IsaacRng, Rng, SeedableRng};
19+
use rand::distributions::{Range, Sample};
20+
use _common::{validate, SEED};
21+
22+
fn main() {
23+
let mut rnd = IsaacRng::from_seed(&SEED);
24+
let mut range = Range::new(0, 10);
25+
for _ in 0..5_000_000u64 {
26+
let num_digits = rnd.gen_range(100, 300);
27+
let digits = gen_digits(num_digits, &mut range, &mut rnd);
28+
validate(digits);
29+
}
30+
}
31+
32+
fn gen_digits<R: Rng>(n: u32, range: &mut Range<u32>, rnd: &mut R) -> String {
33+
let mut s = String::new();
34+
for _ in 0..n {
35+
let digit = char::from_digit(range.sample(rnd), 10).unwrap();
36+
s.push(digit);
37+
}
38+
s
39+
}

src/etc/test-float-parse/rand-f64.rs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(rand)]
12+
13+
extern crate rand;
14+
15+
mod _common;
16+
17+
use _common::{validate, SEED};
18+
use rand::{IsaacRng, Rng, SeedableRng};
19+
use std::mem::transmute;
20+
21+
fn main() {
22+
let mut rnd = IsaacRng::from_seed(&SEED);
23+
let mut i = 0;
24+
while i < 10_000_000 {
25+
let bits = rnd.next_u64();
26+
let x: f64 = unsafe { transmute(bits) };
27+
if x.is_finite() {
28+
validate(format!("{:e}", x));
29+
i += 1;
30+
}
31+
}
32+
}

0 commit comments

Comments
 (0)