clean up

Author: LorrensP-2158466

library/std/tests/floats/f32.rs

@@ -567,10 +567,7 @@ fn test_log2() {
     let nan: f32 = f32::NAN;
     let inf: f32 = f32::INFINITY;
     let neg_inf: f32 = f32::NEG_INFINITY;
-    assert_approx_eq!(
-        10.0f32.log2(),
-        3.321928 /* Miri float-non-det: Make tests pass for now */
-    );
+    assert_approx_eq!(10.0f32.log2(), 3.321928);
     assert_approx_eq!(2.3f32.log2(), 1.201634);
     assert_approx_eq!(1.0f32.exp().log2(), 1.442695);
     assert!(nan.log2().is_nan());

library/std/tests/floats/lib.rs

@@ -3,7 +3,7 @@
 use std::fmt;
 use std::ops::{Add, Div, Mul, Rem, Sub};
 
-/// Verify that floats are within a tolerance of each other, 1.0e-4 by default so we do not break test in Miri.
+/// Verify that floats are within a tolerance of each other, 1.0e-6 by default.
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => {{ assert_approx_eq!($a, $b, 1.0e-6) }};
     ($a:expr, $b:expr, $lim:expr) => {{

src/tools/miri/src/intrinsics/mod.rs

@@ -269,8 +269,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 });
                 let res = this.adjust_nan(res, &[f]);
                 this.write_scalar(res, dest)?;
-
             }
+
             #[rustfmt::skip]
             | "sinf64"
             | "cosf64"
@@ -313,7 +313,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 });
                 let res = this.adjust_nan(res, &[f]);
                 this.write_scalar(res, dest)?;
-
             }
 
             "fmaf32" => {
@@ -601,8 +600,7 @@ fn fixed_float_value<S: Semantics>(
         ("cosf32" | "cosf64", [input]) if input.is_zero() => Some(one),
 
         // e^0 = 1
-        ("expf32" | "expf64" | "exp2f32" | "exp2f64", [input])
-            if input.is_zero() => Some(one),
+        ("expf32" | "expf64" | "exp2f32" | "exp2f64", [input]) if input.is_zero() => Some(one),
 
         // log(1) = 0
         #[rustfmt::skip]

src/tools/miri/tests/pass/float.rs

@@ -38,7 +38,7 @@ macro_rules! assert_approx_eq {
     }};
 
     ($a:expr, $b: expr) => {
-        // accept up to 52ULP (16ULP for host floats, 4ULP for miri artificial error and 32 for any rounding errors)
+        // accept up to 32LP (4ULP for miri artificial error and 28ULP for any rounding errors)
         assert_approx_eq!($a, $b, 32);
     };
 }