Skip to content

Enforce deterministic signed zero behavior in float min/max and clamp #154157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anmolxlight wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enforce deterministic signed zero behavior in float min/max and clamp #154157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
ret.write_cvalue(fx, val);
}

sym::minimum_number_nsz_f16 => {
sym::minimum_number_f16 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1275,7 +1275,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f16));
ret.write_cvalue(fx, val);
}
sym::minimum_number_nsz_f32 => {
sym::minimum_number_f32 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1284,7 +1284,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f32));
ret.write_cvalue(fx, val);
}
sym::minimum_number_nsz_f64 => {
sym::minimum_number_f64 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1293,7 +1293,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f64));
ret.write_cvalue(fx, val);
}
sym::minimum_number_nsz_f128 => {
sym::minimum_number_f128 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1302,7 +1302,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f128));
ret.write_cvalue(fx, val);
}
sym::maximum_number_nsz_f16 => {
sym::maximum_number_f16 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1311,7 +1311,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f16));
ret.write_cvalue(fx, val);
}
sym::maximum_number_nsz_f32 => {
sym::maximum_number_f32 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1320,7 +1320,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f32));
ret.write_cvalue(fx, val);
}
sym::maximum_number_nsz_f64 => {
sym::maximum_number_f64 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand All @@ -1329,7 +1329,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
let val = CValue::by_val(val, fx.layout_of(fx.tcx.types.f64));
ret.write_cvalue(fx, val);
}
sym::maximum_number_nsz_f128 => {
sym::maximum_number_f128 => {
intrinsic_args!(fx, args => (a, b); intrinsic);
let a = a.load_scalar(fx);
let b = b.load_scalar(fx);
Expand Down
19 changes: 8 additions & 11 deletions compiler/rustc_codegen_llvm/src/intrinsic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@ impl<'ll, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
let simple = call_simple_intrinsic(self, name, args);
let llval = match name {
_ if simple.is_some() => simple.unwrap(),
sym::minimum_number_nsz_f16
| sym::minimum_number_nsz_f32
| sym::minimum_number_nsz_f64
| sym::minimum_number_nsz_f128
| sym::maximum_number_nsz_f16
| sym::maximum_number_nsz_f32
| sym::maximum_number_nsz_f64
| sym::maximum_number_nsz_f128
sym::minimum_number_f16
| sym::minimum_number_f32
| sym::minimum_number_f64
| sym::minimum_number_f128
| sym::maximum_number_f16
| sym::maximum_number_f32
| sym::maximum_number_f64
| sym::maximum_number_f128
// Need at least LLVM 22 for `min/maximumnum` to not crash LLVM.
if crate::llvm_util::get_version() >= (22, 0, 0) =>
{
Expand All @@ -206,9 +206,6 @@ impl<'ll, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
&[args[0].layout.immediate_llvm_type(self.cx)],
&[args[0].immediate(), args[1].immediate()],
);
// `nsz` on minimumnum/maximumnum is special: its only effect is to make
// signed-zero ordering non-deterministic.
unsafe { llvm::LLVMRustSetNoSignedZeros(call) };
call
}
sym::ptr_mask => {
Expand Down
16 changes: 8 additions & 8 deletions compiler/rustc_const_eval/src/interpret/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,16 +526,16 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
self.write_scalar(Scalar::from_target_usize(align.bytes(), self), dest)?;
}

sym::minimum_number_nsz_f16 => {
sym::minimum_number_f16 => {
self.float_minmax_intrinsic::<Half>(args, MinMax::MinimumNumberNsz, dest)?
}
sym::minimum_number_nsz_f32 => {
sym::minimum_number_f32 => {
self.float_minmax_intrinsic::<Single>(args, MinMax::MinimumNumberNsz, dest)?
}
sym::minimum_number_nsz_f64 => {
sym::minimum_number_f64 => {
self.float_minmax_intrinsic::<Double>(args, MinMax::MinimumNumberNsz, dest)?
}
sym::minimum_number_nsz_f128 => {
sym::minimum_number_f128 => {
self.float_minmax_intrinsic::<Quad>(args, MinMax::MinimumNumberNsz, dest)?
}

Expand All @@ -548,16 +548,16 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
}
sym::minimumf128 => self.float_minmax_intrinsic::<Quad>(args, MinMax::Minimum, dest)?,

sym::maximum_number_nsz_f16 => {
sym::maximum_number_f16 => {
self.float_minmax_intrinsic::<Half>(args, MinMax::MaximumNumberNsz, dest)?
}
sym::maximum_number_nsz_f32 => {
sym::maximum_number_f32 => {
self.float_minmax_intrinsic::<Single>(args, MinMax::MaximumNumberNsz, dest)?
}
sym::maximum_number_nsz_f64 => {
sym::maximum_number_f64 => {
self.float_minmax_intrinsic::<Double>(args, MinMax::MaximumNumberNsz, dest)?
}
sym::maximum_number_nsz_f128 => {
sym::maximum_number_f128 => {
self.float_minmax_intrinsic::<Quad>(args, MinMax::MaximumNumberNsz, dest)?
}

Expand Down
32 changes: 16 additions & 16 deletions compiler/rustc_hir_analysis/src/check/intrinsic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,18 @@ fn intrinsic_operation_unsafety(tcx: TyCtxt<'_>, intrinsic_id: LocalDefId) -> hi
| sym::logf32
| sym::logf64
| sym::logf128
| sym::maximum_number_nsz_f16
| sym::maximum_number_nsz_f32
| sym::maximum_number_nsz_f64
| sym::maximum_number_nsz_f128
| sym::maximum_number_f16
| sym::maximum_number_f32
| sym::maximum_number_f64
| sym::maximum_number_f128
| sym::maximumf16
| sym::maximumf32
| sym::maximumf64
| sym::maximumf128
| sym::minimum_number_nsz_f16
| sym::minimum_number_nsz_f32
| sym::minimum_number_nsz_f64
| sym::minimum_number_nsz_f128
| sym::minimum_number_f16
| sym::minimum_number_f32
| sym::minimum_number_f64
| sym::minimum_number_f128
| sym::minimumf16
| sym::minimumf32
| sym::minimumf64
Expand Down Expand Up @@ -468,10 +468,10 @@ pub(crate) fn check_intrinsic_type(
sym::fabsf64 => (0, 0, vec![tcx.types.f64], tcx.types.f64),
sym::fabsf128 => (0, 0, vec![tcx.types.f128], tcx.types.f128),

sym::minimum_number_nsz_f16 => (0, 0, vec![tcx.types.f16, tcx.types.f16], tcx.types.f16),
sym::minimum_number_nsz_f32 => (0, 0, vec![tcx.types.f32, tcx.types.f32], tcx.types.f32),
sym::minimum_number_nsz_f64 => (0, 0, vec![tcx.types.f64, tcx.types.f64], tcx.types.f64),
sym::minimum_number_nsz_f128 => {
sym::minimum_number_f16 => (0, 0, vec![tcx.types.f16, tcx.types.f16], tcx.types.f16),
sym::minimum_number_f32 => (0, 0, vec![tcx.types.f32, tcx.types.f32], tcx.types.f32),
sym::minimum_number_f64 => (0, 0, vec![tcx.types.f64, tcx.types.f64], tcx.types.f64),
sym::minimum_number_f128 => {
(0, 0, vec![tcx.types.f128, tcx.types.f128], tcx.types.f128)
}

Expand All @@ -480,10 +480,10 @@ pub(crate) fn check_intrinsic_type(
sym::minimumf64 => (0, 0, vec![tcx.types.f64, tcx.types.f64], tcx.types.f64),
sym::minimumf128 => (0, 0, vec![tcx.types.f128, tcx.types.f128], tcx.types.f128),

sym::maximum_number_nsz_f16 => (0, 0, vec![tcx.types.f16, tcx.types.f16], tcx.types.f16),
sym::maximum_number_nsz_f32 => (0, 0, vec![tcx.types.f32, tcx.types.f32], tcx.types.f32),
sym::maximum_number_nsz_f64 => (0, 0, vec![tcx.types.f64, tcx.types.f64], tcx.types.f64),
sym::maximum_number_nsz_f128 => {
sym::maximum_number_f16 => (0, 0, vec![tcx.types.f16, tcx.types.f16], tcx.types.f16),
sym::maximum_number_f32 => (0, 0, vec![tcx.types.f32, tcx.types.f32], tcx.types.f32),
sym::maximum_number_f64 => (0, 0, vec![tcx.types.f64, tcx.types.f64], tcx.types.f64),
sym::maximum_number_f128 => {
(0, 0, vec![tcx.types.f128, tcx.types.f128], tcx.types.f128)
}

Expand Down
16 changes: 8 additions & 8 deletions compiler/rustc_span/src/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,10 +1210,10 @@ symbols! {
masked,
match_beginning_vert,
match_default_bindings,
maximum_number_nsz_f16,
maximum_number_nsz_f32,
maximum_number_nsz_f64,
maximum_number_nsz_f128,
maximum_number_f16,
maximum_number_f32,
maximum_number_f64,
maximum_number_f128,
maximumf16,
maximumf32,
maximumf64,
Expand Down Expand Up @@ -1248,10 +1248,10 @@ symbols! {
min_generic_const_args,
min_specialization,
min_type_alias_impl_trait,
minimum_number_nsz_f16,
minimum_number_nsz_f32,
minimum_number_nsz_f64,
minimum_number_nsz_f128,
minimum_number_f16,
minimum_number_f32,
minimum_number_f64,
minimum_number_f128,
minimumf16,
minimumf32,
minimumf64,
Expand Down
Loading
Loading