From 8f72d4c55e39c6452a3840b6f8c07c4db0cabdba Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Mon, 13 Apr 2020 14:24:22 +0200 Subject: [PATCH] simd: fix compilation error under NEON --- lib/include/srslte/phy/utils/simd.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/include/srslte/phy/utils/simd.h b/lib/include/srslte/phy/utils/simd.h index ba71b0aac..01e601727 100644 --- a/lib/include/srslte/phy/utils/simd.h +++ b/lib/include/srslte/phy/utils/simd.h @@ -1333,21 +1333,21 @@ static inline simd_sel_t srslte_simd_f_min(simd_f_t a, simd_f_t b) #endif /* LV_HAVE_AVX512 */ } -static inline simd_f_t srslte_simd_f_select(simd_f_t a, simd_f_t b, simd_sel_t sel) +static inline simd_f_t srslte_simd_f_select(simd_f_t a, simd_f_t b, simd_sel_t selector) { #ifdef LV_HAVE_AVX512 - return _mm512_mask_blend_ps(sel, (__m512)a, (__m512)b); + return _mm512_mask_blend_ps(selector, (__m512)a, (__m512)b); #else /* LV_HAVE_AVX512 */ #ifdef LV_HAVE_AVX2 - return _mm256_blendv_ps(a, b, sel); + return _mm256_blendv_ps(a, b, selector); #else #ifdef LV_HAVE_SSE - return _mm_blendv_ps(a, b, sel); + return _mm_blendv_ps(a, b, selector); #else /* LV_HAVE_SSE */ #ifdef HAVE_NEON // CURRENTLY USES GENERIC IMPLEMENTATION FOR NEON float* a_ptr = (float*)&a; float* b_ptr = (float*)&b; - simd_i_t ret; + simd_f_t ret; int* sel = (int*)&selector; float* c_ptr = (float*)&ret; for (int i = 0; i < 4; i++) {