diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index 5a11fc12663ec6570f674bae727ed0592dfad354..4461edb33ba88c0aa9cba3af019b6ff890c5ca21 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -162,7 +162,8 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
/// CRC, coding, interleaving and rate matching
AssertFatal(harq->pdu!=NULL,"harq->pdu is null\n");
start_meas(dlsch_encoding_stats);
- nr_dlsch_encoding(harq->pdu, frame, slot, dlsch, frame_parms,tinput,tprep,tparity,toutput,
+ nr_dlsch_encoding(gNB,
+ harq->pdu, frame, slot, dlsch, frame_parms,tinput,tprep,tparity,toutput,
dlsch_rate_matching_stats,
dlsch_interleaving_stats,
dlsch_segmentation_stats);
@@ -338,29 +339,25 @@ uint8_t nr_generate_pdsch(PHY_VARS_gNB *gNB,
void dump_pdsch_stats(PHY_VARS_gNB *gNB) {
- for (int i=0;i<NUMBER_OF_NR_DLSCH_MAX;i++)
- if (gNB->dlsch[i][0]->harq_mask > 0)
- LOG_I(PHY,"DLSCH RNTI %x: round_trials %d(%1.1e)/%d(%1.1e)/%d(%1.1e)/%d/%d/%d/%d/%d, current_Qm %d, current_RI %d, total_bytes TX %d\n",
- gNB->dlsch[i][0]->rnti,
- gNB->dlsch[i][0]->stats.round_trials[0],
- (double)gNB->dlsch[i][0]->stats.round_trials[1]/gNB->dlsch[i][0]->stats.round_trials[0],
- gNB->dlsch[i][0]->stats.round_trials[1],
- (double)gNB->dlsch[i][0]->stats.round_trials[2]/gNB->dlsch[i][0]->stats.round_trials[1],
- gNB->dlsch[i][0]->stats.round_trials[2],
- (double)gNB->dlsch[i][0]->stats.round_trials[3]/gNB->dlsch[i][0]->stats.round_trials[2],
- gNB->dlsch[i][0]->stats.round_trials[3],
- gNB->dlsch[i][0]->stats.round_trials[4],
- gNB->dlsch[i][0]->stats.round_trials[5],
- gNB->dlsch[i][0]->stats.round_trials[6],
- gNB->dlsch[i][0]->stats.round_trials[7],
- gNB->dlsch[i][0]->stats.current_Qm,
- gNB->dlsch[i][0]->stats.current_RI,
- gNB->dlsch[i][0]->stats.total_bytes_tx);
+ for (int i=0;i<NUMBER_OF_NR_SCH_STATS_MAX;i++)
+ if (gNB->dlsch_stats[i].rnti > 0)
+ LOG_I(PHY,"DLSCH RNTI %x: round_trials %d(%1.1e):%d(%1.1e):%d(%1.1e):%d, current_Qm %d, current_RI %d, total_bytes TX %d\n",
+ gNB->dlsch_stats[i].rnti,
+ gNB->dlsch_stats[i].round_trials[0],
+ (double)gNB->dlsch_stats[i].round_trials[1]/gNB->dlsch_stats[i].round_trials[0],
+ gNB->dlsch_stats[i].round_trials[1],
+ (double)gNB->dlsch_stats[i].round_trials[2]/gNB->dlsch_stats[i].round_trials[0],
+ gNB->dlsch_stats[i].round_trials[2],
+ (double)gNB->dlsch_stats[i].round_trials[3]/gNB->dlsch_stats[i].round_trials[0],
+ gNB->dlsch_stats[i].round_trials[3],
+ gNB->dlsch_stats[i].current_Qm,
+ gNB->dlsch_stats[i].current_RI,
+ gNB->dlsch_stats[i].total_bytes_tx);
}
void clear_pdsch_stats(PHY_VARS_gNB *gNB) {
for (int i=0;i<NUMBER_OF_NR_DLSCH_MAX;i++)
- memset((void*)&gNB->dlsch[i][0]->stats,0,sizeof(gNB->dlsch[i][0]->stats));
+ memset((void*)&gNB->dlsch_stats[i],0,sizeof(gNB->dlsch_stats[i]));
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
index ad58c382c7b39b6db626b92e48446d4f49fee259..23ec75653186f82bdeed21d8804a3a6887749ea6 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.h
@@ -82,7 +82,8 @@ int16_t find_nr_dlsch(uint16_t rnti, PHY_VARS_gNB *gNB,find_type_t type);
NR_gNB_SCH_STATS_t *find_nr_dlsch_stats(uint16_t rnti, PHY_VARS_gNB *gNB,find_type_t type);
-int nr_dlsch_encoding(unsigned char *a,int frame,
+int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
+ unsigned char *a,int frame,
uint8_t slot,
NR_gNB_DLSCH_t *dlsch,
NR_DL_FRAME_PARMS* frame_parms,
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 1c4c4e374b40aa73bec7ff718e1a90b55018fdfe..e5841d326286b69d263bda5b452da055aa0d469b 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -309,7 +309,8 @@ void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch)
}
}
-int nr_dlsch_encoding(unsigned char *a,
+int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
+ unsigned char *a,
int frame,
uint8_t slot,
NR_gNB_DLSCH_t *dlsch,
@@ -354,13 +355,28 @@ int nr_dlsch_encoding(unsigned char *a,
A = rel15->TBSize[0]<<3;
- if (dlsch->harq_processes[harq_pid]->round == 0){
- dlsch->stats.total_bytes_tx += rel15->TBSize[0];
- dlsch->stats.current_RI = rel15->nrOfLayers;
- dlsch->stats.current_Qm = rel15->qamModOrder[0];
+ NR_gNB_SCH_STATS_t *stats=NULL;
+ int first_free=-1;
+ for (int i=0;i<NUMBER_OF_NR_SCH_STATS_MAX;i++) {
+ if (gNB->dlsch_stats[i].rnti == 0 && first_free == -1) {
+ first_free = i;
+ stats=&gNB->dlsch_stats[i];
+ }
+ if (gNB->dlsch_stats[i].rnti == dlsch->rnti) {
+ stats=&gNB->dlsch_stats[i];
+ break;
+ }
}
- dlsch->stats.round_trials[dlsch->harq_processes[harq_pid]->round]++;
+ if (stats) {
+ stats->round_trials[dlsch->harq_processes[harq_pid]->round]++;
+ stats->rnti = dlsch->rnti;
+ if (dlsch->harq_processes[harq_pid]->round == 0){
+ stats->total_bytes_tx += rel15->TBSize[0];
+ stats->current_RI = rel15->nrOfLayers;
+ stats->current_Qm = rel15->qamModOrder[0];
+ }
+ }
G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,mod_order,rel15->nrOfLayers);
LOG_D(PHY,"dlsch coding A %d G %d mod_order %d\n", A,G, mod_order);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch.c
index 1e58bd2812fc3a1ebea8d7fcb1e237f210afd9f4..a584050edf238243b5adf0c9732ec67176716449 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -141,25 +141,25 @@ void nr_ulsch_unscrambling_optim(int16_t* llr,
void dump_pusch_stats(PHY_VARS_gNB *gNB) {
for (int i=0;i<NUMBER_OF_NR_ULSCH_MAX;i++)
- if (gNB->ulsch[i][0]->rnti>0)
+ if (gNB->ulsch_stats[i].rnti>0)
LOG_I(PHY,"ULSCH RNTI %x: round_trials %d(%1.1e):%d(%1.1e):%d(%1.1e):%d, current_Qm %d, current_RI %d, total_bytes RX/SCHED %d/%d\n",
- gNB->ulsch[i][0]->rnti,
- gNB->ulsch[i][0]->stats.round_trials[0],
- (double)gNB->ulsch[i][0]->stats.round_trials[1]/gNB->ulsch[i][0]->stats.round_trials[0],
- gNB->ulsch[i][0]->stats.round_trials[1],
- (double)gNB->ulsch[i][0]->stats.round_trials[2]/gNB->ulsch[i][0]->stats.round_trials[0],
- gNB->ulsch[i][0]->stats.round_trials[2],
- (double)gNB->ulsch[i][0]->stats.round_trials[3]/gNB->ulsch[i][0]->stats.round_trials[0],
- gNB->ulsch[i][0]->stats.round_trials[3],
- gNB->ulsch[i][0]->stats.current_Qm,
- gNB->ulsch[i][0]->stats.current_RI,
- gNB->ulsch[i][0]->stats.total_bytes_rx,
- gNB->ulsch[i][0]->stats.total_bytes_tx);
+ gNB->ulsch_stats[i].rnti,
+ gNB->ulsch_stats[i].round_trials[0],
+ (double)gNB->ulsch_stats[i].round_trials[1]/gNB->ulsch_stats[i].round_trials[0],
+ gNB->ulsch_stats[i].round_trials[1],
+ (double)gNB->ulsch_stats[i].round_trials[2]/gNB->ulsch_stats[i].round_trials[0],
+ gNB->ulsch_stats[i].round_trials[2],
+ (double)gNB->ulsch_stats[i].round_trials[3]/gNB->ulsch_stats[i].round_trials[0],
+ gNB->ulsch_stats[i].round_trials[3],
+ gNB->ulsch_stats[i].current_Qm,
+ gNB->ulsch_stats[i].current_RI,
+ gNB->ulsch_stats[i].total_bytes_rx,
+ gNB->ulsch_stats[i].total_bytes_tx);
}
void clear_pusch_stats(PHY_VARS_gNB *gNB) {
for (int i=0;i<NUMBER_OF_NR_ULSCH_MAX;i++)
- memset((void*)&gNB->ulsch[i][0]->stats,0,sizeof(gNB->ulsch[i][0]->stats));
+ memset((void*)&gNB->ulsch_stats[i],0,sizeof(gNB->ulsch_stats[i]));
}
diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 802aab3c9316b99e23f1b95ba779ee543dfc12c7..7980206eb4075191d057fdf2181e0920920022e2 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -286,7 +286,7 @@ void clean_gNB_ulsch(NR_gNB_ULSCH_t *ulsch)
static uint32_t prnt_crc_cnt = 0;
#endif
-uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
+uint32_t nr_ulsch_decoding(PHY_VARS_gNB *gNB,
uint8_t UE_id,
short *ulsch_llr,
NR_DL_FRAME_PARMS *frame_parms,
@@ -308,7 +308,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#endif
- NR_gNB_ULSCH_t *ulsch = phy_vars_gNB->ulsch[UE_id][0];
+ NR_gNB_ULSCH_t *ulsch = gNB->ulsch[UE_id][0];
NR_UL_gNB_HARQ_t *harq_process = ulsch->harq_processes[harq_pid];
t_nrLDPC_dec_params decParams;
@@ -398,14 +398,28 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
}
}
- ulsch->stats.round_trials[harq_process->round]++;
-
+ NR_gNB_SCH_STATS_t *stats=NULL;
+ int first_free=-1;
+ for (int i=0;i<NUMBER_OF_NR_SCH_STATS_MAX;i++) {
+ if (gNB->ulsch_stats[i].rnti == 0 && first_free == -1) {
+ first_free = i;
+ stats=&gNB->ulsch_stats[i];
+ }
+ if (gNB->ulsch_stats[i].rnti == ulsch->rnti) {
+ stats=&gNB->ulsch_stats[i];
+ break;
+ }
+ }
+ if (stats) {
+ stats->rnti = ulsch->rnti;
+ stats->round_trials[harq_process->round]++;
+ }
if (harq_process->round == 0) {
-
- ulsch->stats.current_Qm = Qm;
- ulsch->stats.current_RI = n_layers;
- ulsch->stats.total_bytes_tx += harq_process->TBS;
-
+ if (stats) {
+ stats->current_Qm = Qm;
+ stats->current_RI = n_layers;
+ stats->total_bytes_tx += harq_process->TBS;
+ }
// This is a new packet, so compute quantities regarding segmentation
if (A > 3824)
harq_process->B = A+24;
@@ -463,7 +477,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
E = nr_get_E(G, harq_process->C, Qm, n_layers, r);
- start_meas(&phy_vars_gNB->ulsch_deinterleaving_stats);
+ start_meas(&gNB->ulsch_deinterleaving_stats);
////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////// nr_deinterleaving_ldpc ///////////////////////////////////
@@ -479,7 +493,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
//for (int i =0; i<16; i++)
// printf("rx output deinterleaving w[%d]= %d r_offset %d\n", i,harq_process->w[r][i], r_offset);
- stop_meas(&phy_vars_gNB->ulsch_deinterleaving_stats);
+ stop_meas(&gNB->ulsch_deinterleaving_stats);
LOG_D(PHY,"HARQ_PID %d Rate Matching Segment %d (coded bits %d,unpunctured/repeated bits %d, TBS %d, mod_order %d, nb_rb %d, Nl %d, rvidx %d, round %d)...\n",
@@ -500,7 +514,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
///////////////////////// harq_process->e =====> harq_process->d /////////////////////////
- start_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
+ start_meas(&gNB->ulsch_rate_unmatching_stats);
Tbslbrm = nr_compute_tbslbrm(0,nb_rb,n_layers,harq_process->C);
@@ -517,12 +531,12 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
harq_process->F,
Kr-harq_process->F-2*(p_decParams->Z))==-1) {
- stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
+ stop_meas(&gNB->ulsch_rate_unmatching_stats);
LOG_E(PHY,"ulsch_decoding.c: Problem in rate_matching\n");
return (ulsch->max_ldpc_iterations + 1);
} else {
- stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
+ stop_meas(&gNB->ulsch_rate_unmatching_stats);
}
r_offset += E;
@@ -560,7 +574,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
if (err_flag == 0) {
- start_meas(&phy_vars_gNB->ulsch_ldpc_decoding_stats);
+ start_meas(&gNB->ulsch_ldpc_decoding_stats);
//LOG_E(PHY,"AbsSubframe %d.%d Start LDPC segment %d/%d A %d ",frame%1024,nr_tti_rx,r,harq_process->C-1, A);
@@ -603,7 +617,6 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
LOG_I(PHY, "Segment %d CRC OK\n",r);
#endif
ret = no_iteration_ldpc;
- ulsch->stats.total_bytes_rx += harq_process->TBS;
} else {
#ifdef PRINT_CRC_CHECK
//if (prnt_crc_cnt%10 == 0)
@@ -629,7 +642,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
//write_output("dec_output.m","dec0",harq_process->c[0],Kr_bytes,1,4);
#endif
- stop_meas(&phy_vars_gNB->ulsch_ldpc_decoding_stats);
+ stop_meas(&gNB->ulsch_ldpc_decoding_stats);
}
if ((err_flag == 0) && (ret >= (ulsch->max_ldpc_iterations + 1))) {
@@ -652,7 +665,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#ifdef gNB_DEBUG_TRACE
LOG_I(PHY,"[gNB %d] ULSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d) Kr %d r %d\n",
- phy_vars_gNB->Mod_id, frame, nr_tti_rx, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,Kr,r);
+ gNB->Mod_id, frame, nr_tti_rx, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,Kr,r);
#endif
// harq_process->harq_ack.ack = 0;
@@ -669,7 +682,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
}
// LOG_D(PHY,"[gNB %d] ULSCH: Setting NACK for nr_tti_rx %d (pid %d, pid status %d, round %d/Max %d, TBS %d)\n",
- // phy_vars_gNB->Mod_id,nr_tti_rx,harq_pid,harq_process->status,harq_process->round,ulsch->Mlimit,harq_process->TBS);
+ // gNB->Mod_id,nr_tti_rx,harq_pid,harq_process->status,harq_process->round,ulsch->Mlimit,harq_process->TBS);
harq_process->handled = 1;
ret = ulsch->max_ldpc_iterations + 1;
@@ -678,7 +691,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#ifdef gNB_DEBUG_TRACE
LOG_I(PHY,"[gNB %d] ULSCH: Setting ACK for nr_tti_rx %d TBS %d\n",
- phy_vars_gNB->Mod_id,nr_tti_rx,harq_process->TBS);
+ gNB->Mod_id,nr_tti_rx,harq_process->TBS);
#endif
harq_process->status = SCH_IDLE;
@@ -689,7 +702,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
// harq_process->harq_ack.harq_id = harq_pid;
// harq_process->harq_ack.send_harq_status = 1;
- // LOG_D(PHY,"[gNB %d] ULSCH: Setting ACK for nr_tti_rx %d (pid %d, round %d, TBS %d)\n",phy_vars_gNB->Mod_id,nr_tti_rx,harq_pid,harq_process->round,harq_process->TBS);
+ // LOG_D(PHY,"[gNB %d] ULSCH: Setting ACK for nr_tti_rx %d (pid %d, round %d, TBS %d)\n",gNB->Mod_id,nr_tti_rx,harq_pid,harq_process->round,harq_process->TBS);
// Reassembly of Transport block here
@@ -712,6 +725,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#endif
}
+ if (stats) stats->total_bytes_rx += harq_process->TBS;
}
#ifdef DEBUG_ULSCH_DECODING
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 0a24b364d43ae6afcd8d5277525fa12c832d955c..6c2561a45436a751ca4a3c827529372a0c40b585 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -125,6 +125,7 @@ typedef struct {
} NR_gNB_UL_PDCCH_t;
typedef struct {
+ uint16_t rnti;
int round_trials[8];
int total_bytes_tx;
int total_bytes_rx;
@@ -175,8 +176,6 @@ typedef struct {
int16_t sqrt_rho_a;
/// amplitude of PDSCH (compared to RS) in symbols containing pilots
int16_t sqrt_rho_b;
- /// statistics for measurement collection
- NR_gNB_SCH_STATS_t stats;
} NR_gNB_DLSCH_t;
@@ -357,8 +356,6 @@ typedef struct {
uint8_t max_ldpc_iterations;
/// number of iterations used in last LDPC decoding
uint8_t last_iteration_cnt;
- /// statistics for measurement collection
- NR_gNB_SCH_STATS_t stats;
} NR_gNB_ULSCH_t;
typedef struct {
@@ -714,6 +711,11 @@ typedef struct PHY_VARS_gNB_s {
NR_gNB_ULSCH_t *ulsch[NUMBER_OF_NR_ULSCH_MAX][2]; // [Nusers times][2 codewords]
NR_gNB_DLSCH_t *dlsch_SI,*dlsch_ra,*dlsch_p;
NR_gNB_DLSCH_t *dlsch_PCH;
+ /// statistics for DLSCH measurement collection
+ NR_gNB_SCH_STATS_t dlsch_stats[NUMBER_OF_NR_SCH_STATS_MAX];
+ /// statistics for ULSCH measurement collection
+ NR_gNB_SCH_STATS_t ulsch_stats[NUMBER_OF_NR_SCH_STATS_MAX];
+
t_nrPolar_params *uci_polarParams;
uint8_t pbch_configured;