From 0294cb134cb29cd3f634979141bc9c51a9d47e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 27 Oct 2017 17:57:23 -0700 Subject: [PATCH] Fixed SIMD intrisic yBxA -> AxBy. --- include/bx/inline/simd128_langext.inl | 2 +- include/bx/inline/simd128_neon.inl | 2 +- include/bx/inline/simd128_ref.inl | 2 +- include/bx/inline/simd128_sse.inl | 2 +- include/bx/simd_t.h | 2 +- tests/simd_test.cpp | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/bx/inline/simd128_langext.inl b/include/bx/inline/simd128_langext.inl index 72e4c56..9fa3f41 100644 --- a/include/bx/inline/simd128_langext.inl +++ b/include/bx/inline/simd128_langext.inl @@ -112,7 +112,7 @@ BX_SIMD128_IMPLEMENT_TEST(xyzw , 0xf); } template<> - BX_SIMD_FORCE_INLINE simd128_langext_t simd_shuf_yBxA(simd128_langext_t _a, simd128_langext_t _b) + BX_SIMD_FORCE_INLINE simd128_langext_t simd_shuf_AxBy(simd128_langext_t _a, simd128_langext_t _b) { simd128_langext_t result; result.vf = __builtin_shufflevector(_a.vf, _b.vf, 1, 5, 0, 4); diff --git a/include/bx/inline/simd128_neon.inl b/include/bx/inline/simd128_neon.inl index f36610c..356b7c7 100644 --- a/include/bx/inline/simd128_neon.inl +++ b/include/bx/inline/simd128_neon.inl @@ -102,7 +102,7 @@ BX_SIMD128_IMPLEMENT_TEST(yzw, yzww); } template<> - BX_SIMD_FORCE_INLINE simd128_neon_t simd_shuf_yBxA(simd128_neon_t _a, simd128_neon_t _b) + BX_SIMD_FORCE_INLINE simd128_neon_t simd_shuf_AxBy(simd128_neon_t _a, simd128_neon_t _b) { return __builtin_shuffle(_a, _b, (uint32x4_t){ 1, 5, 0, 4 }); } diff --git a/include/bx/inline/simd128_ref.inl b/include/bx/inline/simd128_ref.inl index 85d82cf..0ef8f68 100644 --- a/include/bx/inline/simd128_ref.inl +++ b/include/bx/inline/simd128_ref.inl @@ -130,7 +130,7 @@ BX_SIMD128_IMPLEMENT_TEST(xyzw , 0xf); } template<> - BX_SIMD_FORCE_INLINE simd128_ref_t simd_shuf_yBxA(simd128_ref_t _a, simd128_ref_t _b) + BX_SIMD_FORCE_INLINE simd128_ref_t simd_shuf_AxBy(simd128_ref_t _a, simd128_ref_t _b) { simd128_ref_t result; result.uxyzw[0] = _a.uxyzw[1]; diff --git a/include/bx/inline/simd128_sse.inl b/include/bx/inline/simd128_sse.inl index 29d74b1..69f37d1 100644 --- a/include/bx/inline/simd128_sse.inl +++ b/include/bx/inline/simd128_sse.inl @@ -90,7 +90,7 @@ BX_SIMD128_IMPLEMENT_TEST(xyzw , 0xf); } template<> - BX_SIMD_FORCE_INLINE simd128_sse_t simd_shuf_yBxA(simd128_sse_t _a, simd128_sse_t _b) + BX_SIMD_FORCE_INLINE simd128_sse_t simd_shuf_AxBy(simd128_sse_t _a, simd128_sse_t _b) { return _mm_unpacklo_ps(_b, _a); } diff --git a/include/bx/simd_t.h b/include/bx/simd_t.h index c7be8eb..f63dcfb 100644 --- a/include/bx/simd_t.h +++ b/include/bx/simd_t.h @@ -101,7 +101,7 @@ BX_SIMD128_IMPLEMENT_TEST(xyzw); Ty simd_shuf_xAyB(Ty _a, Ty _b); template - Ty simd_shuf_yBxA(Ty _a, Ty _b); + Ty simd_shuf_AxBy(Ty _a, Ty _b); template Ty simd_shuf_zCwD(Ty _a, Ty _b); diff --git a/tests/simd_test.cpp b/tests/simd_test.cpp index 97ae9bf..fcdc7a9 100644 --- a/tests/simd_test.cpp +++ b/tests/simd_test.cpp @@ -235,13 +235,14 @@ TEST_CASE("simd_shuffle", "") const simd128_t ABCD = simd_ild(0x41414141, 0x42424242, 0x43434343, 0x44444444); simd_check_string("xyAB", simd_shuf_xyAB(xyzw, ABCD) ); simd_check_string("ABxy", simd_shuf_ABxy(xyzw, ABCD) ); - simd_check_string("zwCD", simd_shuf_zwCD(xyzw, ABCD) ); simd_check_string("CDzw", simd_shuf_CDzw(xyzw, ABCD) ); + simd_check_string("zwCD", simd_shuf_zwCD(xyzw, ABCD) ); simd_check_string("xAyB", simd_shuf_xAyB(xyzw, ABCD) ); + simd_check_string("AxBy", simd_shuf_AxBy(xyzw, ABCD) ); simd_check_string("zCwD", simd_shuf_zCwD(xyzw, ABCD) ); + simd_check_string("CzDw", simd_shuf_CzDw(xyzw, ABCD) ); simd_check_string("xAzC", simd_shuf_xAzC(xyzw, ABCD) ); simd_check_string("yBwD", simd_shuf_yBwD(xyzw, ABCD) ); - simd_check_string("CzDw", simd_shuf_CzDw(xyzw, ABCD) ); } TEST_CASE("simd_compare", "")