Skip to content

O
OpenXG-RAN
Commit 798158cf authored by francescomani's avatar francescomani
Browse files
Options

improvements in nr_pusch_channel_estimation code

parent cec91a2a
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 42 deletions
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @ 798158cf
...@@ -86,16 +86,15 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -86,16 +86,15 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
NR_gNB_PUSCH *pusch_vars = &gNB->pusch_vars[ul_id]; NR_gNB_PUSCH *pusch_vars = &gNB->pusch_vars[ul_id];
c16_t **ul_ch_estimates = (c16_t **)pusch_vars->ul_ch_estimates; c16_t **ul_ch_estimates = (c16_t **)pusch_vars->ul_ch_estimates;
const int symbolSize = gNB->frame_parms.ofdm_symbol_size; const int symbolSize = gNB->frame_parms.ofdm_symbol_size;
const int soffset = (Ns & 3) * gNB->frame_parms.symbols_per_slot * symbolSize; const int slot_offset = (Ns & 3) * gNB->frame_parms.symbols_per_slot * symbolSize;
const int delta = get_delta(p, pusch_pdu->dmrs_config_type); const int delta = get_delta(p, pusch_pdu->dmrs_config_type);
int ch_offset = symbolSize * symbol;
const int symbol_offset = symbolSize * symbol; const int symbol_offset = symbolSize * symbol;
const int k0 = bwp_start_subcarrier; const int k0 = bwp_start_subcarrier;
const int nb_rb_pusch = pusch_pdu->rb_size; const int nb_rb_pusch = pusch_pdu->rb_size;
LOG_D(PHY, "ch_offset %d, soffset %d, symbol_offset %d, OFDM size %d, Ns = %d, k0 = %d, symbol %d\n", LOG_D(PHY, "symbol_offset %d, slot_offset %d, OFDM size %d, Ns = %d, k0 = %d, symbol %d\n",
ch_offset, soffset,
symbol_offset, symbol_offset,
slot_offset,
symbolSize, symbolSize,
Ns, Ns,
k0, k0,
...@@ -154,12 +153,12 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -154,12 +153,12 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
memset(delay, 0, sizeof(*delay)); memset(delay, 0, sizeof(*delay));
for (int aarx=0; aarx<gNB->frame_parms.nb_antennas_rx; aarx++) { for (int aarx=0; aarx<gNB->frame_parms.nb_antennas_rx; aarx++) {
c16_t *rxdataF = (c16_t *)&gNB->common_vars.rxdataF[aarx][symbol_offset]; c16_t *rxdataF = (c16_t *)&gNB->common_vars.rxdataF[aarx][symbol_offset + slot_offset];
c16_t *ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][ch_offset]; c16_t *ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][symbol_offset];
memset(ul_ch, 0, sizeof(*ul_ch) * symbolSize); memset(ul_ch, 0, sizeof(*ul_ch) * symbolSize);
#ifdef DEBUG_PUSCH #ifdef DEBUG_PUSCH
LOG_I(PHY, "In %s symbol_offset %d, delta %d\n", symbol_offset, delta); LOG_I(PHY, "symbol_offset %d, delta %d\n", symbol_offset, delta);
LOG_I(PHY, "ch est pilot, N_RB_UL %d\n", gNB->frame_parms.N_RB_UL); LOG_I(PHY, "ch est pilot, N_RB_UL %d\n", gNB->frame_parms.N_RB_UL);
LOG_I(PHY, LOG_I(PHY,
"bwp_start_subcarrier %d, k0 %d, first_carrier %d, nb_rb_pusch %d\n", "bwp_start_subcarrier %d, k0 %d, first_carrier %d, nb_rb_pusch %d\n",
...@@ -182,7 +181,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -182,7 +181,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
for (int k_line = 0; k_line <= 1; k_line++) { for (int k_line = 0; k_line <= 1; k_line++) {
re_offset = (k0 + (n << 2) + (k_line << 1) + delta) % symbolSize; re_offset = (k0 + (n << 2) + (k_line << 1) + delta) % symbolSize;
ch = c32x16maddShift(*pil, rxdataF[soffset + re_offset], ch, 16); ch = c32x16maddShift(*pil, rxdataF[re_offset], ch, 16);
pil++; pil++;
} }
...@@ -214,9 +213,9 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -214,9 +213,9 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#ifdef DEBUG_PUSCH #ifdef DEBUG_PUSCH
re_offset = (k0 + (n << 2) + (k_line << 1)) % symbolSize; re_offset = (k0 + (n << 2) + (k_line << 1)) % symbolSize;
c16_t *rxF = &rxdataF[soffset + re_offset]; c16_t *rxF = &rxdataF[re_offset];
printf("pilot %4d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d)\n", printf("pilot %4d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d)\n",
pilot_cnt, pil->r, pil->i, rxF->r, rxF->i, ch.r, ch.i); pilot_cnt, pil->r, pil->i, rxF->r, rxF->i, ch16.r, ch16.i);
#endif #endif
if (pilot_cnt == 0) { if (pilot_cnt == 0) {
...@@ -238,7 +237,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -238,7 +237,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
// Revert delay // Revert delay
pilot_cnt = 0; pilot_cnt = 0;
ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][ch_offset]; ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][symbol_offset];
int inv_delay_idx = get_delay_idx(-delay->est_delay, MAX_DELAY_COMP); int inv_delay_idx = get_delay_idx(-delay->est_delay, MAX_DELAY_COMP);
c16_t *ul_inv_delay_table = gNB->frame_parms.delay_table[inv_delay_idx]; c16_t *ul_inv_delay_table = gNB->frame_parms.delay_table[inv_delay_idx];
for (int n = 0; n < 3 * nb_rb_pusch; n++) { for (int n = 0; n < 3 * nb_rb_pusch; n++) {
...@@ -251,7 +250,6 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -251,7 +250,6 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#ifdef DEBUG_PUSCH #ifdef DEBUG_PUSCH
re_offset = (k0 + (n << 2) + (k_line << 1)) % symbolSize; re_offset = (k0 + (n << 2) + (k_line << 1)) % symbolSize;
c16_t *rxF = &rxdataF[soffset + re_offset];
printf("ch -> (%4d,%4d), ch_inter -> (%4d,%4d)\n", ul_ls_est[k].r, ul_ls_est[k].i, ul_ch[k].r, ul_ch[k].i); printf("ch -> (%4d,%4d), ch_inter -> (%4d,%4d)\n", ul_ls_est[k].r, ul_ls_est[k].i, ul_ch[k].r, ul_ch[k].i);
#endif #endif
pilot_cnt++; pilot_cnt++;
...@@ -262,7 +260,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -262,7 +260,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
} else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type2 && chest_freq == 0) { // pusch_dmrs_type2 |p_r,p_l,d,d,d,d,p_r,p_l,d,d,d,d| } else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type2 && chest_freq == 0) { // pusch_dmrs_type2 |p_r,p_l,d,d,d,d,p_r,p_l,d,d,d,d|
LOG_D(PHY, "PUSCH estimation DMRS type 2, Freq-domain interpolation\n"); LOG_D(PHY, "PUSCH estimation DMRS type 2, Freq-domain interpolation\n");
c16_t *pil = pilot; c16_t *pil = pilot;
c16_t *rx = &rxdataF[soffset + delta]; c16_t *rx = &rxdataF[delta];
for (int n = 0; n < nb_rb_pusch * NR_NB_SC_PER_RB; n += 6) { for (int n = 0; n < nb_rb_pusch * NR_NB_SC_PER_RB; n += 6) {
c16_t ch0 = c16mulShift(*pil, rx[(k0 + n) % symbolSize], 15); c16_t ch0 = c16mulShift(*pil, rx[(k0 + n) % symbolSize], 15);
pil++; pil++;
...@@ -286,16 +284,16 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -286,16 +284,16 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
} }
} }
// this is case without frequency-domain linear interpolation, just take average of LS channel estimates of 6 DMRS REs and use a common value for the whole PRB
else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type1) { // this is case without frequency-domain linear interpolation, just take average of LS channel estimates of 6 DMRS REs and use a common value for the whole PRB else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type1) {
LOG_D(PHY,"PUSCH estimation DMRS type 1, no Freq-domain interpolation\n"); LOG_D(PHY,"PUSCH estimation DMRS type 1, no Freq-domain interpolation\n");
c16_t *rxF = &rxdataF[soffset + delta]; c16_t *rxF = &rxdataF[delta];
int pil_offset = 0; int pil_offset = 0;
int re_offset = k0; int re_offset = k0;
c16_t ch; c16_t ch;
// First PRB // First PRB
ch=c32x16cumulVectVectWithSteps(pilot, &pil_offset, 1, rxF, &re_offset, 2, symbolSize, 6); ch = c32x16cumulVectVectWithSteps(pilot, &pil_offset, 1, rxF, &re_offset, 2, symbolSize, 6);
#if NO_INTERP #if NO_INTERP
for (c16_t *end=ul_ch+12; ul_ch<end; ul_ch++) for (c16_t *end=ul_ch+12; ul_ch<end; ul_ch++)
...@@ -310,7 +308,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -310,7 +308,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#endif #endif
for (int pilot_cnt=6; pilot_cnt<6*(nb_rb_pusch-1); pilot_cnt += 6) { for (int pilot_cnt=6; pilot_cnt<6*(nb_rb_pusch-1); pilot_cnt += 6) {
ch=c32x16cumulVectVectWithSteps(pilot, &pil_offset, 1, rxF, &re_offset, 2, symbolSize, 6); ch = c32x16cumulVectVectWithSteps(pilot, &pil_offset, 1, rxF, &re_offset, 2, symbolSize, 6);
*max_ch = max(*max_ch, max(abs(ch.r), abs(ch.i))); *max_ch = max(*max_ch, max(abs(ch.r), abs(ch.i)));
#if NO_INTERP #if NO_INTERP
...@@ -346,19 +344,19 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -346,19 +344,19 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#endif #endif
} else { // this is case without frequency-domain linear interpolation, just take average of LS channel estimates of 4 DMRS REs and use a common value for the whole PRB } else { // this is case without frequency-domain linear interpolation, just take average of LS channel estimates of 4 DMRS REs and use a common value for the whole PRB
LOG_D(PHY,"PUSCH estimation DMRS type 2, no Freq-domain interpolation"); LOG_D(PHY,"PUSCH estimation DMRS type 2, no Freq-domain interpolation");
c16_t *pil = pilot; c16_t *pil = pilot;
int re_offset = k0; int re_offset = (k0 + delta) % symbolSize;
c32_t ch0 = {0}; c32_t ch0 = {0};
//First PRB //First PRB
ch0 = c32x16mulShift(*pil, rxdataF[soffset + delta + re_offset], 15); ch0 = c32x16mulShift(*pil, rxdataF[re_offset], 15);
pil++; pil++;
re_offset = (re_offset + 1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+5) % symbolSize; re_offset = (re_offset + 5) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
re_offset = (re_offset+1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset + 5) % symbolSize; re_offset = (re_offset + 5) % symbolSize;
...@@ -377,19 +375,19 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -377,19 +375,19 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
for (int pilot_cnt=4; pilot_cnt<4*(nb_rb_pusch-1); pilot_cnt += 4) { for (int pilot_cnt=4; pilot_cnt<4*(nb_rb_pusch-1); pilot_cnt += 4) {
c32_t ch0; c32_t ch0;
ch0 = c32x16mulShift(*pil, rxdataF[delta + re_offset], 15); ch0 = c32x16mulShift(*pil, rxdataF[re_offset], 15);
pil++; pil++;
re_offset = (re_offset+1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+5) % symbolSize; re_offset = (re_offset + 5) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+5) % symbolSize; re_offset = (re_offset+5) % symbolSize;
...@@ -412,21 +410,21 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -412,21 +410,21 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
} }
// Last PRB // Last PRB
ch0 = c32x16mulShift(*pil, rxdataF[delta + re_offset], 15); ch0 = c32x16mulShift(*pil, rxdataF[re_offset], 15);
pil++; pil++;
re_offset = (re_offset+1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+5) % symbolSize; re_offset = (re_offset + 5) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+1) % symbolSize; re_offset = (re_offset + 1) % symbolSize;
ch0 = c32x16maddShift(*pil, rxdataF[delta + re_offset], ch0, 15); ch0 = c32x16maddShift(*pil, rxdataF[re_offset], ch0, 15);
pil++; pil++;
re_offset = (re_offset+5) % symbolSize; re_offset = (re_offset + 5) % symbolSize;
ch=c16x32div(ch0, 4); ch=c16x32div(ch0, 4);
#if NO_INTERP #if NO_INTERP
...@@ -442,7 +440,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, ...@@ -442,7 +440,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
} }
#ifdef DEBUG_PUSCH #ifdef DEBUG_PUSCH
ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][ch_offset]; ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][symbol_offset];
for (int idxP = 0; idxP < ceil((float)nb_rb_pusch * 12 / 8); idxP++) { for (int idxP = 0; idxP < ceil((float)nb_rb_pusch * 12 / 8); idxP++) {
for (int idxI = 0; idxI < 8; idxI++) { for (int idxI = 0; idxI < 8; idxI++) {
printf("%d\t%d\t", ul_ch[idxP * 8 + idxI].r, ul_ch[idxP * 8 + idxI].i); printf("%d\t%d\t", ul_ch[idxP * 8 + idxI].r, ul_ch[idxP * 8 + idxI].i);
......
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