Skip to content

Fix fma4 support #1072

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

Merged
serge-sans-paille merged 1 commit into from
Dec 15, 2024
Merged

Fix fma4 support #1072

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 include/xsimd/arch/xsimd_fma4.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,52 +23,52 @@ namespace xsimd

// fnma
template <class A>
XSIMD_INLINE batch<float, A> fnma(simd_register<float, A> const& x, simd_register<float, A> const& y, simd_register<float, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<float, A> fnma(batch<float, A> const& x, batch<float, A> const& y, batch<float, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_nmacc_ps(x, y, z);
}

template <class A>
XSIMD_INLINE batch<double, A> fnma(simd_register<double, A> const& x, simd_register<double, A> const& y, simd_register<double, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<double, A> fnma(batch<double, A> const& x, batch<double, A> const& y, batch<double, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_nmacc_pd(x, y, z);
}

// fnms
template <class A>
XSIMD_INLINE batch<float, A> fnms(simd_register<float, A> const& x, simd_register<float, A> const& y, simd_register<float, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<float, A> fnms(batch<float, A> const& x, batch<float, A> const& y, batch<float, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_nmsub_ps(x, y, z);
}

template <class A>
XSIMD_INLINE batch<double, A> fnms(simd_register<double, A> const& x, simd_register<double, A> const& y, simd_register<double, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<double, A> fnms(batch<double, A> const& x, batch<double, A> const& y, batch<double, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_nmsub_pd(x, y, z);
}

// fma
template <class A>
XSIMD_INLINE batch<float, A> fma(simd_register<float, A> const& x, simd_register<float, A> const& y, simd_register<float, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<float, A> fma(batch<float, A> const& x, batch<float, A> const& y, batch<float, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_macc_ps(x, y, z);
}

template <class A>
XSIMD_INLINE batch<double, A> fma(simd_register<double, A> const& x, simd_register<double, A> const& y, simd_register<double, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<double, A> fma(batch<double, A> const& x, batch<double, A> const& y, batch<double, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_macc_pd(x, y, z);
}

// fms
template <class A>
XSIMD_INLINE batch<float, A> fms(simd_register<float, A> const& x, simd_register<float, A> const& y, simd_register<float, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<float, A> fms(batch<float, A> const& x, batch<float, A> const& y, batch<float, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_msub_ps(x, y, z);
}

template <class A>
XSIMD_INLINE batch<double, A> fms(simd_register<double, A> const& x, simd_register<double, A> const& y, simd_register<double, A> const& z, requires_arch<fma4>) noexcept
XSIMD_INLINE batch<double, A> fms(batch<double, A> const& x, batch<double, A> const& y, batch<double, A> const& z, requires_arch<fma4>) noexcept
{
return _mm_msub_pd(x, y, z);
}
Expand Down
4 changes: 4 additions & 0 deletions include/xsimd/types/xsimd_fma4_register.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

#include "./xsimd_sse4_2_register.hpp"

#if XSIMD_WITH_FMA4
#include <x86intrin.h>
#endif

namespace xsimd
{
/**
Expand Down
3 changes: 1 addition & 2 deletions test/architectures/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
set(INTEL_PROCESSORS
knl knm skylake-avx512 cannonlake icelake-client
bdver1 knl knm skylake-avx512 cannonlake icelake-client
icelake-server cascadelake cooperlake tigerlake sapphirerapids alderlake
rocketlake graniterapids graniterapids-d znver4)
set(CMAKE_CXX_FLAGS "-Werror=unused-command-line-argument")

foreach(INTEL_PROCESSOR ${INTEL_PROCESSORS})
# Adding the werror here to choke if the -march is incompatible with the
Expand Down
Loading