From 3d1e01e283ada734e5de62a387f4b6c6e307ee57 Mon Sep 17 00:00:00 2001
From: hbilel <haithem.bilel@alcatelonetouch.com>
Date: Wed, 8 Mar 2017 11:25:41 +0100
Subject: [PATCH] [OAI-UE] llr computation clean up
---
.../PHY/LTE_TRANSPORT/dlsch_llr_computation.c | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
index 7497f2e1199..b08836762cd 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
@@ -8831,7 +8831,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
len = (nb_rb*12) - pbch_pss_sss_adjust;
}
-//#ifdef __AVX2__
+#ifdef __AVX2__
// Round length up to multiple of 16 words
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(rho_256i, rho, len*4);
-
qam64_qam64_avx2((int32_t *)rxF_256i,
(int32_t *)rxF_i_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,
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_i_256i, sizeof(rxF_i_256i));
free16(ch_mag_256i, sizeof(ch_mag_256i));
free16(ch_mag_i_256i, sizeof(ch_mag_i_256i));
free16(rho_256i, sizeof(rho_256i));
-//#else
-/*
+#else
qam64_qam64((short *)rxF,
(short *)rxF_i,
(short *)ch_mag,
@@ -8880,9 +8869,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
(short *)llr16,
(short *)rho,
len);
-*/
-
-//#endif
+#endif
llr16 += (6*len);
*llr16p = (short *)llr16;
--
GitLab