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

fix bug introduced in this branch

Browse Source
This commit is contained in:
Laurent THOMAS
2022-03-25 16:32:07 +01:00
parent b153d2d1ee
commit 73053aa712
3 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/CODING/nr_rate_matching.c
+1 -1
View File
@@ -307,7 +307,7 @@ void nr_interleaving_ldpc(uint32_t E, uint8_t Qm, uint8_t *e,uint8_t *f)
void nr_deinterleaving_ldpc(uint32_t E, uint8_t Qm, int16_t *e,int16_t *f) void nr_deinterleaving_ldpc(uint32_t E, uint8_t Qm, int16_t *e,int16_t *f)
{ {
switch(Qm) { switch(Qm) {
case 2: case 2:
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+26 -34
View File
@@ -272,7 +272,6 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
x_im[1] = table_5_2_2_2_2_Im[u[1]]; x_im[1] = table_5_2_2_2_2_Im[u[1]];
c64_t xr[frame_parms->nb_antennas_rx][pucch_pdu->nr_of_symbols][12] __attribute__((aligned(32))); c64_t xr[frame_parms->nb_antennas_rx][pucch_pdu->nr_of_symbols][12] __attribute__((aligned(32)));
memset(xr, 0, sizeof(xr));
int64_t xrtmag=0,xrtmag_next=0; int64_t xrtmag=0,xrtmag_next=0;
uint8_t maxpos=0; uint8_t maxpos=0;
uint8_t index=0; uint8_t index=0;
@@ -287,72 +286,65 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) { for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) {
c16_t *r=(c16_t*)&rxdataF[aa][soffset+(l2*frame_parms->ofdm_symbol_size)+re_offset[l]]; c16_t *r=(c16_t*)&rxdataF[aa][soffset+(l2*frame_parms->ofdm_symbol_size)+re_offset[l]];
for (n=0;n<12;n++) { for (n=0;n<12;n++) {
xr[aa][l][n].r += (int32_t)x_re[l][n] * r[n].r + (int32_t)x_im[l][n] * r[n].i; xr[aa][l][n].r = (int32_t)x_re[l][n] * r[n].r + (int32_t)x_im[l][n] * r[n].i;
xr[aa][l][n].i += (int32_t)x_re[l][n] * r[n].i - (int32_t)x_im[l][n] * r[n].r; xr[aa][l][n].i = (int32_t)x_re[l][n] * r[n].i - (int32_t)x_im[l][n] * r[n].r;
#ifdef DEBUG_NR_PUCCH_RX #ifdef DEBUG_NR_PUCCH_RX
printf("x (%d,%d), r%d.%d (%d,%d), xr (%lld,%lld)\n", printf("x (%d,%d), r%d.%d (%d,%d), xr (%lld,%lld)\n",
x_re[l][n],x_im[l][n],l2,re_offset[l],r[n].r,r[n].i,xr[aa][l][n].r,xr[aa][l][n].i); x_re[l][n],x_im[l][n],l2,re_offset[l],r[n].r,r[n].i,xr[aa][l][n].r,xr[aa][l][n].i);
#endif #endif
} }
xr[aa][l][n].r>>=15;
xr[aa][l][n].i>>=15;
} }
} }
int64_t corr_re[frame_parms->nb_antennas_rx][2];
int64_t corr_im[frame_parms->nb_antennas_rx][2];
//int32_t no_corr = 0; //int32_t no_corr = 0;
int seq_index = 0; int seq_index = 0;
int64_t temp; int64_t temp;
for(i=0;i<nr_sequences;i++){ for(i=0;i<nr_sequences;i++){
c64_t corr[frame_parms->nb_antennas_rx][2];
for (int l=0;l<pucch_pdu->nr_of_symbols;l++) { for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) {
seq_index = (pucch_pdu->initial_cyclic_shift+ for (int l=0;l<pucch_pdu->nr_of_symbols;l++) {
mcs[i]+ seq_index = (pucch_pdu->initial_cyclic_shift+
gNB->pucch0_lut.lut[cs_ind][slot][l+pucch_pdu->start_symbol_index])%12; mcs[i]+
gNB->pucch0_lut.lut[cs_ind][slot][l+pucch_pdu->start_symbol_index])%12;
#ifdef DEBUG_NR_PUCCH_RX #ifdef DEBUG_NR_PUCCH_RX
printf("PUCCH symbol %d seq %d, seq_index %d, mcs %d\n",l,i,seq_index,mcs[i]); printf("PUCCH symbol %d seq %d, seq_index %d, mcs %d\n",l,i,seq_index,mcs[i]);
#endif #endif
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) { corr[aa][l]=(c64_t){0};
corr_re[aa][l]=0;
corr_im[aa][l]=0;
for (n = 0; n < 12; n++) { for (n = 0; n < 12; n++) {
corr_re[aa][l] += xr[aa][l][n].r * idft12_re[seq_index][n] + xr[aa][l][n].i * idft12_im[seq_index][n]; corr[aa][l].r += xr[aa][l][n].r * idft12_re[seq_index][n] + xr[aa][l][n].i * idft12_im[seq_index][n];
corr_im[aa][l] += xr[aa][l][n].r * idft12_im[seq_index][n] - xr[aa][l][n].i * idft12_re[seq_index][n]; corr[aa][l].i += xr[aa][l][n].r * idft12_im[seq_index][n] - xr[aa][l][n].i * idft12_re[seq_index][n];
} }
corr_re[aa][l] >>= 15; corr[aa][l].r >>= 31;
corr_im[aa][l] >>= 15; corr[aa][l].i >>= 31;
} }
} }
LOG_D(PHY,"PUCCH IDFT[%d/%d] = (%ld,%ld)=>%f\n", LOG_D(PHY,"PUCCH IDFT[%d/%d] = (%ld,%ld)=>%f\n",
mcs[i],seq_index,corr_re[0][0],corr_im[0][0], mcs[i],seq_index,corr[0][0].r,corr[0][0].i,
10*log10((double)corr_re[0][0]*corr_re[0][0] + (double)corr_im[0][0]*corr_im[0][0])); 10*log10((double)squaredMod(corr[0][0])));
if (pucch_pdu->nr_of_symbols==2) if (pucch_pdu->nr_of_symbols==2)
LOG_D(PHY,"PUCCH 2nd symbol IDFT[%d/%d] = (%ld,%ld)=>%f\n", LOG_D(PHY,"PUCCH 2nd symbol IDFT[%d/%d] = (%ld,%ld)=>%f\n",
mcs[i],seq_index,corr_re[0][1],corr_im[0][1], mcs[i],seq_index,corr[0][1].r,corr[0][1].i,
10*log10((double)corr_re[0][1]*corr_re[0][1] + (double)corr_im[0][1]*corr_im[0][1])); 10*log10((double)squaredMod(corr[0][1])));
if (pucch_pdu->freq_hop_flag == 0) { if (pucch_pdu->freq_hop_flag == 0) {
if (pucch_pdu->nr_of_symbols==1) {// non-coherent correlation if (pucch_pdu->nr_of_symbols==1) {// non-coherent correlation
temp=0; temp=0;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++)
temp+=(int64_t)corr_re[aa][0]*corr_re[aa][0] + (int64_t)corr_im[aa][0]*corr_im[aa][0]; temp+=squaredMod(corr[aa][0]);
} else { } else {
int64_t corr_re2=0;
int64_t corr_im2=0;
temp=0; temp=0;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) { for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) {
corr_re2 = (int64_t)corr_re[aa][0]+corr_re[aa][1]; c64_t corr2;
corr_im2 = (int64_t)corr_im[aa][0]+corr_im[aa][1]; csum(corr2, corr[aa][0], corr[aa][1]);
// coherent combining of 2 symbols and then complex modulus for single-frequency case // coherent combining of 2 symbols and then complex modulus for single-frequency case
temp+=corr_re2*corr_re2 + corr_im2*corr_im2; temp+=corr2.r*corr2.r + corr2.i*corr2.i;
} }
} }
} else if (pucch_pdu->freq_hop_flag == 1) { } else if (pucch_pdu->freq_hop_flag == 1) {
// full non-coherent combining of 2 symbols for frequency-hopping case // full non-coherent combining of 2 symbols for frequency-hopping case
temp=0; temp=0;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++)
temp += (int64_t)corr_re[aa][0]*corr_re[aa][0] + (int64_t)corr_im[aa][0]*corr_im[aa][0] + (int64_t)corr_re[aa][1]*corr_re[aa][1] + (int64_t)corr_im[aa][1]*corr_im[aa][1]; temp += squaredMod(corr[aa][0]) + squaredMod(corr[aa][1]);
} }
else AssertFatal(1==0,"shouldn't happen\n"); else AssertFatal(1==0,"shouldn't happen\n");
@@ -364,9 +356,9 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
uci_stats->current_pucch0_stat0 = 0; uci_stats->current_pucch0_stat0 = 0;
int64_t temp2=0,temp3=0;; int64_t temp2=0,temp3=0;;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) { for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) {
temp2 += ((int64_t)corr_re[aa][0]*corr_re[aa][0] + (int64_t)corr_im[aa][0]*corr_im[aa][0]); temp2 += squaredMod(corr[aa][0]);
if (pucch_pdu->nr_of_symbols==2) if (pucch_pdu->nr_of_symbols==2)
temp3 += ((int64_t)corr_re[aa][1]*corr_re[aa][1] + (int64_t)corr_im[aa][1]*corr_im[aa][1]); temp3 += squaredMod(corr[aa][1]);
} }
uci_stats->current_pucch0_stat0= dB_fixed64(temp2); uci_stats->current_pucch0_stat0= dB_fixed64(temp2);
if ( pucch_pdu->nr_of_symbols==2) if ( pucch_pdu->nr_of_symbols==2)
openair1/PHY/TOOLS/tools_defs.h
+3
View File
@@ -63,6 +63,9 @@ typedef struct complex64 {
int64_t r; int64_t r;
int64_t i; int64_t i;
} c64_t; } c64_t;
#define squaredMod(a) ((a).r*(a).r+(a).i*(a).i)
#define csum(res, i1, i2) (res).r=(i1).r+(i2).r ; (res).i=(i1).i+(i2).i
//cmult_sv.h //cmult_sv.h
/*!\fn void multadd_real_vector_complex_scalar(int16_t *x,int16_t *alpha,int16_t *y,uint32_t N) /*!\fn void multadd_real_vector_complex_scalar(int16_t *x,int16_t *alpha,int16_t *y,uint32_t N)