From 6e207a26fc6cc81b01918bcebf6a57fc19e37b5f Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 28 Feb 2024 03:55:14 -0500 Subject: [PATCH 1/3] Add stubs for `f16` and `f128` to miri --- src/shims/intrinsics/simd.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/shims/intrinsics/simd.rs b/src/shims/intrinsics/simd.rs index ca8773cac1..bb18fba5c9 100644 --- a/src/shims/intrinsics/simd.rs +++ b/src/shims/intrinsics/simd.rs @@ -83,8 +83,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let op = op.to_scalar(); // "Bitwise" operation, no NaN adjustments match float_ty { + FloatTy::F16 => unimplemented!("f16_f128"), FloatTy::F32 => Scalar::from_f32(op.to_f32()?.abs()), FloatTy::F64 => Scalar::from_f64(op.to_f64()?.abs()), + FloatTy::F128 => unimplemented!("f16_f128"), } } Op::Sqrt => { @@ -93,6 +95,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { }; // FIXME using host floats match float_ty { + FloatTy::F16 => unimplemented!("f16_f128"), FloatTy::F32 => { let f = op.to_scalar().to_f32()?; let res = f.to_host().sqrt().to_soft(); @@ -105,6 +108,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let res = this.adjust_nan(res, &[f]); Scalar::from(res) } + FloatTy::F128 => unimplemented!("f16_f128"), } } Op::Round(rounding) => { @@ -112,6 +116,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { span_bug!(this.cur_span(), "{} operand is not a float", intrinsic_name) }; match float_ty { + FloatTy::F16 => unimplemented!("f16_f128"), FloatTy::F32 => { let f = op.to_scalar().to_f32()?; let res = f.round_to_integral(rounding).value; @@ -124,6 +129,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let res = this.adjust_nan(res, &[f]); Scalar::from_f64(res) } + FloatTy::F128 => unimplemented!("f16_f128"), } } Op::Numeric(name) => { @@ -267,6 +273,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { span_bug!(this.cur_span(), "{} operand is not a float", intrinsic_name) }; let val = match float_ty { + FloatTy::F16 => unimplemented!("f16_f128"), FloatTy::F32 => { let a = a.to_f32()?; let b = b.to_f32()?; @@ -283,6 +290,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let res = this.adjust_nan(res, &[a, b, c]); Scalar::from(res) } + FloatTy::F128 => unimplemented!("f16_f128"), }; this.write_scalar(val, &dest)?; } @@ -724,6 +732,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let left = left.to_scalar(); let right = right.to_scalar(); Ok(match float_ty { + FloatTy::F16 => unimplemented!("f16_f128"), FloatTy::F32 => { let left = left.to_f32()?; let right = right.to_f32()?; @@ -744,6 +753,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { let res = this.adjust_nan(res, &[left, right]); Scalar::from_f64(res) } + FloatTy::F128 => unimplemented!("f16_f128"), }) } } From 34f6158fb59ececeb18981bc5e0128cbee8ef713 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Thu, 29 Feb 2024 11:58:51 +1100 Subject: [PATCH 2/3] Rename `DiagnosticMessage` as `DiagMessage`. --- src/diagnostics.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diagnostics.rs b/src/diagnostics.rs index de0ed879b3..4683965159 100644 --- a/src/diagnostics.rs +++ b/src/diagnostics.rs @@ -1,7 +1,7 @@ use std::fmt::{self, Write}; use std::num::NonZero; -use rustc_errors::{Diag, DiagnosticMessage, Level}; +use rustc_errors::{Diag, DiagMessage, Level}; use rustc_span::{SpanData, Symbol, DUMMY_SP}; use rustc_target::abi::{Align, Size}; @@ -95,7 +95,7 @@ impl fmt::Debug for TerminationInfo { } impl MachineStopType for TerminationInfo { - fn diagnostic_message(&self) -> DiagnosticMessage { + fn diagnostic_message(&self) -> DiagMessage { self.to_string().into() } fn add_args( From 3b00eb445107132ea835f0624fa5a08b4f1e633c Mon Sep 17 00:00:00 2001 From: The Miri Cronjob Bot Date: Wed, 6 Mar 2024 04:55:19 +0000 Subject: [PATCH 3/3] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 75124dc8ff..47a0187a45 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1a1876c9790f168fb51afa335a7ba3e6fc267d75 +b77e0184a95d60080f0d0605e2a3b337e904c21e