fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

demod_soft: fix clang warning in demod NEON code 

Try to bring back compilation.
Disable temporarily Werror.

Re-enable two simd functions.
This commit is contained in:
Andre Puschmann 2020-05-06 22:05:39 +02:00
parent f67524707d
commit 189685b6f5
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -466,10 +466,10 @@ if("Ninja" STREQUAL ${CMAKE_GENERATOR})
endif()
# Add -Werror to C/C++ flags for newer compilers
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
endif()
#if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
#endif()
message(STATUS "CMAKE_C_FLAGS is ${CMAKE_C_FLAGS}")
message(STATUS "CMAKE_CXX_FLAGS is ${CMAKE_CXX_FLAGS}")

26
lib/include/srslte/phy/utils/simd.h
View File

@ -1551,22 +1551,19 @@ static inline simd_s_t srslte_simd_s_neg(simd_s_t a, simd_s_t b)
/* Taken and modified from sse2neon.h licensed under MIT
* Source: https://github.com/DLTcollab/sse2neon
*/
int16x8_t _a = vreinterpretq_s16_s32(a);
int16x8_t _b = vreinterpretq_s16_s32(b);
int16x8_t zero = vdupq_n_s16(0);
// signed shift right: faster than vclt
// (b < 0) ? 0xFFFF : 0
uint16x8_t ltMask = vreinterpretq_u16_s16(vshrq_n_s16(_b, 15));
uint16x8_t ltMask = vreinterpretq_u16_s16(vshrq_n_s16(b, 15));
// (b == 0) ? 0xFFFF : 0
int16x8_t zeroMask = vreinterpretq_s16_u16(vceqq_s16(_b, zero));
int16x8_t zeroMask = vreinterpretq_s16_u16(vceqq_s16(b, zero));
// -a
int16x8_t neg = vnegq_s16(_a);
int16x8_t neg = vnegq_s16(a);
// bitwise select either a or neg based on ltMask
int16x8_t masked = vbslq_s16(ltMask, _a, neg);
int16x8_t masked = vbslq_s16(ltMask, a, neg);
// res = masked & (~zeroMask)
int16x8_t res = vbicq_s16(masked, zeroMask);
return vreinterpretq_s32_s16(res);
return res;
#endif /* HAVE_NEON */
#endif /* LV_HAVE_SSE */
#endif /* LV_HAVE_AVX2 */
@ -2068,22 +2065,19 @@ static inline simd_s_t srslte_simd_b_neg(simd_b_t a, simd_b_t b)
/* Taken and modified from sse2neon.h licensed under MIT
* Source: https://github.com/DLTcollab/sse2neon
*/
int8x16_t _a = vreinterpretq_s8_s64(a);
int8x16_t _b = vreinterpretq_s8_s64(b);
int8x16_t zero = vdupq_n_s8(0);
// signed shift right: faster than vclt
// (b < 0) ? 0xFF : 0
uint8x16_t ltMask = vreinterpretq_u8_s8(vshrq_n_s8(_b, 7));
uint8x16_t ltMask = vreinterpretq_u8_s8(vshrq_n_s8(b, 7));
// (b == 0) ? 0xFF : 0
int8x16_t zeroMask = vreinterpretq_s8_u8(vceqq_s8(_b, zero));
int8x16_t zeroMask = vreinterpretq_s8_u8(vceqq_s8(b, zero));
// -a
int8x16_t neg = vnegq_s8(_a);
int8x16_t neg = vnegq_s8(a);
// bitwise select either a or neg based on ltMask
int8x16_t masked = vbslq_s8(ltMask, _a, neg);
int8x16_t masked = vbslq_s8(ltMask, a, neg);
// res = masked & (~zeroMask)
int8x16_t res = vbicq_s8(masked, zeroMask);
return vreinterpretq_s64_s8(res);
return res;
#endif /* HAVE_NEON */
#endif /* LV_HAVE_SSE */
#endif /* LV_HAVE_AVX2 */

8
lib/src/phy/modem/demod_soft.c
View File

@ -497,8 +497,8 @@ void demod_64qam_lte_s_neon(const cf_t* symbols, short* llr, int nsymbols)
llr[6 * i + 0] = -yre;
llr[6 * i + 1] = -yim;
llr[6 * i + 2] = abs(yre) - 4 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
llr[6 * i + 3] = abs(yim) - 4 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
llr[6 * i + 2] = fabs(yre) - 4 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
llr[6 * i + 3] = fabs(yim) - 4 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
llr[6 * i + 4] = abs(llr[6 * i + 2]) - 2 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
llr[6 * i + 5] = abs(llr[6 * i + 3]) - 2 * SCALE_SHORT_CONV_QAM64 / sqrtf(42);
}
@ -580,8 +580,8 @@ void demod_64qam_lte_b_neon(const cf_t* symbols, int8_t* llr, int nsymbols)
llr[6 * i + 0] = -yre;
llr[6 * i + 1] = -yim;
llr[6 * i + 2] = abs(yre) - 4 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
llr[6 * i + 3] = abs(yim) - 4 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
llr[6 * i + 2] = fabs(yre) - 4 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
llr[6 * i + 3] = fabs(yim) - 4 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
llr[6 * i + 4] = abs(llr[6 * i + 2]) - 2 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
llr[6 * i + 5] = abs(llr[6 * i + 3]) - 2 * SCALE_BYTE_CONV_QAM64 / sqrtf(42);
}