alex/nih-plug
1
0
Fork 0
Code Activity

Clean up ScopedFtz conditional compilation even more (remove the need for the cfg_if! macro)

Browse source
This commit is contained in:
Adrien Prokopowicz 2023-05-22 22:54:36 +02:00 committed by Robbert van der Helm
parent d20b9a19ee
commit d61f3c885d
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/wrapper/util.rs
View file

@ -204,19 +204,27 @@ struct ScopedFtz {
impl ScopedFtz { impl ScopedFtz {
fn enable() -> Self { fn enable() -> Self {
#[cfg(not(miri))] #[cfg(not(miri))]
cfg_if::cfg_if! { {
if #[cfg(target_feature = "sse")] { #[cfg(target_feature = "sse")]
{
let mode = unsafe { std::arch::x86_64::_MM_GET_FLUSH_ZERO_MODE() }; let mode = unsafe { std::arch::x86_64::_MM_GET_FLUSH_ZERO_MODE() };
let should_disable_again = mode != std::arch::x86_64::_MM_FLUSH_ZERO_ON; let should_disable_again = mode != std::arch::x86_64::_MM_FLUSH_ZERO_ON;
if should_disable_again { if should_disable_again {
unsafe { std::arch::x86_64::_MM_SET_FLUSH_ZERO_MODE(std::arch::x86_64::_MM_FLUSH_ZERO_ON) }; unsafe {
std::arch::x86_64::_MM_SET_FLUSH_ZERO_MODE(
std::arch::x86_64::_MM_FLUSH_ZERO_ON,
)
};
} }
return Self { return Self {
should_disable_again, should_disable_again,
_send_sync_marker: PhantomData, _send_sync_marker: PhantomData,
};
} }
} else if #[cfg(target_arch = "aarch64")] {
#[cfg(target_arch = "aarch64")]
{
// There are no convient intrinsics to change the FTZ settings on AArch64, so this // There are no convient intrinsics to change the FTZ settings on AArch64, so this
// requires inline assembly: // requires inline assembly:
// https://developer.arm.com/documentation/ddi0595/2021-06/AArch64-Registers/FPCR--Floating-point-Control-Register // https://developer.arm.com/documentation/ddi0595/2021-06/AArch64-Registers/FPCR--Floating-point-Control-Register
@ -231,7 +239,7 @@ impl ScopedFtz {
return Self { return Self {
should_disable_again, should_disable_again,
_send_sync_marker: PhantomData, _send_sync_marker: PhantomData,
} };
} }
} }
@ -246,15 +254,21 @@ impl Drop for ScopedFtz {
fn drop(&mut self) { fn drop(&mut self) {
#[cfg(not(miri))] #[cfg(not(miri))]
if self.should_disable_again { if self.should_disable_again {
cfg_if::cfg_if! { #[cfg(target_feature = "sse")]
if #[cfg(target_feature = "sse")] { {
unsafe { std::arch::x86_64::_MM_SET_FLUSH_ZERO_MODE(std::arch::x86_64::_MM_FLUSH_ZERO_OFF) }; return unsafe {
} else if #[cfg(target_arch = "aarch64")] { std::arch::x86_64::_MM_SET_FLUSH_ZERO_MODE(
std::arch::x86_64::_MM_FLUSH_ZERO_OFF,
)
};
}
#[cfg(target_arch = "aarch64")]
{
let mut fpcr: u64; let mut fpcr: u64;
unsafe { std::arch::asm!("mrs {}, fpcr", out(reg) fpcr) }; unsafe { std::arch::asm!("mrs {}, fpcr", out(reg) fpcr) };
unsafe { std::arch::asm!("msr fpcr, {}", in(reg) fpcr & !AARCH64_FTZ_BIT) }; unsafe { std::arch::asm!("msr fpcr, {}", in(reg) fpcr & !AARCH64_FTZ_BIT) };
} }
};
} }
} }
} }