maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OAI-UE] llr computation clean up

Browse Source
This commit is contained in:
hbilel
2017-03-08 12:16:38 +01:00
parent bb8c6b2c52
commit 3d1e01e283
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+3 -16
View File
@@ -8831,7 +8831,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
len = (nb_rb*12) - pbch_pss_sss_adjust; len = (nb_rb*12) - pbch_pss_sss_adjust;
} }
//#ifdef __AVX2__ #ifdef __AVX2__
// Round length up to multiple of 16 words // Round length up to multiple of 16 words
uint32_t len256i = ((len+16)>>4)*16; uint32_t len256i = ((len+16)>>4)*16;
@@ -8847,7 +8847,6 @@ 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);
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,
@@ -8856,23 +8855,13 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
(int32_t *) rho_256i, (int32_t *) rho_256i,
len); len);
/*
qam64_qam16_avx2((short *)rxF_256i,
(short *)rxF_i_256i,
(short *)ch_mag_256i,
(short *)ch_mag_i_256i,
(short *)llr16,
(short *)rho_256i,
len);
*/
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));
free16(ch_mag_256i, sizeof(ch_mag_256i)); free16(ch_mag_256i, sizeof(ch_mag_256i));
free16(ch_mag_i_256i, sizeof(ch_mag_i_256i)); free16(ch_mag_i_256i, sizeof(ch_mag_i_256i));
free16(rho_256i, sizeof(rho_256i)); free16(rho_256i, sizeof(rho_256i));
//#else #else
/*
qam64_qam64((short *)rxF, qam64_qam64((short *)rxF,
(short *)rxF_i, (short *)rxF_i,
(short *)ch_mag, (short *)ch_mag,
@@ -8880,9 +8869,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
(short *)llr16, (short *)llr16,
(short *)rho, (short *)rho,
len); len);
*/ #endif
//#endif
llr16 += (6*len); llr16 += (6*len);
*llr16p = (short *)llr16; *llr16p = (short *)llr16;