sched: make min pucch-pusch distance configurable via cli11

Author: frankist

apps/units/flexible_o_du/o_du_high/du_high/du_high_config.h

@@ -116,6 +116,8 @@ struct du_high_unit_ul_common_config {
   unsigned max_pucchs_per_slot = 31U;
   /// Maximum number of PUSCH + PUCCH grants per slot.
   unsigned max_ul_grants_per_slot = 32U;
+  /// Minimum distance in PRBs between PUCCH and UE-dedicated PUSCH grants.
+  unsigned min_pucch_pusch_prb_distance = 1U;
 };
 
 /// PDSCH application configuration.

apps/units/flexible_o_du/o_du_high/du_high/du_high_config_cli11_schema.cpp

@@ -717,6 +717,12 @@ static void configure_cli11_ul_common_args(CLI::App& app, du_high_unit_ul_common
              "Maximum number of UL grants that can be allocated per slot")
       ->capture_default_str()
       ->check(CLI::Range(1U, (unsigned)(MAX_PUSCH_PDUS_PER_SLOT + MAX_PUCCH_PDUS_PER_SLOT)));
+  add_option(app,
+             "--min_pucch_pusch_prb_distance",
+             ul_common_params.min_pucch_pusch_prb_distance,
+             "Minimum PRB distance between PUCCH and UE-dedicated PUSCH grants")
+      ->capture_default_str()
+      ->check(CLI::Range(0U, (unsigned)MAX_NOF_PRBS / 2U));
 }
 
 static void configure_cli11_pusch_args(CLI::App& app, du_high_unit_pusch_config& pusch_params)

apps/units/flexible_o_du/o_du_high/du_high/du_high_config_translators.cpp

@@ -1083,6 +1083,7 @@ static scheduler_expert_config generate_scheduler_expert_config(const du_high_un
   // PUCCH and scheduler expert parameters.
   out_cfg.ue.max_ul_grants_per_slot                   = cell.ul_common_cfg.max_ul_grants_per_slot;
   out_cfg.ue.max_pucchs_per_slot                      = cell.ul_common_cfg.max_pucchs_per_slot;
+  out_cfg.ue.min_pucch_pusch_prb_distance             = cell.ul_common_cfg.min_pucch_pusch_prb_distance;
   out_cfg.ue.min_k1                                   = cell.pucch_cfg.min_k1;
   const du_high_unit_pucch_config& pucch              = cell.pucch_cfg;
   out_cfg.ue.ul_power_ctrl.enable_pucch_cl_pw_control = pucch.enable_closed_loop_pw_control;

apps/units/flexible_o_du/o_du_high/du_high/du_high_config_validator.cpp

@@ -673,13 +673,22 @@ static bool validate_srs_cell_unit_config(const du_high_unit_srs_config& config,
 }
 
 /// Validates the given PUCCH cell application configuration. Returns true on success, otherwise false.
-static bool validate_ul_common_unit_config(const du_high_unit_ul_common_config& config)
+static bool validate_ul_common_unit_config(const du_high_unit_ul_common_config& config, unsigned nof_crbs)
 {
   if (config.max_ul_grants_per_slot <= config.max_pucchs_per_slot) {
     fmt::print("The max number of UL grants per slot should be greater than the maximum number of PUCCH grants.\n");
     return false;
   }
 
+  if (config.min_pucch_pusch_prb_distance >= nof_crbs / 2) {
+    fmt::print("The minimum distance between PUCCH and PUSCH PRBs ({}) should be less than half of the BWP size "
+               "({}/2 = {}).\n",
+               config.min_pucch_pusch_prb_distance,
+               nof_crbs,
+               nof_crbs / 2);
+    return false;
+  }
+
   return true;
 }
 
@@ -1098,7 +1107,7 @@ static bool validate_base_cell_unit_config(const du_high_unit_base_cell_config&
     return false;
   }
 
-  if (!validate_ul_common_unit_config(config.ul_common_cfg)) {
+  if (!validate_ul_common_unit_config(config.ul_common_cfg, nof_crbs)) {
     return false;
   }