Skip to content

Commit f7579a1

Browse files
Enable Float non-determinism in miri. Update and add tests and change
change tests in std.
1 parent aa57e46 commit f7579a1

File tree

9 files changed

+1227
-102
lines changed

9 files changed

+1227
-102
lines changed

library/coretests/tests/floats/f64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ fn test_powi() {
432432
let nan: f64 = f64::NAN;
433433
let inf: f64 = f64::INFINITY;
434434
let neg_inf: f64 = f64::NEG_INFINITY;
435-
assert_eq!(1.0f64.powi(1), 1.0);
435+
assert_approx_eq!(1.0f64.powi(1), 1.0);
436436
assert_approx_eq!((-3.1f64).powi(2), 9.61);
437437
assert_approx_eq!(5.9f64.powi(-2), 0.028727);
438438
assert_eq!(8.3f64.powi(0), 1.0);

library/coretests/tests/num/dec2flt/float.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ fn test_f16_integer_decode() {
2323
fn test_f32_integer_decode() {
2424
assert_eq!(3.14159265359f32.integer_decode(), (13176795, -22, 1));
2525
assert_eq!((-8573.5918555f32).integer_decode(), (8779358, -10, -1));
26-
assert_eq!(2f32.powf(100.0).integer_decode(), (8388608, 77, 1));
26+
// Set 2^100 directly instead of using powf, because it doesn't guarentee precision
27+
assert_eq!(1.2676506e30_f32.integer_decode(), (8388608, 77, 1));
2728
assert_eq!(0f32.integer_decode(), (0, -150, 1));
2829
assert_eq!((-0f32).integer_decode(), (0, -150, -1));
2930
assert_eq!(f32::INFINITY.integer_decode(), (8388608, 105, 1));
@@ -39,7 +40,8 @@ fn test_f32_integer_decode() {
3940
fn test_f64_integer_decode() {
4041
assert_eq!(3.14159265359f64.integer_decode(), (7074237752028906, -51, 1));
4142
assert_eq!((-8573.5918555f64).integer_decode(), (4713381968463931, -39, -1));
42-
assert_eq!(2f64.powf(100.0).integer_decode(), (4503599627370496, 48, 1));
43+
// Set 2^100 directly instead of using powf, because it doesn't guarentee precision
44+
assert_eq!(1.2676506002282294e30_f64.integer_decode(), (4503599627370496, 48, 1));
4345
assert_eq!(0f64.integer_decode(), (0, -1075, 1));
4446
assert_eq!((-0f64).integer_decode(), (0, -1075, -1));
4547
assert_eq!(f64::INFINITY.integer_decode(), (4503599627370496, 972, 1));

library/std/src/f32.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ impl f32 {
298298
/// ```
299299
/// let x = 2.0_f32;
300300
/// let abs_difference = (x.powi(2) - (x * x)).abs();
301-
/// assert!(abs_difference <= f32::EPSILON);
301+
/// assert!(abs_difference <= 8.0 * f32::EPSILON);
302302
///
303303
/// assert_eq!(f32::powi(f32::NAN, 0), 1.0);
304304
/// ```
@@ -322,7 +322,7 @@ impl f32 {
322322
/// ```
323323
/// let x = 2.0_f32;
324324
/// let abs_difference = (x.powf(2.0) - (x * x)).abs();
325-
/// assert!(abs_difference <= f32::EPSILON);
325+
/// assert!(abs_difference <= 8.0 * f32::EPSILON);
326326
///
327327
/// assert_eq!(f32::powf(1.0, f32::NAN), 1.0);
328328
/// assert_eq!(f32::powf(f32::NAN, 0.0), 1.0);
@@ -382,7 +382,7 @@ impl f32 {
382382
/// // ln(e) - 1 == 0
383383
/// let abs_difference = (e.ln() - 1.0).abs();
384384
///
385-
/// assert!(abs_difference <= f32::EPSILON);
385+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
386386
/// ```
387387
#[rustc_allow_incoherent_impl]
388388
#[must_use = "method returns a new number and does not mutate the original value"]
@@ -407,7 +407,7 @@ impl f32 {
407407
/// // 2^2 - 4 == 0
408408
/// let abs_difference = (f.exp2() - 4.0).abs();
409409
///
410-
/// assert!(abs_difference <= f32::EPSILON);
410+
/// assert!(abs_difference <= 8.0 * f32::EPSILON);
411411
/// ```
412412
#[rustc_allow_incoherent_impl]
413413
#[must_use = "method returns a new number and does not mutate the original value"]
@@ -436,7 +436,7 @@ impl f32 {
436436
/// // ln(e) - 1 == 0
437437
/// let abs_difference = (e.ln() - 1.0).abs();
438438
///
439-
/// assert!(abs_difference <= f32::EPSILON);
439+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
440440
/// ```
441441
///
442442
/// Non-positive values:
@@ -473,7 +473,7 @@ impl f32 {
473473
/// // log5(5) - 1 == 0
474474
/// let abs_difference = (five.log(5.0) - 1.0).abs();
475475
///
476-
/// assert!(abs_difference <= f32::EPSILON);
476+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
477477
/// ```
478478
///
479479
/// Non-positive values:
@@ -506,7 +506,7 @@ impl f32 {
506506
/// // log2(2) - 1 == 0
507507
/// let abs_difference = (two.log2() - 1.0).abs();
508508
///
509-
/// assert!(abs_difference <= f32::EPSILON);
509+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
510510
/// ```
511511
///
512512
/// Non-positive values:
@@ -539,7 +539,7 @@ impl f32 {
539539
/// // log10(10) - 1 == 0
540540
/// let abs_difference = (ten.log10() - 1.0).abs();
541541
///
542-
/// assert!(abs_difference <= f32::EPSILON);
542+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
543543
/// ```
544544
///
545545
/// Non-positive values:
@@ -646,7 +646,7 @@ impl f32 {
646646
/// // sqrt(x^2 + y^2)
647647
/// let abs_difference = (x.hypot(y) - (x.powi(2) + y.powi(2)).sqrt()).abs();
648648
///
649-
/// assert!(abs_difference <= f32::EPSILON);
649+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
650650
/// ```
651651
#[rustc_allow_incoherent_impl]
652652
#[must_use = "method returns a new number and does not mutate the original value"]
@@ -670,7 +670,7 @@ impl f32 {
670670
///
671671
/// let abs_difference = (x.sin() - 1.0).abs();
672672
///
673-
/// assert!(abs_difference <= f32::EPSILON);
673+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
674674
/// ```
675675
#[rustc_allow_incoherent_impl]
676676
#[must_use = "method returns a new number and does not mutate the original value"]
@@ -694,7 +694,7 @@ impl f32 {
694694
///
695695
/// let abs_difference = (x.cos() - 1.0).abs();
696696
///
697-
/// assert!(abs_difference <= f32::EPSILON);
697+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
698698
/// ```
699699
#[rustc_allow_incoherent_impl]
700700
#[must_use = "method returns a new number and does not mutate the original value"]
@@ -778,7 +778,7 @@ impl f32 {
778778
/// // acos(cos(pi/4))
779779
/// let abs_difference = (f.cos().acos() - std::f32::consts::FRAC_PI_4).abs();
780780
///
781-
/// assert!(abs_difference <= f32::EPSILON);
781+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
782782
/// ```
783783
#[doc(alias = "arccos")]
784784
#[rustc_allow_incoherent_impl]
@@ -878,8 +878,8 @@ impl f32 {
878878
/// let abs_difference_0 = (f.0 - x.sin()).abs();
879879
/// let abs_difference_1 = (f.1 - x.cos()).abs();
880880
///
881-
/// assert!(abs_difference_0 <= f32::EPSILON);
882-
/// assert!(abs_difference_1 <= f32::EPSILON);
881+
/// assert!(abs_difference_0 <= 4.0 * f32::EPSILON);
882+
/// assert!(abs_difference_1 <= 4.0 * f32::EPSILON);
883883
/// ```
884884
#[doc(alias = "sincos")]
885885
#[rustc_allow_incoherent_impl]
@@ -1061,7 +1061,7 @@ impl f32 {
10611061
///
10621062
/// let abs_difference = (f - x).abs();
10631063
///
1064-
/// assert!(abs_difference <= f32::EPSILON);
1064+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
10651065
/// ```
10661066
#[doc(alias = "arcsinh")]
10671067
#[rustc_allow_incoherent_impl]
@@ -1089,7 +1089,7 @@ impl f32 {
10891089
///
10901090
/// let abs_difference = (f - x).abs();
10911091
///
1092-
/// assert!(abs_difference <= f32::EPSILON);
1092+
/// assert!(abs_difference <= 4.0 * f32::EPSILON);
10931093
/// ```
10941094
#[doc(alias = "arccosh")]
10951095
#[rustc_allow_incoherent_impl]

library/std/src/f64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ impl f64 {
298298
/// ```
299299
/// let x = 2.0_f64;
300300
/// let abs_difference = (x.powi(2) - (x * x)).abs();
301-
/// assert!(abs_difference <= f64::EPSILON);
301+
/// assert!(abs_difference <= 8.0 * f64::EPSILON);
302302
///
303303
/// assert_eq!(f64::powi(f64::NAN, 0), 1.0);
304304
/// ```
@@ -322,7 +322,7 @@ impl f64 {
322322
/// ```
323323
/// let x = 2.0_f64;
324324
/// let abs_difference = (x.powf(2.0) - (x * x)).abs();
325-
/// assert!(abs_difference <= f64::EPSILON);
325+
/// assert!(abs_difference <= 8.0 * f64::EPSILON);
326326
///
327327
/// assert_eq!(f64::powf(1.0, f64::NAN), 1.0);
328328
/// assert_eq!(f64::powf(f64::NAN, 0.0), 1.0);

0 commit comments

Comments
 (0)