Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions crates/dialect-mir/src/rust_intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,11 @@ pub const CALLEE_FABS: &str = placeholder!("fabs");
pub const CALLEE_COPYSIGN_F32: &str = placeholder!("copysignf32");
/// Placeholder call used for `core::intrinsics::copysignf64`.
pub const CALLEE_COPYSIGN_F64: &str = placeholder!("copysignf64");
/// Placeholder call used for `f32::atan2` / `std::sys::cmath::atan2f`.
pub const CALLEE_ATAN2_F32: &str = placeholder!("atan2f32");
/// Placeholder call used for `f64::atan2` / `std::sys::cmath::atan2`.
pub const CALLEE_ATAN2_F64: &str = placeholder!("atan2f64");
/// Placeholder call used for `f32::atan` / `std::sys::cmath::atanf`.
pub const CALLEE_ATAN_F32: &str = placeholder!("atanf32");
/// Placeholder call used for `f64::atan` / `std::sys::cmath::atan`.
pub const CALLEE_ATAN_F64: &str = placeholder!("atanf64");
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ pub enum RustFloatMathIntrinsic {
CopysignF32,
/// `core::intrinsics::copysignf64`.
CopysignF64,
/// `f32::atan2` / `std::sys::cmath::atan2f`.
Atan2F32,
/// `f64::atan2` / `std::sys::cmath::atan2`.
Atan2F64,
/// `f32::atan` / `std::sys::cmath::atanf`.
AtanF32,
/// `f64::atan` / `std::sys::cmath::atan`.
AtanF64,
}

impl RustFloatMathIntrinsic {
Expand Down Expand Up @@ -154,6 +162,10 @@ impl RustFloatMathIntrinsic {
"core::intrinsics::copysignf64" | "std::intrinsics::copysignf64" => {
Some(Self::CopysignF64)
}
"std::sys::cmath::atan2f" => Some(Self::Atan2F32),
"std::sys::cmath::atan2" => Some(Self::Atan2F64),
"std::sys::cmath::atanf" => Some(Self::AtanF32),
"std::sys::cmath::atan" => Some(Self::AtanF64),
_ => None,
}
}
Expand Down Expand Up @@ -200,6 +212,10 @@ impl RustFloatMathIntrinsic {
Self::Fabs => rust_intrinsics::CALLEE_FABS,
Self::CopysignF32 => rust_intrinsics::CALLEE_COPYSIGN_F32,
Self::CopysignF64 => rust_intrinsics::CALLEE_COPYSIGN_F64,
Self::Atan2F32 => rust_intrinsics::CALLEE_ATAN2_F32,
Self::Atan2F64 => rust_intrinsics::CALLEE_ATAN2_F64,
Self::AtanF32 => rust_intrinsics::CALLEE_ATAN_F32,
Self::AtanF64 => rust_intrinsics::CALLEE_ATAN_F64,
}
}
}
Expand Down
36 changes: 35 additions & 1 deletion crates/mir-lower/src/convert/ops/call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ enum RustFloatMathIntrinsic {
Fabs,
CopysignF32,
CopysignF64,
Atan2F32,
Atan2F64,
AtanF32,
AtanF64,
}

impl RustFloatMathIntrinsic {
Expand Down Expand Up @@ -234,6 +238,10 @@ impl RustFloatMathIntrinsic {
rust_intrinsics::CALLEE_FABS => Some(Self::Fabs),
rust_intrinsics::CALLEE_COPYSIGN_F32 => Some(Self::CopysignF32),
rust_intrinsics::CALLEE_COPYSIGN_F64 => Some(Self::CopysignF64),
rust_intrinsics::CALLEE_ATAN2_F32 => Some(Self::Atan2F32),
rust_intrinsics::CALLEE_ATAN2_F64 => Some(Self::Atan2F64),
rust_intrinsics::CALLEE_ATAN_F32 => Some(Self::AtanF32),
rust_intrinsics::CALLEE_ATAN_F64 => Some(Self::AtanF64),
_ => None,
}
}
Expand Down Expand Up @@ -283,6 +291,10 @@ impl RustFloatMathIntrinsic {
Self::Fabs => fabs_libdevice_name(ctx, result_ty, loc),
Self::CopysignF32 => Ok("__nv_copysignf"),
Self::CopysignF64 => Ok("__nv_copysign"),
Self::Atan2F32 => Ok("__nv_atan2f"),
Self::Atan2F64 => Ok("__nv_atan2"),
Self::AtanF32 => Ok("__nv_atanf"),
Self::AtanF64 => Ok("__nv_atan"),
}
}

Expand All @@ -294,7 +306,9 @@ impl RustFloatMathIntrinsic {
| Self::PowfF32
| Self::PowfF64
| Self::CopysignF32
| Self::CopysignF64 => 2,
| Self::CopysignF64
| Self::Atan2F32
| Self::Atan2F64 => 2,
Self::FmaF32 | Self::FmaF64 | Self::FmuladdF32 | Self::FmuladdF64 => 3,
_ => 1,
}
Expand Down Expand Up @@ -1101,6 +1115,22 @@ mod tests {
rust_intrinsics::CALLEE_LOG2_F64,
RustFloatMathIntrinsic::Log2F64,
),
(
rust_intrinsics::CALLEE_ATAN2_F32,
RustFloatMathIntrinsic::Atan2F32,
),
(
rust_intrinsics::CALLEE_ATAN2_F64,
RustFloatMathIntrinsic::Atan2F64,
),
(
rust_intrinsics::CALLEE_ATAN_F32,
RustFloatMathIntrinsic::AtanF32,
),
(
rust_intrinsics::CALLEE_ATAN_F64,
RustFloatMathIntrinsic::AtanF64,
),
];

for (name, expected) in cases {
Expand All @@ -1125,6 +1155,10 @@ mod tests {
assert_eq!(RustFloatMathIntrinsic::PowiF32.arg_count(), 2);
assert_eq!(RustFloatMathIntrinsic::PowfF64.arg_count(), 2);
assert_eq!(RustFloatMathIntrinsic::CopysignF32.arg_count(), 2);
assert_eq!(RustFloatMathIntrinsic::Atan2F32.arg_count(), 2);
assert_eq!(RustFloatMathIntrinsic::Atan2F64.arg_count(), 2);
assert_eq!(RustFloatMathIntrinsic::AtanF32.arg_count(), 1);
assert_eq!(RustFloatMathIntrinsic::AtanF64.arg_count(), 1);
assert_eq!(RustFloatMathIntrinsic::FmaF32.arg_count(), 3);
assert_eq!(RustFloatMathIntrinsic::FmuladdF64.arg_count(), 3);
}
Expand Down
Loading