address review

Author: LorrensP-2158466

library/std/src/num/f32.rs

@@ -479,7 +479,7 @@ impl f32 {
     /// // log5(5) - 1 == 0
     /// let abs_difference = (five.log(5.0) - 1.0).abs();
     ///
-    /// assert!(abs_difference <= 1e-7);
+    /// assert!(abs_difference <= 1e-6);
     /// ```
     ///
     /// Non-positive values:

src/tools/miri/src/lib.rs

@@ -18,8 +18,6 @@
 #![feature(derive_coerce_pointee)]
 #![feature(arbitrary_self_types)]
 #![feature(iter_advance_by)]
-#![feature(f16)]
-#![feature(f128)]
 // Configure clippy and other lints
 #![allow(
     clippy::collapsible_else_if,

src/tools/miri/src/math.rs

@@ -1,9 +1,9 @@
 use std::ops::Neg;
-use std::{f16, f32, f64, f128};
+use std::{f32, f64};
 
 use rand::Rng as _;
 use rustc_apfloat::Float as _;
-use rustc_apfloat::ieee::{DoubleS, HalfS, IeeeFloat, QuadS, Semantics, SingleS};
+use rustc_apfloat::ieee::{DoubleS, IeeeFloat, Semantics, SingleS};
 use rustc_middle::ty::{self, FloatTy, ScalarInt};
 
 use crate::*;
@@ -427,16 +427,14 @@ macro_rules! impl_ieee_pi {
             #[inline]
             fn pi() -> Self {
                 // We take the value from the standard library as the most reasonable source for an exact π here.
-                Self::from_bits($float_ty::consts::PI.to_bits() as _)
+                Self::from_bits($float_ty::consts::PI.to_bits().into())
             }
         }
     };
 }
 
-impl_ieee_pi!(f16, HalfS);
 impl_ieee_pi!(f32, SingleS);
 impl_ieee_pi!(f64, DoubleS);
-impl_ieee_pi!(f128, QuadS);
 
 #[cfg(test)]
 mod tests {

src/tools/miri/src/shims/foreign_items.rs

@@ -851,9 +851,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     let res = res.to_soft();
                     // Apply a relative error of 4ULP to introduce some non-determinism
                     // simulating imprecise implementations and optimizations.
-                    let res = math::apply_random_float_error_ulp(
-                        this, res, 2, // log2(4)
-                    );
+                    let res = math::apply_random_float_error_ulp(this, res, 4);
 
                     // Clamp the result to the guaranteed range of this function according to the C standard,
                     // if any.
@@ -872,27 +870,26 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let f1 = this.read_scalar(f1)?.to_f32()?;
                 let f2 = this.read_scalar(f2)?.to_f32()?;
 
-                let res = math::fixed_float_value(this, link_name.as_str(), &[f1, f2]).unwrap_or_else(|| {
-                    let res = match link_name.as_str() {
-                        // underscore case for windows, here and below
-                        // (see https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/floating-point-primitives?view=vs-2019)
-                        // Using host floats (but it's fine, these operations do not have guaranteed precision).
-                        "_hypotf" | "hypotf" => f1.to_host().hypot(f2.to_host()).to_soft(),
-                        "atan2f" => f1.to_host().atan2(f2.to_host()).to_soft(),
-                        #[allow(deprecated)]
-                        "fdimf" => f1.to_host().abs_sub(f2.to_host()).to_soft(),
-                        _ => bug!(),
-                    };
-                    // Apply a relative error of 4ULP to introduce some non-determinism
-                    // simulating imprecise implementations and optimizations.
-                    let res = math::apply_random_float_error_ulp(
-                        this, res, 2, // log2(4)
-                    );
-
-                    // Clamp the result to the guaranteed range of this function according to the C standard,
-                    // if any.
-                    math::clamp_float_value(link_name.as_str(), res)
-                });
+                let res = math::fixed_float_value(this, link_name.as_str(), &[f1, f2])
+                    .unwrap_or_else(|| {
+                        let res = match link_name.as_str() {
+                            // underscore case for windows, here and below
+                            // (see https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/floating-point-primitives?view=vs-2019)
+                            // Using host floats (but it's fine, these operations do not have guaranteed precision).
+                            "_hypotf" | "hypotf" => f1.to_host().hypot(f2.to_host()).to_soft(),
+                            "atan2f" => f1.to_host().atan2(f2.to_host()).to_soft(),
+                            #[allow(deprecated)]
+                            "fdimf" => f1.to_host().abs_sub(f2.to_host()).to_soft(),
+                            _ => bug!(),
+                        };
+                        // Apply a relative error of 4ULP to introduce some non-determinism
+                        // simulating imprecise implementations and optimizations.
+                        let res = math::apply_random_float_error_ulp(this, res, 4);
+
+                        // Clamp the result to the guaranteed range of this function according to the C standard,
+                        // if any.
+                        math::clamp_float_value(link_name.as_str(), res)
+                    });
                 let res = this.adjust_nan(res, &[f1, f2]);
                 this.write_scalar(res, dest)?;
             }
@@ -937,9 +934,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     let res = res.to_soft();
                     // Apply a relative error of 4ULP to introduce some non-determinism
                     // simulating imprecise implementations and optimizations.
-                    let res = math::apply_random_float_error_ulp(
-                        this, res, 2, // log2(4)
-                    );
+                    let res = math::apply_random_float_error_ulp(this, res, 4);
 
                     // Clamp the result to the guaranteed range of this function according to the C standard,
                     // if any.
@@ -971,9 +966,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     };
                     // Apply a relative error of 4ULP to introduce some non-determinism
                     // simulating imprecise implementations and optimizations.
-                    let res = math::apply_random_float_error_ulp(
-                        this, res, 2, // log2(4)
-                    );
+                    let res = math::apply_random_float_error_ulp(this, res, 4);
 
                     // Clamp the result to the guaranteed range of this function according to the C standard,
                     // if any.
@@ -1008,7 +1001,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let res = res.to_soft();
                 // Apply a relative error of 4ULP to introduce some non-determinism
                 // simulating imprecise implementations and optimizations.
-                let res = math::apply_random_float_error_ulp(this, res, 2 /* log2(4) */);
+                let res = math::apply_random_float_error_ulp(this, res, 4);
                 // Clamp the result to the guaranteed range of this function according to the C standard,
                 // if any.
                 let res = math::clamp_float_value(link_name.as_str(), res);
@@ -1027,7 +1020,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let res = res.to_soft();
                 // Apply a relative error of 4ULP to introduce some non-determinism
                 // simulating imprecise implementations and optimizations.
-                let res = math::apply_random_float_error_ulp(this, res, 2 /* log2(4) */);
+                let res = math::apply_random_float_error_ulp(this, res, 4);
                 // Clamp the result to the guaranteed range of this function according to the C standard,
                 // if any.
                 let res = math::clamp_float_value(link_name.as_str(), res);