Skip to content
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.

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

SVE: Add support for fma-like intrinsics #1474

Merged
merged 3 commits into from
Dec 7, 2022
Merged
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
3 changes: 1 addition & 2 deletions include/eve/arch/arm/sve/sve_true.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ namespace eve::detail
// Calling svptrue_b8 is OK for most cases, where you OK with
// 1s in insignificant bits but sometimes you are not.
template<typename T>
svbool_t
EVE_FORCEINLINE svbool_t
sve_true()
{
if constexpr( sizeof(T) == 1 ) return svptrue_b8();
else if constexpr( sizeof(T) == 2 ) return svptrue_b16();
else if constexpr( sizeof(T) == 4 ) return svptrue_b32();
else if constexpr( sizeof(T) == 8 ) return svptrue_b64();
}

} // namespace eve::detail
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fam.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ EVE_MAKE_CALLABLE(fam_, fam);
#if defined(EVE_INCLUDE_X86_HEADER)
# include <eve/module/core/regular/impl/simd/x86/fam.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fam.hpp>
#endif
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fanm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ EVE_MAKE_CALLABLE(fanm_, fanm);
#if defined(EVE_INCLUDE_X86_HEADER)
# include <eve/module/core/regular/impl/simd/x86/fanm.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fanm.hpp>
#endif
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fma.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,7 @@ EVE_MAKE_CALLABLE(fma_, fma);
#if defined(EVE_INCLUDE_ARM_HEADER)
# include <eve/module/core/regular/impl/simd/arm/neon/fma.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fma.hpp>
#endif
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fnma.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,7 @@ EVE_MAKE_CALLABLE(fnma_, fnma);
#if defined(EVE_INCLUDE_ARM_HEADER)
# include <eve/module/core/regular/impl/simd/arm/neon/fnma.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fnma.hpp>
#endif
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fsm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ EVE_MAKE_CALLABLE(fsm_, fsm);
#if defined(EVE_INCLUDE_X86_HEADER)
# include <eve/module/core/regular/impl/simd/x86/fsm.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fsm.hpp>
#endif
4 changes: 4 additions & 0 deletions include/eve/module/core/regular/fsnm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,7 @@ EVE_MAKE_CALLABLE(fsnm_, fsnm);
#if defined(EVE_INCLUDE_X86_HEADER)
# include <eve/module/core/regular/impl/simd/x86/fsnm.hpp>
#endif

#if defined(EVE_INCLUDE_SVE_HEADER)
# include <eve/module/core/regular/impl/simd/arm/sve/fsnm.hpp>
#endif
37 changes: 37 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fam.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/arch/arm/sve/sve_true.hpp>
#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fam_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return fam[ignore_none](v0, v1, v2);
}

template<conditional_expr C, arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fam_(EVE_SUPPORTS(sve_), C cond, wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
if constexpr( C::is_complete && C::is_inverted ) return svmla_x(sve_true<T>(), v0, v1, v2);
else
{
auto const alt = alternative(cond, v0, as(v0));
if constexpr( C::is_complete && !C::is_inverted ) return alt;
else return svmla_m(cond.mask(as<T>{}), alt, v1, v2);
}
}
}
37 changes: 37 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fanm.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/arch/arm/sve/sve_true.hpp>
#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fanm_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return fanm[ignore_none](v0, v1, v2);
}

template<conditional_expr C, arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fanm_(EVE_SUPPORTS(sve_), C cond, wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
if constexpr( C::is_complete && C::is_inverted ) return svmls_x(sve_true<T>(), v0, v1, v2);
else
{
auto const alt = alternative(cond, v0, as(v0));
if constexpr( C::is_complete && !C::is_inverted ) return alt;
else return svmls_m(cond.mask(as<T>{}), alt, v1, v2);
}
}
}
37 changes: 37 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fma.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/arch/arm/sve/sve_true.hpp>
#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fma_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return fma[ignore_none](v0, v1, v2);
}

template<conditional_expr C, arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fma_(EVE_SUPPORTS(sve_), C cond, wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
if constexpr( C::is_complete && C::is_inverted ) return svmad_x(sve_true<T>(), v0, v1, v2);
else
{
auto const alt = alternative(cond, v0, as(v0));
if constexpr( C::is_complete && !C::is_inverted ) return alt;
else return svmad_m(cond.mask(as<T>{}), alt, v1, v2);
}
}
}
37 changes: 37 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fnma.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/arch/arm/sve/sve_true.hpp>
#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fnma_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return fnma[ignore_none](v0, v1, v2);
}

template<conditional_expr C, arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fnma_(EVE_SUPPORTS(sve_), C cond, wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
if constexpr( C::is_complete && C::is_inverted ) return svmsb_x(sve_true<T>(), v0, v1, v2);
else
{
auto const alt = alternative(cond, v0, as(v0));
if constexpr( C::is_complete && !C::is_inverted ) return alt;
else return svmsb_m(cond.mask(as<T>{}), alt, v1, v2);
}
}
}
22 changes: 22 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fsm.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fsm_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return -fanm(v0, v1, v2);
}
}
22 changes: 22 additions & 0 deletions include/eve/module/core/regular/impl/simd/arm/sve/fsnm.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//==================================================================================================
/*
EVE - Expressive Vector Engine
Copyright : EVE Project Contributors
SPDX-License-Identifier: BSL-1.0
*/
//==================================================================================================
#pragma once

#include <eve/concept/value.hpp>
#include <eve/detail/implementation.hpp>

namespace eve::detail
{
template<arithmetic_scalar_value T, typename N>
EVE_FORCEINLINE auto
fsnm_(EVE_SUPPORTS(sve_), wide<T, N> v0, wide<T, N> v1, wide<T, N> v2) noexcept -> wide<T, N>
requires sve_abi<abi_t<T, N>>
{
return -fam(v0, v1, v2);
}
}
2 changes: 1 addition & 1 deletion test/unit/module/core/fms.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ TTS_CASE_WITH("Check behavior of fms on all types full range",
{
TTS_ULP_EQUAL(fms((a0), (a1), (a2)),
map([&](auto e, auto f, auto g) -> v_t { return e * f - g; }, a0, a1, a2),
2);
5);
}
TTS_ULP_EQUAL(
eve::pedantic(fms)((a0), (a1), (a2)),
Expand Down