some small fixes to nr_pucchsim, nr_gNB_measurements.c, pucch_rx.c pertaining to

PUCCH format 2 reception. There was an overflow scenario in the noise measurements used for PUCCH
thresholding and potentially other uplink receivers.

openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c

@@ -184,9 +184,8 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
     } //rb
   } // symb
   int nb_rb=0;
-  int32_t n0_subband_tot_perANT[frame_parms->nb_antennas_rx];
+  int64_t n0_subband_tot_perANT[frame_parms->nb_antennas_rx];
   memset(n0_subband_tot_perANT, 0, sizeof(n0_subband_tot_perANT));
-
   allocCast2D(n0_subband_power,
               unsigned int,
               measurements->n0_subband_power,
@@ -195,7 +194,7 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
               false);
 
   for (int rb = 0 ; rb<frame_parms->N_RB_UL;rb++) {
-    int32_t n0_subband_tot_perPRB=0;
+    int64_t n0_subband_tot_perPRB=0;
     if (nb_symb[rb] > 0) {
       for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
         tmp_n0_subband[aarx][rb] /= nb_symb[rb];
@@ -213,9 +212,9 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
   if (nb_rb>0) {
     int64_t n0_subband_tot = 0;
     for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
-      measurements->n0_subband_power_avg_perANT_dB[aarx] = dB_fixed(n0_subband_tot_perANT[aarx] / nb_rb);
-      n0_subband_tot += n0_subband_tot_perANT[aarx];
+      measurements->n0_subband_power_avg_perANT_dB[aarx] = dB_fixed((int32_t)(n0_subband_tot_perANT[aarx] / nb_rb));
+      n0_subband_tot += (int32_t)(n0_subband_tot_perANT[aarx]/nb_rb);
     }
-    measurements->n0_subband_power_avg_dB = dB_fixed(n0_subband_tot / nb_rb);
+    measurements->n0_subband_power_avg_dB = dB_fixed(n0_subband_tot/frame_parms->nb_antennas_rx);
   }
 }

openair1/PHY/NR_TRANSPORT/pucch_rx.c

@@ -903,7 +903,7 @@ void init_pucch2_luts()
     *lut_num_i++ = (cw & 0x8) <= 0;
     *lut_num_i++ = (cw & 0x80) <= 0;
 #ifdef DEBUG_NR_PUCCH_RX
-    log_dump(PHY, pucch2_polar_llr_num_lut, 8, LOG_DUMP_C16, "lut_num %d:", i);
+    log_dump(PHY, pucch2_polar_llr_num_lut, 8, LOG_DUMP_C16, "lut_num %d:", *lut_num_i);
 #endif
   }
 }
@@ -1181,7 +1181,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
   int decoderState = 2;
   if (pucch2_levdB < gNB->measurements.n0_subband_power_avg_dB + (gNB->pucch0_thres / 10))
     decoderState = 1; // assuming missed detection, only attempt to decode for polar case (with CRC)
-  LOG_D(NR_PHY, "n0+thres %d decoderState %d\n", gNB->measurements.n0_subband_power_avg_dB + (gNB->pucch0_thres / 10), decoderState);
+    LOG_D(NR_PHY,"pucch2_levdB %d n0+thres %d (thres %d) decoderState %d\n", pucch2_levdB, gNB->measurements.n0_subband_power_avg_dB + (gNB->pucch0_thres / 10), gNB->pucch0_thres / 10,decoderState);
 
   if (nb_bit < 12 && decoderState == 2) { // short blocklength case
     uint64_t corr=0;
@@ -1195,10 +1195,10 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
             const simde__m256i *coeff = (simde__m256i *)&pucch2_lut[nb_bit - 3][cw].cw;
             const simde__m256i *rext = (simde__m256i *)r_ext[aa][symb];
             const simde__m256i *rext2 = (simde__m256i *)r_ext2[aa][symb];
-            simde__m256i re = simde_mm256_madd_epi16(coeff[0], rext[group]);
-            simde__m256i im = simde_mm256_madd_epi16(coeff[0], rext2[group]);
-            simde__m256i re2 = simde_mm256_madd_epi16(coeff[1], rext[group + 1]);
-            simde__m256i im2 = simde_mm256_madd_epi16(coeff[1], rext2[group + 1]);
+            simde__m256i re = simde_mm256_madd_epi16(coeff[0], rext[group<<1]);
+            simde__m256i im = simde_mm256_madd_epi16(coeff[0], rext2[group<<1]);
+            simde__m256i re2 = simde_mm256_madd_epi16(coeff[1], rext[(group<<1) + 1]);
+            simde__m256i im2 = simde_mm256_madd_epi16(coeff[1], rext2[(group<<1) + 1]);
             re = simde_mm256_add_epi32(re, re2);
             im = simde_mm256_add_epi32(im, im2);
             re = simde_mm256_hadd_epi32(re, re);
@@ -1297,7 +1297,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
   } else
     LOG_D(PHY, "PUCCH not processed: nb_bit %d decoderState %d\n", nb_bit, decoderState);
 
-  LOG_D(PHY, "UCI decoderState %d, payload[0] %llu\n", decoderState, (unsigned long long)decodedPayload[0]);
+  LOG_D(PHY,"UCI decoderState %d, payload[0] %llu\n", decoderState, (unsigned long long)decodedPayload[0]);
 
   // estimate CQI for MAC (from antenna port 0 only)
   // TODO this computation is wrong -> to be ignored at MAC for now

openair1/SIMULATION/NR_PHY/pucchsim.c

@@ -612,8 +612,9 @@ int main(int argc, char **argv)
             rxdataF[aarx][i].r = (int16_t)(tx_level_fp * (rxr + nr) / sqrt((double)txlev));
             rxdataF[aarx][i].i = (int16_t)(tx_level_fp * (rxi + ni) / sqrt((double)txlev));
 
-            if (n_trials==1 && fabs(txr) > 0) printf("symb %d, re %d , aarx %d : txr %f, txi %f, chr %f, chi %f, nr %f, ni %f, rxr %f, rxi %f => %d,%d\n",
-                                                    symb, re, aarx, txr,txi,
+            if (n_trials==1 && fabs(txr) > 0) printf("symb %d, re %d , aarx %d : txlev %f, txlev_fp %f : txr %f, txi %f, chr %f, chi %f, nr %f, ni %f, rxr %f, rxi %f => %d,%d\n",
+                                                    symb, re, aarx, 
+						    10*log10(txlev), 10*log10(tx_level_fp),txr,txi,
                                                     UE2gNB->chF[aarx][re].r,UE2gNB->chF[aarx][re].i,
                                                     nr,ni, rxr,rxi,
                                                     rxdataF[aarx][i].r,rxdataF[aarx][i].i);