sched: remove redundant logs in pucch allocator

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

lib/scheduler/logging/scheduler_result_logger.cpp

@@ -45,29 +45,32 @@ void scheduler_result_logger::log_debug(const sched_result& result)
       case dci_dl_rnti_config_type::c_rnti_f1_0: {
         const auto& dci = pdcch.dci.c_rnti_f1_0;
         fmt::format_to(fmtbuf,
-                       " dci: h_id={} ndi={} rv={} mcs={}",
+                       " dci: h_id={} ndi={} rv={} mcs={} res_ind={}",
                        dci.harq_process_number,
                        dci.new_data_indicator,
                        dci.redundancy_version,
-                       dci.modulation_coding_scheme);
+                       dci.modulation_coding_scheme,
+                       dci.pucch_resource_indicator);
       } break;
       case dci_dl_rnti_config_type::tc_rnti_f1_0: {
         const auto& dci = pdcch.dci.tc_rnti_f1_0;
         fmt::format_to(fmtbuf,
-                       " dci: h_id={} ndi={} rv={} mcs={}",
+                       " dci: h_id={} ndi={} rv={} mcs={} res_ind={}",
                        dci.harq_process_number,
                        dci.new_data_indicator,
                        dci.redundancy_version,
-                       dci.modulation_coding_scheme);
+                       dci.modulation_coding_scheme,
+                       dci.pucch_resource_indicator);
       } break;
       case dci_dl_rnti_config_type::c_rnti_f1_1: {
         const auto& dci = pdcch.dci.c_rnti_f1_1;
         fmt::format_to(fmtbuf,
-                       " dci: h_id={} ndi={} rv={} mcs={}",
+                       " dci: h_id={} ndi={} rv={} mcs={} res_ind={}",
                        dci.harq_process_number,
                        dci.tb1_new_data_indicator,
                        dci.tb1_redundancy_version,
-                       dci.tb1_modulation_coding_scheme);
+                       dci.tb1_modulation_coding_scheme,
+                       dci.pucch_resource_indicator);
         if (dci.downlink_assignment_index.has_value()) {
           fmt::format_to(fmtbuf, " dai={}", *dci.downlink_assignment_index);
         }

lib/scheduler/pucch_scheduling/pucch_allocator_impl.cpp

@@ -148,11 +148,6 @@ optional<unsigned> pucch_allocator_impl::alloc_common_pucch_harq_ack_ue(cell_res
 
   pucch_common_alloc_grid[slot_alloc[k0 + k1 + slot_alloc.cfg.ntn_cs_koffset].slot.to_uint()].emplace_back(tcrnti);
 
-  logger.debug("tc-rnti={}: PUCCH HARQ-ACK common with res_ind={} allocated for slot={}",
-               tcrnti,
-               pucch_res_indicator,
-               pucch_slot_alloc.slot);
-
   return pucch_res_indicator;
 }
 
@@ -789,12 +784,8 @@ optional<unsigned> pucch_allocator_impl::allocate_new_format1_harq_grant(cell_sl
   const unsigned HARQ_BITS_IN_NEW_PUCCH_GRANT = 1;
   fill_pucch_ded_format1_grant(
       pucch_pdu, crnti, *pucch_harq_res_info.pucch_res, HARQ_BITS_IN_NEW_PUCCH_GRANT, sr_nof_bits::no_sr);
-  auto pucch_res_indicator = static_cast<unsigned>(pucch_harq_res_info.pucch_res_indicator);
+  const auto pucch_res_indicator = static_cast<unsigned>(pucch_harq_res_info.pucch_res_indicator);
 
-  logger.debug("rnti={}: PUCCH HARQ-ACK allocation on F1 with res_ind={} for slot={} completed",
-               crnti,
-               pucch_res_indicator,
-               pucch_slot_alloc.slot);
   return pucch_res_indicator;
 }
 
@@ -950,17 +941,6 @@ optional<unsigned> pucch_allocator_impl::convert_to_format2_harq(cell_slot_resou
                            sr_bits,
                            csi1_nof_bits_only_harq);
 
-  logger.debug("rnti={}: PUCCH Format 2 grant allocation with {} H-ACK, {} SR, {} CSI bits with res_ind={} for "
-               "slot={} completed",
-               rnti,
-               curr_harq_bits + harq_ack_bits_increment,
-               sr_nof_bits_to_uint(sr_bits),
-               csi1_nof_bits_only_harq,
-               format2_res.pucch_res_indicator,
-               pucch_slot_alloc.slot
-
-  );
-
   return format2_res.pucch_res_indicator;
 }
 
@@ -1046,12 +1026,6 @@ optional<unsigned> pucch_allocator_impl::change_format2_resource(cell_slot_resou
                            harq_ack_bits_increment,
                            sr_bits_to_report,
                            csi_bits_to_report);
-  logger.debug("rnti={}: PUCCH Format 2 grant allocation with {} H-ACK, {} SR, {} CSI bits for slot={} completed",
-               rnti,
-               harq_ack_bits_increment,
-               sr_nof_bits_to_uint(sr_bits_to_report),
-               csi_bits_to_report,
-               pucch_slot_alloc.slot);
 
   return static_cast<unsigned>(format2_res.pucch_res_indicator);
 }
@@ -1075,10 +1049,8 @@ optional<unsigned> pucch_allocator_impl::add_harq_ack_bit_to_format1_grant(pucch
   }
   // Update the HARQ, if present.
   existing_harq_grant.format_1.harq_ack_nof_bits++;
-  auto pucch_res_indicator = static_cast<unsigned>(pucch_res_idx);
+  const auto pucch_res_indicator = static_cast<unsigned>(pucch_res_idx);
 
-  logger.debug(
-      "rnti={}: HARQ-ACK mltplxd on existing PUCCH F1 with res_ind={} for slot={}", rnti, pucch_res_indicator, sl_tx);
   return pucch_res_indicator;
 }
 
@@ -1259,10 +1231,6 @@ optional<unsigned> pucch_allocator_impl::add_harq_bits_to_harq_f2_grant(pucch_in
   }
 
   existing_f2_grant.format_2.harq_ack_nof_bits += harq_ack_bits_increment;
-  logger.debug("rnti={}: HARQ-ACK multiplexed on existing PUCCH F2 with res_ind={} for slot={}",
-               existing_f2_grant.crnti,
-               pucch_f2_harq_cfg.pucch_res_indicator,
-               sl_tx);
 
   return pucch_f2_harq_cfg.pucch_res_indicator;
 }

lib/scheduler/uci_scheduling/uci_allocator_impl.cpp

@@ -278,8 +278,6 @@ void uci_allocator_impl::multiplex_uci_on_pusch(ul_sched_info&                pu
     update_uci_on_pusch_harq_offsets(
         uci.harq.value(), ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pusch_cfg.value().uci_cfg.value());
   }
-
-  logger.debug("rnti={}: UCI mltplxd on PUSCH for slot={}", crnti, slot_alloc.slot);
 }
 
 void uci_allocator_impl::uci_allocate_sr_opportunity(cell_slot_resource_allocator& slot_alloc,
@@ -325,12 +323,6 @@ void uci_allocator_impl::uci_allocate_csi_opportunity(cell_slot_resource_allocat
         ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pusch_cfg.value().uci_cfg.value().scaling;
 
     add_csi_to_uci_on_pusch(existing_pusch->uci.value().csi.emplace(), ue_cell_cfg);
-
-    logger.debug("rnti={} UCI with 0 H-ACK, {} CSI-p1 and {} CSI-p2 bits for slot={} allocated on PUSCH",
-                 crnti,
-                 existing_pusch->uci.value().csi.value().csi_part1_nof_bits,
-                 existing_pusch->uci.value().csi.value().beta_offset_csi_2.has_value() ? "up to 11" : "0",
-                 slot_alloc.slot);
     return;
   }