sched: add more tx_params to HARQ manager allocations

Author: frankist

lib/scheduler/ue_scheduling/cell_harq_manager.cpp

@@ -255,12 +255,10 @@ bool cell_harq_repository<IsDl>::handle_new_retx(harq_type& h, slot_point sl_tx,
   // Remove HARQ from pending Retx list.
   harq_pending_retx_list.pop(&h);
 
-  h.status          = harq_state_t::waiting_ack;
-  h.slot_tx         = sl_tx;
-  h.slot_ack        = sl_ack;
-  h.ndi             = !h.ndi;
-  h.ack_on_timeout  = false;
-  h.retxs_cancelled = false;
+  h.status         = harq_state_t::waiting_ack;
+  h.slot_tx        = sl_tx;
+  h.slot_ack       = sl_ack;
+  h.ack_on_timeout = false;
   h.nof_retxs++;
 
   // Add HARQ to the timeout list.
@@ -487,6 +485,8 @@ void dl_harq_process_handle::save_grant_params(const dl_harq_sched_context& ctx,
 {
   srsran_assert(pdsch.codewords.size() == 1, "Only one codeword supported");
   dl_harq_process_impl& impl = fetch_impl();
+  srsran_sanity_check(pdsch.rnti == impl.rnti, "RNTI mismatch");
+  srsran_sanity_check(pdsch.harq_id == impl.h_id, "HARQ-id mismatch");
   srsran_assert(impl.status == harq_utils::harq_state_t::waiting_ack,
                 "Setting allocation parameters for DL HARQ process id={} in invalid state",
                 id());
@@ -497,8 +497,11 @@ void dl_harq_process_handle::save_grant_params(const dl_harq_sched_context& ctx,
   if (impl.nof_retxs == 0) {
     prev_params.tbs_bytes    = cw.tb_size_bytes;
     prev_params.dci_cfg_type = ctx.dci_cfg_type;
+    prev_params.nof_layers   = pdsch.nof_layers;
     prev_params.olla_mcs     = ctx.olla_mcs;
     prev_params.slice_id     = ctx.slice_id;
+    prev_params.cqi          = ctx.cqi.has_value() ? ctx.cqi.value() : cqi_value{1};
+    prev_params.is_fallback  = ctx.is_fallback;
   } else {
     srsran_assert(ctx.dci_cfg_type == prev_params.dci_cfg_type,
                   "DCI format and RNTI type cannot change during DL HARQ retxs");
@@ -510,6 +513,8 @@ void dl_harq_process_handle::save_grant_params(const dl_harq_sched_context& ctx,
                   prev_params.rbs,
                   cw.mcs_index,
                   pdsch.rbs);
+    srsran_assert(prev_params.nof_layers == pdsch.nof_layers, "Number of layers cannot change during HARQ retxs");
+    srsran_assert(prev_params.is_fallback == ctx.is_fallback, "Fallback state cannot change across DL HARQ retxs");
   }
   prev_params.mcs_table   = cw.mcs_table;
   prev_params.mcs         = cw.mcs_index;
@@ -539,6 +544,8 @@ int ul_harq_process_handle::ul_crc_info(bool ack)
 void ul_harq_process_handle::save_grant_params(const ul_harq_sched_context& ctx, const pusch_information& pusch)
 {
   ul_harq_process_impl& impl = fetch_impl();
+  srsran_sanity_check(pusch.rnti == impl.rnti, "RNTI mismatch");
+  srsran_sanity_check(pusch.harq_id == impl.h_id, "HARQ-id mismatch");
   srsran_assert(impl.status == harq_utils::harq_state_t::waiting_ack,
                 "Setting allocation parameters for DL HARQ process id={} in invalid state",
                 id());

lib/scheduler/ue_scheduling/cell_harq_manager.h

@@ -222,6 +222,10 @@ struct dl_harq_sched_context {
   std::optional<sch_mcs_index> olla_mcs;
   /// RAN slice identifier of the slice to which PDSCH belongs to.
   std::optional<ran_slice_id_t> slice_id;
+  /// CQI value at the moment of newTx.
+  std::optional<cqi_value> cqi;
+  /// Whether the HARQ allocation was done in fallback mode.
+  bool is_fallback = false;
 };
 
 /// \brief Context of the scheduler during the current PUSCH allocation.
@@ -290,6 +294,8 @@ class ul_harq_process_handle : public harq_utils::base_harq_process_handle<false
   using base_type = harq_utils::base_harq_process_handle<false>;
 
 public:
+  using grant_params = harq_utils::ul_harq_process_impl::alloc_params;
+
   using base_type::base_type;
 
   using base_type::empty;
@@ -311,9 +317,11 @@ class ul_harq_process_handle : public harq_utils::base_harq_process_handle<false
 
   /// \brief Stores grant parameters that are associated with the HARQ process (e.g. DCI format, PRBs, MCS) so that
   /// they can be later fetched and optionally reused.
-  void save_grant_params(const ul_harq_sched_context& ctx, const pusch_information& pdsch);
+  void save_grant_params(const ul_harq_sched_context& ctx, const pusch_information& pusch);
 
   slot_point pusch_slot() const { return fetch_impl().slot_tx; }
+
+  const grant_params& get_grant_params() const { return fetch_impl().prev_tx_params; }
 };
 
 namespace harq_utils {
@@ -371,6 +379,7 @@ class harq_pending_retx_list_impl
 
 } // namespace harq_utils
 
+/// List of HARQ processes with pending retransmissions
 using dl_harq_pending_retx_list = harq_utils::harq_pending_retx_list_impl<true>;
 using ul_harq_pending_retx_list = harq_utils::harq_pending_retx_list_impl<false>;
 
@@ -434,6 +443,7 @@ class cell_harq_manager
   harq_utils::cell_harq_repository<false> ul;
 };
 
+/// HARQ entity that manages a set of HARQ processes of a single UE.
 class unique_ue_harq_entity
 {
 public:

tests/unittests/scheduler/ue_scheduling/harq_manager_test.cpp

@@ -31,6 +31,8 @@ mac_harq_ack_report_status get_random_harq_ack()
 pdsch_information make_dummy_pdsch_info()
 {
   pdsch_information pdsch;
+  pdsch.rnti    = to_rnti(0x4601);
+  pdsch.harq_id = to_harq_id(0);
   pdsch.codewords.resize(1);
   pdsch.codewords[0].mcs_table     = srsran::pdsch_mcs_table::qam64;
   pdsch.codewords[0].mcs_index     = 10;
@@ -42,6 +44,8 @@ pdsch_information make_dummy_pdsch_info()
 pusch_information make_dummy_pusch_info()
 {
   pusch_information pusch;
+  pusch.rnti          = to_rnti(0x4601);
+  pusch.harq_id       = to_harq_id(0);
   pusch.mcs_table     = pusch_mcs_table::qam64;
   pusch.mcs_index     = 10;
   pusch.tb_size_bytes = 10000;
@@ -350,10 +354,8 @@ TEST_F(single_harq_process_test, when_max_retxs_reached_then_harq_becomes_empty)
     ASSERT_TRUE(h_ul.new_retx(current_slot + k2));
     ASSERT_EQ(h_dl.nof_retxs(), i + 1);
     ASSERT_EQ(h_ul.nof_retxs(), i + 1);
-    ASSERT_NE(old_dl_ndi, h_dl.ndi());
-    ASSERT_NE(old_ul_ndi, h_ul.ndi());
-    old_dl_ndi = h_dl.ndi();
-    old_ul_ndi = h_dl.ndi();
+    ASSERT_EQ(old_dl_ndi, h_dl.ndi());
+    ASSERT_EQ(old_ul_ndi, h_ul.ndi());
   }
   ASSERT_EQ(h_dl.dl_ack_info(mac_harq_ack_report_status::nack, 5), dl_harq_process_handle::status_update::nacked);
   ASSERT_EQ(h_ul.ul_crc_info(false), 0);