nr,gnb,sched: design basic search algorithm to pick UE search space with valid dci format

srsgnb/hdr/stack/mac/sched_nr_cfg.h

@@ -146,6 +146,33 @@ public:
   {
     return cce_positions_list[ss_id_to_cce_idx[search_id]];
   }
+  const srsran_search_space_t* find_ss_with_dci_format(srsran_dci_format_nr_t valid_format) const
+  {
+    for (uint32_t ss_id = 0; ss_id < SRSRAN_UE_DL_NR_MAX_NOF_SEARCH_SPACE; ++ss_id) {
+      if (phy().pdcch.search_space_present[ss_id]) {
+        for (uint32_t i = 0; i < phy().pdcch.search_space[ss_id].nof_formats; ++i) {
+          if (phy().pdcch.search_space[ss_id].formats[i] == valid_format) {
+            return &phy().pdcch.search_space[ss_id];
+          }
+        }
+      }
+    }
+    return nullptr;
+  }
+  const srsran_search_space_t* find_ss(uint32_t aggr_idx, bool is_dl) const
+  {
+    using format_list_t = std::array<srsran_dci_format_nr_t, 2>;
+    static const format_list_t ul_formats{srsran_dci_format_nr_0_1, srsran_dci_format_nr_0_0};
+    static const format_list_t dl_formats{srsran_dci_format_nr_1_1, srsran_dci_format_nr_1_0};
+    const format_list_t&       formats = is_dl ? dl_formats : ul_formats;
+    for (srsran_dci_format_nr_t f : formats) {
+      const srsran_search_space_t* ss = find_ss_with_dci_format(f);
+      if (ss != nullptr and ss->nof_candidates[aggr_idx] > 0) {
+        return ss;
+      }
+    }
+    return nullptr;
+  }
   uint32_t get_k1(slot_point pdsch_slot) const
   {
     if (phy().duplex.mode == SRSRAN_DUPLEX_MODE_TDD) {

srsgnb/src/stack/mac/sched_nr_grant_allocator.cc

@@ -264,16 +264,14 @@ alloc_result bwp_slot_allocator::alloc_pdsch(slot_ue& ue, const prb_grant& dl_gr
   // Find space and allocate PDCCH
   const uint32_t aggr_idx = 2;
   // Choose the ss_id the highest number of candidates
-  uint32_t ss_id = 0, max_nof_candidates = 0;
+  const srsran_search_space_t* ss = ue->find_ss(aggr_idx, true);
-  for (uint32_t i = 0; i < 3; ++i) {
+  if (ss == nullptr) {
-    uint32_t nof_candidates = ue->cce_pos_list(i, pdcch_slot.slot_idx(), aggr_idx).size();
+    // Could not find space in PDCCH
-    if (nof_candidates > max_nof_candidates) {
+    logger.warning("SCHED: No PDCCH candidates for any of the rnti=0x%x search spaces", ue->rnti);
-      ss_id              = i;
+    return alloc_result::no_cch_space;
-      max_nof_candidates = nof_candidates;
-    }
   }
-  uint32_t coreset_id = ue->phy().pdcch.search_space[ss_id].coreset_id;
+  uint32_t coreset_id = ss->coreset_id;
-  if (not bwp_pdcch_slot.coresets[coreset_id]->alloc_dci(pdcch_grant_type_t::dl_data, aggr_idx, ss_id, &ue.cfg())) {
+  if (not bwp_pdcch_slot.coresets[coreset_id]->alloc_dci(pdcch_grant_type_t::dl_data, aggr_idx, ss->id, &ue.cfg())) {
     // Could not find space in PDCCH
     return alloc_result::no_cch_space;
   }
@@ -295,7 +293,7 @@ alloc_result bwp_slot_allocator::alloc_pdsch(slot_ue& ue, const prb_grant& dl_gr
   while (true) {
     // Generate PDCCH
     pdcch_dl_t& pdcch = bwp_pdcch_slot.dl.phy.pdcch_dl.back();
-    fill_dl_dci_ue_fields(ue, *bwp_grid.cfg, ss_id, pdcch.dci.ctx.location, pdcch.dci);
+    fill_dl_dci_ue_fields(ue, *bwp_grid.cfg, ss->id, pdcch.dci.ctx.location, pdcch.dci);
     pdcch.dci.pucch_resource = 0;
     pdcch.dci.dai            = std::count_if(bwp_uci_slot.pending_acks.begin(),
                                   bwp_uci_slot.pending_acks.end(),
@@ -357,24 +355,16 @@ alloc_result bwp_slot_allocator::alloc_pusch(slot_ue& ue, const prb_grant& ul_pr
   if (bwp_pusch_slot.ul_prbs.collides(ul_prbs)) {
     return alloc_result::sch_collision;
   }
-  const uint32_t aggr_idx = 2;
+  const uint32_t               aggr_idx = 2;
-  // Choose the ss_id the highest number of candidates
+  const srsran_search_space_t* ss       = ue->find_ss(aggr_idx, false);
-  uint32_t ss_id = 0, max_nof_candidates = 0;
+  if (ss == nullptr) {
-  for (uint32_t i = 0; i < 3; ++i) {
-    uint32_t nof_candidates = ue->cce_pos_list(i, pdcch_slot.slot_idx(), aggr_idx).size();
-    if (nof_candidates > max_nof_candidates) {
-      ss_id              = i;
-      max_nof_candidates = nof_candidates;
-    }
-  }
-  if (max_nof_candidates == 0) {
     // Could not find space in PDCCH
     logger.warning("SCHED: No PDCCH candidates for any of the rnti=0x%x search spaces", ue->rnti);
     return alloc_result::no_cch_space;
   }
-  uint32_t coreset_id = ue->phy().pdcch.search_space[ss_id].coreset_id;
+  uint32_t coreset_id = ss->coreset_id;
   if (not bwp_pdcch_slot.coresets[coreset_id].value().alloc_dci(
-          pdcch_grant_type_t::ul_data, aggr_idx, ss_id, &ue.cfg())) {
+          pdcch_grant_type_t::ul_data, aggr_idx, ss->id, &ue.cfg())) {
     // Could not find space in PDCCH
     return alloc_result::no_cch_space;
   }
@@ -392,7 +382,7 @@ alloc_result bwp_slot_allocator::alloc_pusch(slot_ue& ue, const prb_grant& ul_pr
 
   // Generate PDCCH
   pdcch_ul_t& pdcch = pdcchs.back();
-  fill_ul_dci_ue_fields(ue, *bwp_grid.cfg, ss_id, pdcch.dci.ctx.location, pdcch.dci);
+  fill_ul_dci_ue_fields(ue, *bwp_grid.cfg, ss->id, pdcch.dci.ctx.location, pdcch.dci);
   pdcch.dci_cfg = ue->phy().get_dci_cfg();
   // Generate PUSCH
   bwp_pusch_slot.ul_prbs |= ul_prbs;