diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 4647525a7f5f5cf9482c391c1bca19297a708ce1..91ca5884f4b7007c51c0dc34e859c26edce30993 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -245,6 +245,7 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
pthread_mutex_destroy(&gNB->UL_INFO.crc_rx_mutex);
PHY_MEASUREMENTS_gNB *meas = &gNB->measurements;
+ free_and_zero(meas->ul_rx_power);
free_and_zero(meas->n0_subband_power);
free_and_zero(meas->n0_subband_power_dB);
diff --git a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
index a45734e791e5893b02437b56f29c75e55e0dcd35..23a9c4ff10f137f6d5be3a56a40b3d4fbcd9cb49 100644
--- a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
+++ b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
@@ -119,7 +119,15 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
NR_gNB_COMMON *common_vars = &gNB->common_vars;
PHY_MEASUREMENTS_gNB *measurements = &gNB->measurements;
- int rb, nb_symb[275]={0};
+ int rb, nb_symb[MAX_BWP_SIZE] = {0}, nb_ul_symb[MAX_BWP_SIZE] = {0};
+
+ allocCast2D(ulsch_power,
+ unsigned int,
+ gNB->measurements.ul_rx_power,
+ frame_parms->nb_antennas_rx,
+ frame_parms->N_RB_UL,
+ false);
+ clearArray(gNB->measurements.ul_rx_power, unsigned int);
allocCast2D(n0_subband_power,
unsigned int,
@@ -135,30 +143,34 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
frame_parms->N_RB_UL,
false);
- for (int s=first_symb;s<(first_symb+num_symb);s++) {
- int offset0 = ((slot&3)*frame_parms->symbols_per_slot + s) * frame_parms->ofdm_symbol_size;
- for (rb=0; rb<frame_parms->N_RB_UL; rb++) {
- if ((rb_mask_ul[s][rb >> 5] & (1U << (rb & 31))) == 0 && // check that rb was not used in this subframe
- !(I0_SKIP_DC && rb == frame_parms->N_RB_UL >> 1)) { // skip middle PRB because of artificial noise possibly created by FFT
- int offset = offset0 + (frame_parms->first_carrier_offset + (rb*12))%frame_parms->ofdm_symbol_size;
- nb_symb[rb]++;
- for (int aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
- int32_t *ul_ch = (int32_t *)&common_vars->rxdataF[aarx][offset];
- int32_t signal_energy;
- if (((frame_parms->N_RB_UL&1) == 1) &&
- (rb==(frame_parms->N_RB_UL>>1))) {
- signal_energy = signal_energy_nodc(ul_ch, 6);
- ul_ch = (int32_t *)&common_vars->rxdataF[aarx][offset0];
- signal_energy += signal_energy_nodc(ul_ch, 6);
- } else {
- signal_energy = signal_energy_nodc(ul_ch, 12);
- }
+ for (int s = first_symb; s < (first_symb + num_symb); s++) {
+ int offset0 = ((slot & 3) * frame_parms->symbols_per_slot + s) * frame_parms->ofdm_symbol_size;
+ for (rb = 0; rb < frame_parms->N_RB_UL; rb++) {
+ int offset = offset0 + (frame_parms->first_carrier_offset + (rb * NR_NB_SC_PER_RB)) % frame_parms->ofdm_symbol_size;
+ for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
+ int32_t *ul_ch = (int32_t *)&common_vars->rxdataF[aarx][offset];
+ int32_t signal_energy;
+ if (((frame_parms->N_RB_UL & 1) == 1) && (rb == (frame_parms->N_RB_UL >> 1))) {
+ signal_energy = signal_energy_nodc(ul_ch, 6);
+ ul_ch = (int32_t *)&common_vars->rxdataF[aarx][offset0];
+ signal_energy += signal_energy_nodc(ul_ch, 6);
+ } else {
+ signal_energy = signal_energy_nodc(ul_ch, 12);
+ }
+ if ((rb_mask_ul[s][rb >> 5] & (1U << (rb & 31))) == 0 && // check that rb was not used in this subframe
+ !(I0_SKIP_DC && rb == frame_parms->N_RB_UL >> 1)) { // skip middle PRB because of artificial noise possibly created by FFT
+ nb_symb[rb]++;
n0_subband_power[aarx][rb] += signal_energy;
- LOG_D(PHY,"slot %d symbol %d RB %d aarx %d n0_subband_power %d\n", slot, s, rb, aarx, signal_energy);
- } //antenna
- }
- } //rb
+ LOG_D(NR_PHY, "slot %d symbol %d RB %d aarx %d n0_subband_power %d\n", slot, s, rb, aarx, signal_energy);
+ } else if ((rb_mask_ul[s][rb >> 5] & (1U << (rb & 31))) != 0) { // check that rb was used in this subframe
+ nb_ul_symb[rb]++;
+ ulsch_power[aarx][rb] += signal_energy;
+ LOG_D(NR_PHY, "slot %d symbol %d RB %d aarx %d ulsch_power %d\n", slot, s, rb, aarx, signal_energy);
+ }
+ } // aarx
+ } // rb
} // symb
+
int nb_rb=0;
int64_t n0_subband_tot=0;
int32_t n0_subband_tot_perANT[frame_parms->nb_antennas_rx];
@@ -181,6 +193,11 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy
n0_subband_tot += n0_subband_tot_perPRB;
nb_rb++;
}
+ if (nb_ul_symb[rb] > 0) {
+ for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
+ ulsch_power[aarx][rb] /= nb_ul_symb[rb];
+ }
+ }
}
if (nb_rb>0) {
measurements->n0_subband_power_avg_dB = dB_fixed(n0_subband_tot/nb_rb);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
index 96266e279abb710b90f20deab38275f1daa7ffb1..8d73da01c9bceb42f0c4abd2a631fd63b0fe0135 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
@@ -1458,6 +1458,27 @@ static void nr_pusch_symbol_processing(void *arg)
}
}
+static uint32_t average_u32(const uint32_t *x, uint16_t size)
+{
+ AssertFatal(size > 0 && x != NULL, "x is NULL or size is 0\n");
+
+ uint64_t sum_x = 0;
+ simde__m256i vec_sum = simde_mm256_setzero_si256();
+
+ int i = 0;
+ for (; i + 8 <= size; i += 8) {
+ simde__m256i vec_data = simde_mm256_loadu_si256((simde__m256i *)&x[i]);
+ vec_sum = simde_mm256_add_epi32(vec_sum, vec_data);
+ }
+ for (int k = 0; k < 8; k++) {
+ sum_x += simde_mm256_extract_epi32(vec_sum, k);
+ }
+ for (; i < size; i++) {
+ sum_x += x[i];
+ }
+
+ return (uint32_t)(sum_x / size);
+}
int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
uint8_t ulsch_id,
@@ -1509,6 +1530,12 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
pusch_vars,
symbol,
rel15_ul->nrOfLayers);
+ allocCast2D(ulsch_power,
+ unsigned int,
+ gNB->measurements.ul_rx_power,
+ frame_parms->nb_antennas_rx,
+ frame_parms->N_RB_UL,
+ false);
allocCast2D(n0_subband_power,
unsigned int,
gNB->measurements.n0_subband_power,
@@ -1520,14 +1547,21 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
pusch_vars->ulsch_power[aarx] = 0;
pusch_vars->ulsch_noise_power[aarx] = 0;
}
- for (int aatx = 0; aatx < rel15_ul->nrOfLayers; aatx++) {
- pusch_vars->ulsch_power[aarx] += signal_energy_nodc(
- &pusch_vars->ul_ch_estimates[aatx * gNB->frame_parms.nb_antennas_rx + aarx][symbol * frame_parms->ofdm_symbol_size],
- rel15_ul->rb_size * 12);
- }
- for (int rb = 0; rb < rel15_ul->rb_size; rb++)
- pusch_vars->ulsch_noise_power[aarx] +=
- n0_subband_power[aarx][rel15_ul->bwp_start + rel15_ul->rb_start + rb] / rel15_ul->rb_size;
+
+ pusch_vars->ulsch_power[aarx] +=
+ average_u32(&ulsch_power[aarx][rel15_ul->bwp_start + rel15_ul->rb_start], rel15_ul->rb_size);
+
+ pusch_vars->ulsch_noise_power[aarx] +=
+ average_u32(&n0_subband_power[aarx][rel15_ul->bwp_start + rel15_ul->rb_start], rel15_ul->rb_size);
+
+ LOG_D(PHY,
+ "aa %d, bwp_start%d, rb_start %d, rb_size %d: ulsch_power %d, ulsch_noise_power %d\n",
+ aarx,
+ rel15_ul->bwp_start,
+ rel15_ul->rb_start,
+ rel15_ul->rb_size,
+ pusch_vars->ulsch_power[aarx],
+ pusch_vars->ulsch_noise_power[aarx]);
}
}
}
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 1cb7d256fdb38e7f9768f22566946b49d888191d..19b5c9a14a6393c2975fad54e3aa182c810833bf 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -347,7 +347,7 @@ typedef struct {
/// total signal over antennas
uint32_t ulsch_power_tot;
/// measured RX noise power
- int ulsch_noise_power[8];
+ uint32_t ulsch_noise_power[8];
/// total noise over antennas
uint32_t ulsch_noise_power_tot;
/// \brief llr values.
@@ -516,6 +516,8 @@ typedef struct {
fourDimArray_t *n0_subband_power;
//! estimated avg noise power per RB per RX ant (dB)
fourDimArray_t *n0_subband_power_dB;
+ //! estimated avg power per RB per RX ant (lin)
+ fourDimArray_t *ul_rx_power;
//! estimated avg subband noise power (dB)
unsigned int n0_subband_power_avg_dB;
//! estimated avg subband noise power per antenna (dB)