Skip to content

Commit

Permalink
Improves simd float tests coverage.
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillaumeblanc
guillaumeblanc committed Mar 9, 2019
1 parent 0be29fa commit e4291ef
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 23 deletions.
43 changes: 43 additions & 0 deletions include/ozz/base/maths/gtest_math_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,49 @@ inline void ExpectTrue(bool _b) { EXPECT_TRUE(_b); }
\
} while (void(0), 0)

// Macro for testing ozz::math::simd::SimdFloat members with x, y values with
// a user defined precision.
#define _IMPL_EXPECT_SIMDFLOAT2_EQ_TOL(_expected, _x, _y, _tol) \
\
do { \
union { \
ozz::math::SimdFloat4 ret; \
float af[4]; \
} u = {_expected}; \
ExpectFloatNear(u.af[0], _x, _tol); \
ExpectFloatNear(u.af[1], _y, _tol); \
\
} while (void(0), 0)

// Macro for testing ozz::math::simd::SimdFloat members with x, y values.
#define EXPECT_SIMDFLOAT2_EQ(_expected, _x, _y) \
\
do { \
SCOPED_TRACE(""); \
_IMPL_EXPECT_SIMDFLOAT2_EQ_TOL(_expected, _x, _y, kFloatNearTolerance); \
\
} while (void(0), 0)

// Macro for testing ozz::math::simd::SimdFloat members with x, y values.
// Dedicated to estimated functions with a lower precision.
#define EXPECT_SIMDFLOAT2_EQ_EST(_expected, _x, _y) \
\
do { \
SCOPED_TRACE(""); \
_IMPL_EXPECT_SIMDFLOAT2_EQ_TOL(_expected, _x, _y, kFloatNearEstTolerance); \
\
} while (void(0), 0)

// Macro for testing ozz::math::simd::SimdFloat members with x, y, z values.
// Dedicated to estimated functions with a user defined precision.
#define EXPECT_SIMDFLOAT3_EQ_TOL(_expected, _x, _y, _z, _tol) \
\
do { \
SCOPED_TRACE(""); \
_IMPL_EXPECT_SIMDFLOAT3_EQ_TOL(_expected, _x, _y, _z, _tol); \
\
} while (void(0), 0)

// Macro for testing ozz::math::simd::SimdFloat members with x, y, z values with
// a user defined precision.
#define _IMPL_EXPECT_SIMDFLOAT3_EQ_TOL(_expected, _x, _y, _z, _tol) \
Expand Down
44 changes: 21 additions & 23 deletions test/base/maths/simd_float_math_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,36 +298,36 @@ TEST(ArithmeticFloat, ozz_simd_math) {
const ozz::math::SimdFloat4 a =
ozz::math::simd_float4::Load(0.5f, 1.f, 2.f, 3.f);
const ozz::math::SimdFloat4 b =
ozz::math::simd_float4::Load(4.f, 5.f, -6.f, 7.f);
ozz::math::simd_float4::Load(4.f, 5.f, -6.f, 0.f);
const ozz::math::SimdFloat4 c =
ozz::math::simd_float4::Load(-8.f, 9.f, 10.f, 11.f);

const ozz::math::SimdFloat4 add = a + b;
EXPECT_SIMDFLOAT_EQ(add, 4.5f, 6.f, -4.f, 10.f);
EXPECT_SIMDFLOAT_EQ(add, 4.5f, 6.f, -4.f, 3.f);

const ozz::math::SimdFloat4 sub = a - b;
EXPECT_SIMDFLOAT_EQ(sub, -3.5f, -4.f, 8.f, -4.f);
EXPECT_SIMDFLOAT_EQ(sub, -3.5f, -4.f, 8.f, 3.f);

const ozz::math::SimdFloat4 neg = -b;
EXPECT_SIMDFLOAT_EQ(neg, -4.f, -5.f, 6.f, -7.f);
EXPECT_SIMDFLOAT_EQ(neg, -4.f, -5.f, 6.f, -0.f);

const ozz::math::SimdFloat4 mul = a * b;
EXPECT_SIMDFLOAT_EQ(mul, 2.f, 5.f, -12.f, 21.f);
EXPECT_SIMDFLOAT_EQ(mul, 2.f, 5.f, -12.f, 0.f);

const ozz::math::SimdFloat4 div = a / b;
EXPECT_SIMDFLOAT_EQ(div, 0.5f / 4.f, 1.f / 5.f, -2.f / 6.f, 3.f / 7.f);
EXPECT_SIMDFLOAT3_EQ(div, 0.5f / 4.f, 1.f / 5.f, -2.f / 6.f);

const ozz::math::SimdFloat4 madd = ozz::math::MAdd(a, b, c);
EXPECT_SIMDFLOAT_EQ(madd, -6.f, 14.f, -2.f, 32.f);
EXPECT_SIMDFLOAT_EQ(madd, -6.f, 14.f, -2.f, 11.f);

const ozz::math::SimdFloat4 msub = ozz::math::MSub(a, b, c);
EXPECT_SIMDFLOAT_EQ(msub, 10.f, -4.f, -22.f, 10.f);
EXPECT_SIMDFLOAT_EQ(msub, 10.f, -4.f, -22.f, -11.f);

const ozz::math::SimdFloat4 nmadd = ozz::math::NMAdd(a, b, c);
EXPECT_SIMDFLOAT_EQ(nmadd, -10.f, 4.f, 22.f, -10.f);
EXPECT_SIMDFLOAT_EQ(nmadd, -10.f, 4.f, 22.f, 11.f);

const ozz::math::SimdFloat4 nmsub = ozz::math::NMSub(a, b, c);
EXPECT_SIMDFLOAT_EQ(nmsub, 6.f, -14.f, 2.f, -32.f);
EXPECT_SIMDFLOAT_EQ(nmsub, 6.f, -14.f, 2.f, -11.f);

const ozz::math::SimdFloat4 divx = ozz::math::DivX(a, b);
EXPECT_SIMDFLOAT_EQ(divx, 0.5f / 4.f, 1.f, 2.f, 3.f);
Expand All @@ -348,7 +348,7 @@ TEST(ArithmeticFloat, ozz_simd_math) {
EXPECT_FLOAT_EQ(ozz::math::GetX(dot3), -5.f);

const ozz::math::SimdFloat4 dot4 = ozz::math::Dot4(a, b);
EXPECT_FLOAT_EQ(ozz::math::GetX(dot4), 16.f);
EXPECT_FLOAT_EQ(ozz::math::GetX(dot4), -5.f);

const ozz::math::SimdFloat4 cross =
ozz::math::Cross3(ozz::math::simd_float4::Load(1.f, -2.f, 3.f, 46.f),
Expand All @@ -358,30 +358,28 @@ TEST(ArithmeticFloat, ozz_simd_math) {
EXPECT_FLOAT_EQ(ozz::math::GetZ(cross), 13.f);

const ozz::math::SimdFloat4 rcp = ozz::math::RcpEst(b);
EXPECT_SIMDFLOAT_EQ_EST(rcp, 1.f / 4.f, 1.f / 5.f, -1.f / 6.f, 1.f / 7.f);
EXPECT_SIMDFLOAT3_EQ_EST(rcp, 1.f / 4.f, 1.f / 5.f, -1.f / 6.f);

const ozz::math::SimdFloat4 rcpnr = ozz::math::RcpEstNR(b);
EXPECT_SIMDFLOAT_EQ(rcpnr, 1.f / 4.f, 1.f / 5.f, -1.f / 6.f, 1.f / 7.f);
EXPECT_SIMDFLOAT3_EQ(rcpnr, 1.f / 4.f, 1.f / 5.f, -1.f / 6.f);

const ozz::math::SimdFloat4 rcpxnr = ozz::math::RcpEstXNR(b);
EXPECT_FLOAT_EQ(ozz::math::GetX(rcpxnr), 1.f / 4.f);

const ozz::math::SimdFloat4 rcpx = ozz::math::RcpEstX(b);
EXPECT_SIMDFLOAT_EQ_EST(rcpx, 1.f / 4.f, 5.f, -6.f, 7.f);
EXPECT_SIMDFLOAT_EQ_EST(rcpx, 1.f / 4.f, 5.f, -6.f, 0.f);

const ozz::math::SimdFloat4 sqrt = ozz::math::Sqrt(a);
EXPECT_SIMDFLOAT_EQ(sqrt, .7071068f, 1.f, 1.4142135f, 1.7320508f);

const ozz::math::SimdFloat4 sqrtx = ozz::math::SqrtX(a);
EXPECT_SIMDFLOAT_EQ(sqrtx, .7071068f, 1.f, 2.f, 3.f);
const ozz::math::SimdFloat4 sqrtx = ozz::math::SqrtX(b);
EXPECT_SIMDFLOAT_EQ(sqrtx, 2.f, 5.f, -6.f, 0.f);

const ozz::math::SimdFloat4 rsqrt = ozz::math::RSqrtEst(a);
EXPECT_SIMDFLOAT_EQ_EST(rsqrt, 1.f / .7071068f, 1.f, 1.f / 1.4142135f,
1.f / 1.7320508f);
const ozz::math::SimdFloat4 rsqrt = ozz::math::RSqrtEst(b);
EXPECT_SIMDFLOAT2_EQ_EST(rsqrt, 1.f / 2.f, 1.f / 2.23606798f);

const ozz::math::SimdFloat4 rsqrtnr = ozz::math::RSqrtEstNR(a);
EXPECT_SIMDFLOAT_EQ(rsqrtnr, 1.f / .7071068f, 1.f, 1.f / 1.4142135f,
1.f / 1.7320508f);
const ozz::math::SimdFloat4 rsqrtnr = ozz::math::RSqrtEstNR(b);
EXPECT_SIMDFLOAT2_EQ_EST(rsqrtnr, 1.f / 2.f, 1.f / 2.23606798f);

const ozz::math::SimdFloat4 rsqrtx = ozz::math::RSqrtEstX(a);
EXPECT_SIMDFLOAT_EQ_EST(rsqrtx, 1.f / .7071068f, 1.f, 2.f, 3.f);
Expand All @@ -390,7 +388,7 @@ TEST(ArithmeticFloat, ozz_simd_math) {
EXPECT_FLOAT_EQ(ozz::math::GetX(rsqrtxnr), 1.f / .7071068f);

const ozz::math::SimdFloat4 abs = ozz::math::Abs(b);
EXPECT_SIMDFLOAT_EQ(abs, 4.f, 5.f, 6.f, 7.f);
EXPECT_SIMDFLOAT_EQ(abs, 4.f, 5.f, 6.f, 0.f);

const SimdInt4 sign = ozz::math::Sign(b);
EXPECT_SIMDINT_EQ(sign, 0, 0, 0x80000000, 0);
Expand Down

0 comments on commit e4291ef

Please sign in to comment.