Commit cb562c27 authored by Quency Lin's avatar Quency Lin Committed by Robert Schmidt

Remove partial 256 SIMDe dependence for ARM

parent 47e150fb
...@@ -1112,7 +1112,6 @@ if (${SMBV}) ...@@ -1112,7 +1112,6 @@ if (${SMBV})
endif (${SMBV}) endif (${SMBV})
set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c) set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
add_library(PHY_COMMON ${PHY_SRC_COMMON}) add_library(PHY_COMMON ${PHY_SRC_COMMON})
target_link_libraries(PHY_COMMON PRIVATE shlib_loader) target_link_libraries(PHY_COMMON PRIVATE shlib_loader)
......
...@@ -8001,6 +8001,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -8001,6 +8001,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
memcpy(ch_mag_i_256i, ch_mag_i, len*4); memcpy(ch_mag_i_256i, ch_mag_i, len*4);
memcpy(rho_256i, rho, len*4); memcpy(rho_256i, rho, len*4);
#if defined(__x86_64__)
qam64_qam64_avx2((int32_t *)rxF_256i, qam64_qam64_avx2((int32_t *)rxF_256i,
(int32_t *)rxF_i_256i, (int32_t *)rxF_i_256i,
(int32_t *)ch_mag_256i, (int32_t *)ch_mag_256i,
...@@ -8008,6 +8009,15 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -8008,6 +8009,15 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
(int16_t *)llr16, (int16_t *)llr16,
(int32_t *) rho_256i, (int32_t *) rho_256i,
len); len);
#else // defined(__arm__) || defined(__aarch64__)
qam64_qam64((int32_t *)rxF_256i,
(int32_t *)rxF_i_256i,
(int32_t *)ch_mag_256i,
(int32_t *)ch_mag_i_256i,
(int16_t *)llr16,
(int32_t *) rho_256i,
len);
#endif
free16(rxF_256i, sizeof(rxF_256i)); free16(rxF_256i, sizeof(rxF_256i));
free16(rxF_i_256i, sizeof(rxF_i_256i)); free16(rxF_i_256i, sizeof(rxF_i_256i));
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include "PHY/phy_extern_ue.h" #include "PHY/phy_extern_ue.h"
#include "PHY/sse_intrin.h" #include "PHY/sse_intrin.h"
#if defined(__x86_64__)
static const int16_t ones256[16] __attribute__((aligned(32))) = {0xffff, static const int16_t ones256[16] __attribute__((aligned(32))) = {0xffff,
0xffff, 0xffff,
0xffff, 0xffff,
...@@ -3500,3 +3502,5 @@ void qam64_qam64_avx2(int32_t *stream0_in, ...@@ -3500,3 +3502,5 @@ void qam64_qam64_avx2(int32_t *stream0_in,
simde_mm_empty(); simde_mm_empty();
simde_m_empty(); simde_m_empty();
} }
#endif
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment