Commit 362bc481 authored by Robert Schmidt's avatar Robert Schmidt

Remove misleading PUSCH decoding

PUSCH decoding is started multiple times in nr_ulsch_procedures() for
each ULSCH segment, and stopped once inside
phy_procedures_gNB_uespec_RX(). Not only is it not clear if that works
with the API, it also might measure more than just PUSCH decoding.

Remove the PUSCH decoding, it is misleading. Check L1 RX processing
instead.
parent 41802483
...@@ -15,7 +15,6 @@ Ref : ...@@ -15,7 +15,6 @@ Ref :
DLSCH encoding : 179.0 DLSCH encoding : 179.0
L1 Rx processing : 526.0 L1 Rx processing : 526.0
PUSCH inner-receiver : 400.0 PUSCH inner-receiver : 400.0
PUSCH decoding : 2000.0
Schedule Response : 1.0 Schedule Response : 1.0
DL & UL scheduling timing : 15.0 DL & UL scheduling timing : 15.0
UL Indication : 1.0 UL Indication : 1.0
...@@ -29,7 +28,6 @@ DeviationThreshold : ...@@ -29,7 +28,6 @@ DeviationThreshold :
DLSCH encoding : 0.25 DLSCH encoding : 0.25
L1 Rx processing : 0.25 L1 Rx processing : 0.25
PUSCH inner-receiver : 0.25 PUSCH inner-receiver : 0.25
PUSCH decoding : 0.25
Schedule Response : 0.25 Schedule Response : 0.25
DL & UL scheduling timing : 0.25 DL & UL scheduling timing : 0.25
UL Indication : 0.25 UL Indication : 0.25
......
...@@ -15,7 +15,6 @@ Ref : ...@@ -15,7 +15,6 @@ Ref :
DLSCH encoding : 137.0 DLSCH encoding : 137.0
L1 Rx processing : 345.0 L1 Rx processing : 345.0
PUSCH inner-receiver : 210.0 PUSCH inner-receiver : 210.0
PUSCH decoding : 2200.0
Schedule Response : 48.0 Schedule Response : 48.0
DL & UL scheduling timing : 13.0 DL & UL scheduling timing : 13.0
UL Indication : 3.0 UL Indication : 3.0
...@@ -29,7 +28,6 @@ DeviationThreshold : ...@@ -29,7 +28,6 @@ DeviationThreshold :
DLSCH encoding : 0.25 DLSCH encoding : 0.25
L1 Rx processing : 0.25 L1 Rx processing : 0.25
PUSCH inner-receiver : 0.25 PUSCH inner-receiver : 0.25
PUSCH decoding : 0.25
Schedule Response : 0.25 Schedule Response : 0.25
DL & UL scheduling timing : 0.25 DL & UL scheduling timing : 0.25
UL Indication : 0.25 UL Indication : 0.25
......
...@@ -15,7 +15,6 @@ Ref : ...@@ -15,7 +15,6 @@ Ref :
DLSCH encoding : 230.0 DLSCH encoding : 230.0
L1 Rx processing : 175.0 L1 Rx processing : 175.0
PUSCH inner-receiver : 100.0 PUSCH inner-receiver : 100.0
PUSCH decoding : 180.0
Schedule Response : 111.0 Schedule Response : 111.0
DL & UL scheduling timing : 37.0 DL & UL scheduling timing : 37.0
UL Indication : 3.0 UL Indication : 3.0
...@@ -29,7 +28,6 @@ DeviationThreshold : ...@@ -29,7 +28,6 @@ DeviationThreshold :
DLSCH encoding : 0.25 DLSCH encoding : 0.25
L1 Rx processing : 0.25 L1 Rx processing : 0.25
PUSCH inner-receiver : 0.25 PUSCH inner-receiver : 0.25
PUSCH decoding : 0.25
Schedule Response : 0.25 Schedule Response : 0.25
DL & UL scheduling timing : 0.25 DL & UL scheduling timing : 0.25
UL Indication : 0.25 UL Indication : 0.25
......
...@@ -15,7 +15,6 @@ Ref : ...@@ -15,7 +15,6 @@ Ref :
DLSCH encoding : 177.0 DLSCH encoding : 177.0
L1 Rx processing : 345.0 L1 Rx processing : 345.0
PUSCH inner-receiver : 210.0 PUSCH inner-receiver : 210.0
PUSCH decoding : 2200.0
Schedule Response : 111.0 Schedule Response : 111.0
DL & UL scheduling timing : 20.0 DL & UL scheduling timing : 20.0
UL Indication : 5.0 UL Indication : 5.0
...@@ -29,7 +28,6 @@ DeviationThreshold : ...@@ -29,7 +28,6 @@ DeviationThreshold :
DLSCH encoding : 0.25 DLSCH encoding : 0.25
L1 Rx processing : 0.25 L1 Rx processing : 0.25
PUSCH inner-receiver : 0.25 PUSCH inner-receiver : 0.25
PUSCH decoding : 0.25
Schedule Response : 0.25 Schedule Response : 0.25
DL & UL scheduling timing : 0.25 DL & UL scheduling timing : 0.25
UL Indication : 0.25 UL Indication : 0.25
......
...@@ -15,7 +15,6 @@ Ref : ...@@ -15,7 +15,6 @@ Ref :
DLSCH encoding : 118.0 DLSCH encoding : 118.0
L1 Rx processing : 305.0 L1 Rx processing : 305.0
PUSCH inner-receiver : 150.0 PUSCH inner-receiver : 150.0
PUSCH decoding : 2200.0
Schedule Response : 30.0 Schedule Response : 30.0
DL & UL scheduling timing : 10.0 DL & UL scheduling timing : 10.0
UL Indication : 3.0 UL Indication : 3.0
...@@ -29,7 +28,6 @@ DeviationThreshold : ...@@ -29,7 +28,6 @@ DeviationThreshold :
DLSCH encoding : 0.25 DLSCH encoding : 0.25
L1 Rx processing : 0.25 L1 Rx processing : 0.25
PUSCH inner-receiver : 0.25 PUSCH inner-receiver : 0.25
PUSCH decoding : 0.25
Schedule Response : 0.25 Schedule Response : 0.25
DL & UL scheduling timing : 0.25 DL & UL scheduling timing : 0.25
UL Indication : 0.25 UL Indication : 0.25
......
...@@ -24,7 +24,6 @@ gnb : ...@@ -24,7 +24,6 @@ gnb :
DLSCH encoding: DLSCH encoding:
L1 Rx processing: L1 Rx processing:
PUSCH inner-receiver: PUSCH inner-receiver:
PUSCH decoding:
DL & UL scheduling timing: DL & UL scheduling timing:
UL Indication: UL Indication:
Slot Indication: Slot Indication:
...@@ -45,7 +44,6 @@ gnb : ...@@ -45,7 +44,6 @@ gnb :
rt.L1 Rx processing: rt.L1 Rx processing:
page4: page4:
rt.PUSCH inner-receiver: rt.PUSCH inner-receiver:
rt.PUSCH decoding:
rt.DL & UL scheduling timing: rt.DL & UL scheduling timing:
rt.UL Indication: rt.UL Indication:
rt.Slot Indication: rt.Slot Indication:
...@@ -297,7 +297,6 @@ static size_t dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output, size ...@@ -297,7 +297,6 @@ static size_t dump_L1_meas_stats(PHY_VARS_gNB *gNB, RU_t *ru, char *output, size
output += print_meas_log(&gNB->ul_indication_stats, "UL Indication", NULL, NULL, output, end - output); output += print_meas_log(&gNB->ul_indication_stats, "UL Indication", NULL, NULL, output, end - output);
output += print_meas_log(&gNB->slot_indication_stats, "Slot Indication", NULL, NULL, output, end - output); output += print_meas_log(&gNB->slot_indication_stats, "Slot Indication", NULL, NULL, output, end - output);
output += print_meas_log(&gNB->rx_pusch_stats, "PUSCH inner-receiver", NULL, NULL, output, end - output); output += print_meas_log(&gNB->rx_pusch_stats, "PUSCH inner-receiver", NULL, NULL, output, end - output);
output += print_meas_log(&gNB->ulsch_decoding_stats, "PUSCH decoding", NULL, NULL, output, end - output);
output += print_meas_log(&gNB->schedule_response_stats, "Schedule Response", NULL, NULL, output, end - output); output += print_meas_log(&gNB->schedule_response_stats, "Schedule Response", NULL, NULL, output, end - output);
output += print_meas_log(&gNB->rx_prach, "PRACH RX", NULL, NULL, output, end - output); output += print_meas_log(&gNB->rx_prach, "PRACH RX", NULL, NULL, output, end - output);
if (ru->feprx) if (ru->feprx)
...@@ -341,7 +340,6 @@ void *nrL1_stats_thread(void *param) { ...@@ -341,7 +340,6 @@ void *nrL1_stats_thread(void *param) {
reset_meas(&gNB->ul_indication_stats); reset_meas(&gNB->ul_indication_stats);
reset_meas(&gNB->slot_indication_stats); reset_meas(&gNB->slot_indication_stats);
reset_meas(&gNB->rx_pusch_stats); reset_meas(&gNB->rx_pusch_stats);
reset_meas(&gNB->ulsch_decoding_stats);
reset_meas(&gNB->schedule_response_stats); reset_meas(&gNB->schedule_response_stats);
reset_meas(&gNB->dlsch_scrambling_stats); reset_meas(&gNB->dlsch_scrambling_stats);
reset_meas(&gNB->dlsch_modulation_stats); reset_meas(&gNB->dlsch_modulation_stats);
......
...@@ -693,7 +693,6 @@ typedef struct PHY_VARS_gNB_s { ...@@ -693,7 +693,6 @@ typedef struct PHY_VARS_gNB_s {
time_stats_t ul_indication_stats; time_stats_t ul_indication_stats;
time_stats_t slot_indication_stats; time_stats_t slot_indication_stats;
time_stats_t schedule_response_stats; time_stats_t schedule_response_stats;
time_stats_t ulsch_decoding_stats;
time_stats_t ulsch_ldpc_decoding_stats; time_stats_t ulsch_ldpc_decoding_stats;
time_stats_t ulsch_deinterleaving_stats; time_stats_t ulsch_deinterleaving_stats;
time_stats_t ulsch_channel_estimation_stats; time_stats_t ulsch_channel_estimation_stats;
......
...@@ -401,7 +401,6 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ...@@ -401,7 +401,6 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int
//--------------------- ULSCH decoding --------------------- //--------------------- ULSCH decoding ---------------------
//---------------------------------------------------------- //----------------------------------------------------------
start_meas(&gNB->ulsch_decoding_stats);
int nbDecode = int nbDecode =
nr_ulsch_decoding(gNB, ULSCH_id, gNB->pusch_vars[ULSCH_id].llr, frame_parms, pusch_pdu, frame_rx, slot_rx, harq_pid, G); nr_ulsch_decoding(gNB, ULSCH_id, gNB->pusch_vars[ULSCH_id].llr, frame_parms, pusch_pdu, frame_rx, slot_rx, harq_pid, G);
...@@ -949,7 +948,6 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) ...@@ -949,7 +948,6 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
delNotifiedFIFO_elt(req); delNotifiedFIFO_elt(req);
totalDecode--; totalDecode--;
} }
stop_meas(&gNB->ulsch_decoding_stats);
for (int i = 0; i < gNB->max_nb_srs; i++) { for (int i = 0; i < gNB->max_nb_srs; i++) {
NR_gNB_SRS_t *srs = &gNB->srs[i]; NR_gNB_SRS_t *srs = &gNB->srs[i];
if (srs) { if (srs) {
......
...@@ -922,7 +922,6 @@ int main(int argc, char *argv[]) ...@@ -922,7 +922,6 @@ int main(int argc, char *argv[])
reset_meas(&gNB->rx_pusch_stats); reset_meas(&gNB->rx_pusch_stats);
reset_meas(&gNB->rx_pusch_init_stats); reset_meas(&gNB->rx_pusch_init_stats);
reset_meas(&gNB->rx_pusch_symbol_processing_stats); reset_meas(&gNB->rx_pusch_symbol_processing_stats);
reset_meas(&gNB->ulsch_decoding_stats);
reset_meas(&gNB->ulsch_channel_estimation_stats); reset_meas(&gNB->ulsch_channel_estimation_stats);
reset_meas(&UE->ulsch_ldpc_encoding_stats); reset_meas(&UE->ulsch_ldpc_encoding_stats);
reset_meas(&UE->ulsch_rate_matching_stats); reset_meas(&UE->ulsch_rate_matching_stats);
...@@ -1547,7 +1546,6 @@ int main(int argc, char *argv[]) ...@@ -1547,7 +1546,6 @@ int main(int argc, char *argv[])
printStatIndent2(&gNB->ulsch_channel_estimation_stats, "ULSCH channel estimation time"); printStatIndent2(&gNB->ulsch_channel_estimation_stats, "ULSCH channel estimation time");
printStatIndent2(&gNB->rx_pusch_init_stats, "RX PUSCH Initialization time"); printStatIndent2(&gNB->rx_pusch_init_stats, "RX PUSCH Initialization time");
printStatIndent2(&gNB->rx_pusch_symbol_processing_stats, "RX PUSCH Symbol Processing time"); printStatIndent2(&gNB->rx_pusch_symbol_processing_stats, "RX PUSCH Symbol Processing time");
printStatIndent(&gNB->ulsch_decoding_stats,"ULSCH total decoding time");
printf("\nUE TX\n"); printf("\nUE TX\n");
printStatIndent(&UE->ulsch_encoding_stats,"ULSCH total encoding time"); printStatIndent(&UE->ulsch_encoding_stats,"ULSCH total encoding time");
......
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