Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[SYCL][ESIMD] Move rounding functions out of experimental namespace #914

Merged
merged 1 commit into from
Mar 11, 2022
Merged
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
23 changes: 10 additions & 13 deletions SYCL/ESIMD/ext_math.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ enum class MathOp {
inv,
log,
rsqrt,
floor,
ceil,
trunc,
exp2,
log2,
Expand Down Expand Up @@ -130,6 +132,8 @@ DEFINE_HOST_OP(inv, 1.0f / X);
DEFINE_HOST_OP(sqrt, std::sqrt(X));
DEFINE_HOST_OP(sqrt_ieee, std::sqrt(X));
DEFINE_HOST_OP(rsqrt, 1.0f / std::sqrt(X));
DEFINE_HOST_OP(floor, std::floor(X));
DEFINE_HOST_OP(ceil, std::ceil(X));
DEFINE_HOST_OP(trunc, std::trunc(X));
DEFINE_HOST_OP(exp2, std::exp2(X));
DEFINE_HOST_OP(log2, std::log2(X));
Expand All @@ -146,7 +150,7 @@ DEFINE_HOST_BIN_OP(pow, std::pow(X, Y));

#define DEFINE_ESIMD_DEVICE_OP(Op) \
template <class T, int N> struct ESIMDf<T, N, MathOp::Op, AllVec> { \
simd<T, N> operator()(simd<T, N>X) const SYCL_ESIMD_FUNCTION { \
simd<T, N> operator()(simd<T, N> X) const SYCL_ESIMD_FUNCTION { \
return esimd::Op<T, N>(X); \
} \
}; \
Expand All @@ -155,17 +159,6 @@ DEFINE_HOST_BIN_OP(pow, std::pow(X, Y));
return esimd::Op<T, N>(X); \
} \
};
#define DEFINE_EXP_ESIMD_DEVICE_OP(Op) \
template <class T, int N> struct ESIMDf<T, N, MathOp::Op, AllVec> { \
simd<T, N> operator()(simd<T, N> X) const SYCL_ESIMD_FUNCTION { \
return experimental::esimd::Op<T, N>(X); \
} \
}; \
template <class T, int N> struct ESIMDf<T, N, MathOp::Op, AllSca> { \
simd<T, N> operator()(T X) const SYCL_ESIMD_FUNCTION { \
return experimental::esimd::Op<T, N>(X); \
} \
};

DEFINE_ESIMD_DEVICE_OP(sin);
DEFINE_ESIMD_DEVICE_OP(cos);
Expand All @@ -175,7 +168,9 @@ DEFINE_ESIMD_DEVICE_OP(inv);
DEFINE_ESIMD_DEVICE_OP(sqrt);
DEFINE_ESIMD_DEVICE_OP(sqrt_ieee);
DEFINE_ESIMD_DEVICE_OP(rsqrt);
DEFINE_EXP_ESIMD_DEVICE_OP(trunc);
DEFINE_ESIMD_DEVICE_OP(floor);
DEFINE_ESIMD_DEVICE_OP(ceil);
DEFINE_ESIMD_DEVICE_OP(trunc);
DEFINE_ESIMD_DEVICE_OP(exp2);
DEFINE_ESIMD_DEVICE_OP(log2);

Expand Down Expand Up @@ -416,6 +411,8 @@ template <class T, int N> bool testESIMD(queue &Q) {
Pass &= test<T, N, MathOp::log, ESIMDf>(Q, "log", InitWide<T>{});
Pass &= test<T, N, MathOp::exp2, ESIMDf>(Q, "exp2", InitInRange0_5<T>{});
Pass &= test<T, N, MathOp::log2, ESIMDf>(Q, "log2", InitWide<T>{});
Pass &= test<T, N, MathOp::floor, ESIMDf>(Q, "floor", InitWide<T>{});
Pass &= test<T, N, MathOp::ceil, ESIMDf>(Q, "ceil", InitWide<T>{});
Pass &= test<T, N, MathOp::trunc, ESIMDf>(Q, "trunc", InitWide<T>{});
return Pass;
}
Expand Down