add time mear

openair1/PHY/NR_TRANSPORT/nr_dlsch.c

@@ -43,6 +43,25 @@
 //#define DEBUG_DLSCH
 //#define DEBUG_DLSCH_MAPPING
 
+#define NR_TIMESPEC_TO_DOUBLE_US(nr_t)   ( ( (double)nr_t.tv_sec * 1000000 ) + ( (double)nr_t.tv_nsec / 1000 ) )
+struct timespec  nr_get_timespec_diff(
+       struct timespec *start,
+       struct timespec *stop )
+{
+   struct timespec  result;
+
+ if ( ( stop->tv_nsec - start->tv_nsec ) < 0 ) {
+    result.tv_sec = stop->tv_sec - start->tv_sec - 1;
+    result.tv_nsec = stop->tv_nsec - start->tv_nsec + 1000000000;
+ }
+ else {
+ result.tv_sec = stop->tv_sec - start->tv_sec;
+ result.tv_nsec = stop->tv_nsec - start->tv_nsec;
+ }
+
+ return result;
+}
+
 void nr_pdsch_codeword_scrambling(uint8_t *in,
                                   uint32_t size,
                                   uint8_t q,
@@ -52,7 +71,7 @@ void nr_pdsch_codeword_scrambling(uint8_t *in,
 {
   nr_codeword_scrambling(in, size, q, Nid, n_RNTI, out);
 }
-
+int cbs = 0;
 void nr_generate_pdsch(processingData_L1tx_t *msgTx,
                        int frame,
                        int slot) {
@@ -74,6 +93,11 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
   time_stats_t *dlsch_interleaving_stats=&gNB->dlsch_interleaving_stats;
   time_stats_t *dlsch_segmentation_stats=&gNB->dlsch_segmentation_stats;
 
+
+  double clock_gettime_enc, clock_gettime_pdsch;
+  struct timespec time_start;
+  struct timespec time_stop;
+
   for (int dlsch_id=0; dlsch_id<msgTx->num_pdsch_slot; dlsch_id++) {
     dlsch = msgTx->dlsch[dlsch_id][0];
 
@@ -129,13 +153,16 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
     unsigned char output[rel15->rbSize * NR_SYMBOLS_PER_SLOT * NR_NB_SC_PER_RB * Qm * rel15->nrOfLayers] __attribute__((aligned(32)));
     bzero(output,rel15->rbSize * NR_SYMBOLS_PER_SLOT * NR_NB_SC_PER_RB * Qm * rel15->nrOfLayers);
     start_meas(dlsch_encoding_stats);
-
-    if (nr_dlsch_encoding(gNB,
+   
+   clock_gettime(CLOCK_REALTIME,&time_start);
+   if (nr_dlsch_encoding(gNB,
                           frame, slot, harq, frame_parms,output,tinput,tprep,tparity,toutput,
                           dlsch_rate_matching_stats,
                           dlsch_interleaving_stats,
                           dlsch_segmentation_stats) == -1)
       return;
+   clock_gettime(CLOCK_REALTIME,&time_stop);
+  clock_gettime_enc = NR_TIMESPEC_TO_DOUBLE_US( nr_get_timespec_diff( &time_start, &time_stop ));//us   
     stop_meas(dlsch_encoding_stats);
 #ifdef DEBUG_DLSCH
     printf("PDSCH encoding:\nPayload:\n");
@@ -153,6 +180,8 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
     printf("\n");
 #endif
 
+   clock_gettime(CLOCK_REALTIME,&time_start);
+
     if (IS_SOFTMODEM_DLSIM)
       memcpy(harq->f, output, encoded_length);
 
@@ -563,6 +592,15 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
     for (int layer = 0; layer<rel15->nrOfLayers; layer++)
       free16(txdataF_precoding[layer],2*14*frame_parms->ofdm_symbol_size);
     free16(txdataF_precoding,rel15->nrOfLayers);
+
+    clock_gettime(CLOCK_REALTIME,&time_stop);
+    clock_gettime_pdsch = NR_TIMESPEC_TO_DOUBLE_US( nr_get_timespec_diff( &time_start, &time_stop ));//us   
+    static int log_cnt = 0;
+    log_cnt++;
+    if ((rel15->rnti != 0xFFFF) || (log_cnt < 10))
+    LOG_I(PHY,"frame %d %d, pdsch: BWPStart %d, BWPSize %d, rbStart %d, rbsize %d, symb %d. tbsize (%d, %d), cbs %d time enc %d, pdsch %d\n", frame, slot,
+          rel15->BWPStart,rel15->BWPSize,rel15->rbStart,rel15->rbSize, rel15->NrOfSymbols, rel15->mcsIndex[0], rel15->TBSize[0], cbs, (int)clock_gettime_enc, (int)clock_gettime_pdsch);
+
   }// dlsch loop
 }
 

openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c

@@ -272,7 +272,7 @@ void ldpc8blocks( void *p) {
     r_offset += E;
   }
 }
-
+extern int cbs;
 int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
                       int frame,
                       uint8_t slot,
@@ -359,7 +359,7 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
     LOG_E(PHY,"nr_segmentation.c: too many segments %d, B %d\n",impp.n_segments,harq->B);
     return(-1);
   }
-
+  cbs = impp.n_segments;
   for (int r=0; r<impp.n_segments; r++) {
     //d_tmp[r] = &harq->d[r][0];
     //channel_input[r] = &harq->d[r][0];

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -316,6 +316,7 @@ void nr_processULSegment(void* arg) {
   //stop_meas(&phy_vars_gNB->ulsch_ldpc_decoding_stats);
 }
 
+extern int pusch_cbs;
 uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
                            uint8_t ULSCH_id,
                            short *ulsch_llr,
@@ -425,7 +426,8 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
     LOG_E(PHY,"nr_segmentation.c: too many segments %d, B %d\n",harq_process->C,harq_process->B);
     return(-1);
   }
-
+  
+  pusch_cbs = harq_process->C;
 
 #ifdef DEBUG_ULSCH_DECODING
   printf("ulsch decoding nr segmentation Z %d\n", harq_process->Z);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -48,10 +48,36 @@
 //#define DEBUG_RXDATA
 //#define SRS_IND_DEBUG
 
+
+
+
 uint8_t SSB_Table[38]={0,2,4,6,8,10,12,14,254,254,16,18,20,22,24,26,28,30,254,254,32,34,36,38,40,42,44,46,254,254,48,50,52,54,56,58,60,62};
 
 extern uint8_t nfapi_mode;
 
+
+#define NR_TIMESPEC_TO_DOUBLE_US1(nr_t)   ( ( (double)nr_t.tv_sec * 1000000 ) + ( (double)nr_t.tv_nsec / 1000 ) )
+struct timespec  nr_get_timespec_diff1(
+       struct timespec *start,
+       struct timespec *stop )
+{
+   struct timespec  result;
+
+ if ( ( stop->tv_nsec - start->tv_nsec ) < 0 ) {
+    result.tv_sec = stop->tv_sec - start->tv_sec - 1;
+    result.tv_nsec = stop->tv_nsec - start->tv_nsec + 1000000000;
+ }
+ else {
+ result.tv_sec = stop->tv_sec - start->tv_sec;
+ result.tv_nsec = stop->tv_nsec - start->tv_nsec;
+ }
+
+ return result;
+}
+
+double clock_gettime_pusch;
+
+
 void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_dl_tti_ssb_pdu ssb_pdu) {
 
   NR_DL_FRAME_PARMS *fp=&gNB->frame_parms;
@@ -304,7 +330,7 @@ void nr_postDecode(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req) {
   }
 }
 
-
+int pusch_cbs = 0;
 void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH_id, uint8_t harq_pid)
 {
   NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
@@ -314,6 +340,12 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
   uint32_t G;
   uint16_t start_symbol, number_symbols, nb_re_dmrs;
   uint8_t enable_ldpc_offload = gNB->ldpc_offload_flag;
+
+  double clock_gettime_dec, clock_gettime_scram;
+  struct timespec time_start;
+  struct timespec time_stop;
+
+
   start_symbol = pusch_pdu->start_symbol_index;
   number_symbols = pusch_pdu->nr_of_symbols;
 
@@ -348,7 +380,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
 	pusch_pdu->qam_mod_order,
 	pusch_pdu->nrOfLayers);
 
-
+ clock_gettime(CLOCK_REALTIME,&time_start);
   nr_ulsch_layer_demapping(gNB->pusch_vars[ULSCH_id]->llr,
                            pusch_pdu->nrOfLayers,
                            pusch_pdu->qam_mod_order,
@@ -367,8 +399,11 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
   //----------------------------------------------------------
   //--------------------- ULSCH decoding ---------------------
   //----------------------------------------------------------
+  clock_gettime(CLOCK_REALTIME,&time_stop);
+  clock_gettime_scram = NR_TIMESPEC_TO_DOUBLE_US1( nr_get_timespec_diff1( &time_start, &time_stop ));//us   
 
   start_meas(&gNB->ulsch_decoding_stats);
+  clock_gettime(CLOCK_REALTIME,&time_start);
   nr_ulsch_decoding(gNB,
                     ULSCH_id,
                     gNB->pusch_vars[ULSCH_id]->llr,
@@ -387,6 +422,20 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
       delNotifiedFIFO_elt(req);
     }
   } 
+  clock_gettime(CLOCK_REALTIME,&time_stop);
+  clock_gettime_dec = NR_TIMESPEC_TO_DOUBLE_US1( nr_get_timespec_diff1( &time_start, &time_stop ));//us   
+
+  LOG_I(PHY,"frame %d %d, pusch rb_size %d, number_symbols %d, qam_mod_order %d, nrOfLayer %d, tbs %d, cbs %d, offload %d, time pusch %d, scram %d, decoding %d\n",
+	frame_rx, slot_rx,
+  pusch_pdu->rb_size,
+	number_symbols,
+	pusch_pdu->qam_mod_order,
+	pusch_pdu->nrOfLayers, pusch_pdu->pusch_data.tb_size, 
+  pusch_cbs,
+  enable_ldpc_offload,
+  (int)clock_gettime_dec,
+  (int)clock_gettime_scram,
+  (int)clock_gettime_pusch);
   stop_meas(&gNB->ulsch_decoding_stats);
 }
 
@@ -680,6 +729,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
   int pucch_decode_done = 0;
   int pusch_decode_done = 0;
   int pusch_DTX = 0;
+    struct timespec time_start;
+  struct timespec time_stop;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_UESPEC_RX,1);
   LOG_D(PHY,"phy_procedures_gNB_uespec_RX frame %d, slot %d\n",frame_rx,slot_rx);
@@ -815,7 +866,11 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
 
           VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_RX_PUSCH,1);
 	        start_meas(&gNB->rx_pusch_stats);
+          clock_gettime(CLOCK_REALTIME,&time_start);
           nr_rx_pusch(gNB, ULSCH_id, frame_rx, slot_rx, harq_pid);
+          clock_gettime(CLOCK_REALTIME,&time_stop);
+          clock_gettime_pusch = NR_TIMESPEC_TO_DOUBLE_US1( nr_get_timespec_diff1( &time_start, &time_stop ));//us   
+
           gNB->pusch_vars[ULSCH_id]->ulsch_power_tot=0;
           gNB->pusch_vars[ULSCH_id]->ulsch_noise_power_tot=0;
           for (int aarx=0;aarx<gNB->frame_parms.nb_antennas_rx;aarx++) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -713,6 +713,11 @@ void pf_dl(module_id_t module_id,
                                                  dl_bwp,
                                                  tda_info,
                                                  sched_pdsch->nrOfLayers);
+    
+    LOG_I(MAC, "pdsch mcs %d, table %d\n", sched_pdsch->mcs, dl_bwp->mcsTableIdx);
+    static int cnt_mcs = 0;
+    sched_pdsch->mcs = 6 + cnt_mcs %20;
+    cnt_mcs++;
     sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, dl_bwp->mcsTableIdx);
     sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, dl_bwp->mcsTableIdx);
     sched_pdsch->pucch_allocation = alloc;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -539,6 +539,15 @@ bool nr_find_nb_rb(uint16_t Qm,
    * might depend on the return value! */
   if (bytes > *tbs)
     return false;
+  
+  static int cnt  =0;
+
+  *nb_rb = 25 * ((cnt %10) + 1) ;
+  *tbs = nr_compute_tbs(Qm, R, *nb_rb, nb_symb_sch, nb_dmrs_prb, 0, 0, nrOfLayers) >> 3;
+  cnt++;
+  return true;
+  
+  
   if (bytes == *tbs)
     return true;
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -1651,7 +1651,7 @@ void pf_ul(module_id_t module_id,
                                                   &sched_pusch->tda_info,
                                                   sched_pusch->nrOfLayers);
 
-      LOG_D(NR_MAC,"Looking for min_rb %d RBs, starting at %d num_dmrs_cdm_grps_no_data %d\n",
+      LOG_I(NR_MAC,"0000Looking for min_rb %d RBs, starting at %d num_dmrs_cdm_grps_no_data %d\n",
             min_rb, rbStart, sched_pusch->dmrs_info.num_dmrs_cdm_grps_no_data);
       const uint16_t slbitmap = SL_to_bitmap(sched_pusch->tda_info.startSymbolIndex, sched_pusch->tda_info.nrOfSymbols);
       while (rbStart < bwpSize && (rballoc_mask[rbStart] & slbitmap) != slbitmap)
@@ -1670,10 +1670,14 @@ void pf_ul(module_id_t module_id,
                          sched_ctrl->aggregation_level);
 
       NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
-      sched_pusch->mcs = min(nrmac->min_grant_mcs, sched_pusch->mcs);
+      //sched_pusch->mcs = min(nrmac->min_grant_mcs, sched_pusch->mcs);
+      static int cnt_mcs = 0;
+      sched_pusch->mcs = 6 + cnt_mcs %20;
+      
       update_ul_ue_R_Qm(sched_pusch->mcs, current_BWP->mcs_table, current_BWP->pusch_Config, &sched_pusch->R, &sched_pusch->Qm);
       sched_pusch->rbStart = rbStart;
-      sched_pusch->rbSize = min_rb;
+      sched_pusch->rbSize = 25 * ((cnt_mcs %10) + 1) ;
+      cnt_mcs++;
       sched_pusch->tb_size = nr_compute_tbs(sched_pusch->Qm,
                                             sched_pusch->R,
                                             sched_pusch->rbSize,
@@ -1752,7 +1756,7 @@ void pf_ul(module_id_t module_id,
       iterator++;
       continue;
     } else
-      LOG_D(NR_MAC, "allocating UL data for RNTI %04x (rbStart %d, min_rb %d, max_rbSize %d, bwpSize %d)\n", iterator->UE->rnti, rbStart, min_rb, max_rbSize, bwpSize);
+      LOG_I(NR_MAC, "11111111allocating UL data for RNTI %04x (rbStart %d, min_rb %d, max_rbSize %d, bwpSize %d)\n", iterator->UE->rnti, rbStart, min_rb, max_rbSize, bwpSize);
 
     /* Calculate the current scheduling bytes */
     const int B = cmax(sched_ctrl->estimated_ul_buffer - sched_ctrl->sched_ul_bytes, 0);
@@ -1765,6 +1769,10 @@ void pf_ul(module_id_t module_id,
     if (sched_pusch->mcs < sched_ctrl->ul_bler_stats.mcs)
       sched_ctrl->ul_bler_stats.mcs = sched_pusch->mcs; /* force estimated MCS down */
 
+
+    static int cnt_mcs = 0;
+    sched_pusch->mcs = 6 + cnt_mcs %20;
+    cnt_mcs++;
     update_ul_ue_R_Qm(sched_pusch->mcs, current_BWP->mcs_table, current_BWP->pusch_Config, &sched_pusch->R, &sched_pusch->Qm);
     uint16_t rbSize = 0;
     uint32_t TBS = 0;