fapi_adaptor: changed the phy adaptor to accept late FAPI messages based in a configuration parameter

AlaiaL · AlaiaL · commit 5d72d8b4f595 · 2023-12-21T14:14:32.000Z
diff --git a/apps/examples/du/fapi_factory.cpp b/apps/examples/du/fapi_factory.cpp
@@ -37,12 +37,14 @@ srsran::build_phy_fapi_adaptor(unsigned
   report_fatal_error_if_not(adaptor_factory, "Invalid PHY adaptor factory.");
 
   phy_fapi_adaptor_factory_config phy_fapi_config;
-  phy_fapi_config.sector_id   = sector_id;
-  phy_fapi_config.scs         = scs;
-  phy_fapi_config.scs_common  = scs_common;
-  phy_fapi_config.prach_cfg   = &prach_cfg;
-  phy_fapi_config.carrier_cfg = &carrier_cfg;
-  phy_fapi_config.prach_ports = std::move(prach_ports);
+  phy_fapi_config.sector_id = sector_id;
+  // Do not allow delay.
+  phy_fapi_config.nof_slots_request_headroom = 0;
+  phy_fapi_config.scs                        = scs;
+  phy_fapi_config.scs_common                 = scs_common;
+  phy_fapi_config.prach_cfg                  = &prach_cfg;
+  phy_fapi_config.carrier_cfg                = &carrier_cfg;
+  phy_fapi_config.prach_ports                = std::move(prach_ports);
 
   phy_fapi_adaptor_factory_dependencies phy_fapi_dependencies;
   phy_fapi_dependencies.logger               = &srslog::fetch_basic_logger("FAPI");
diff --git a/apps/gnb/gnb_appconfig.h b/apps/gnb/gnb_appconfig.h
@@ -826,6 +826,11 @@ struct expert_upper_phy_appconfig {
   /// -\c post_equalization: SINR is calculated using the post-equalization noise variances of the equalized RE.
   /// -\c evm: SINR is obtained from the EVM of the PUSCH symbols.
   std::string pusch_sinr_calc_method = "evm";
+  /// \brief Request headroom size in slots.
+  ///
+  /// The request headroom size is the number of delayed slots that the upper physical layer will accept, ie, if the
+  /// current slot is M, the upper phy will consider the slot M - nof_slots_request_headroom as valid and process it.
+  unsigned nof_slots_request_headroom = 0U;
 };
 
 struct test_mode_ue_appconfig {
diff --git a/apps/gnb/gnb_appconfig_cli11_schema.cpp b/apps/gnb/gnb_appconfig_cli11_schema.cpp
@@ -456,6 +456,11 @@ static void configure_cli11_expert_phy_args(CLI::App& app, expert_upper_phy_appc
                  "PUSCH SINR calculation method: channel_estimator, post_equalization and evm.")
       ->capture_default_str()
       ->check(pusch_sinr_method_check);
+  app.add_option("--max_request_headroom_slots",
+                 expert_phy_params.nof_slots_request_headroom,
+                 "Maximum request headroom size in slots.")
+      ->capture_default_str()
+      ->check(CLI::Range(0, 3));
 }
 
 static void configure_cli11_pdcch_common_args(CLI::App& app, pdcch_common_appconfig& common_params)
diff --git a/apps/gnb/gnb_appconfig_translators.cpp b/apps/gnb/gnb_appconfig_translators.cpp
@@ -1570,6 +1570,7 @@ std::vector<upper_phy_config> srsran::generate_du_low_config(const gnb_appconfig
       max_pusch_concurrency = 1;
     }
 
+    cfg.nof_slots_request_headroom = config.expert_phy_cfg.nof_slots_request_headroom;
     cfg.log_level                  = srslog::str_to_basic_level(config.log_cfg.phy_level);
     cfg.enable_logging_broadcast   = config.log_cfg.broadcast_enabled;
     cfg.rx_symbol_printer_filename = config.log_cfg.phy_rx_symbols_filename;
diff --git a/include/srsran/fapi/message_builders.h b/include/srsran/fapi/message_builders.h
@@ -931,7 +931,10 @@ class dl_tti_request_message_builder
 {
 public:
   /// Constructs a builder that will help to fill the given DL TTI request message.
-  explicit dl_tti_request_message_builder(dl_tti_request_message& msg_) : msg(msg_) {}
+  explicit dl_tti_request_message_builder(dl_tti_request_message& msg_) : msg(msg_)
+  {
+    msg.is_last_message_in_slot = false;
+  }
 
   /// Sets the DL_TTI.request basic parameters and returns a reference to the builder.
   /// \note nPDUs and nPDUsOfEachType properties are filled by the add_*_pdu() functions.
@@ -1069,6 +1072,13 @@ class dl_tti_request_message_builder
     return builder;
   }
 
+  /// Sets the flag of the last message in slot.
+  dl_tti_request_message_builder& set_last_message_in_slot_flag()
+  {
+    msg.is_last_message_in_slot = true;
+    return *this;
+  }
+
   //: TODO: PDU groups array
   //: TODO: top level rate match patterns
 
@@ -1085,6 +1095,7 @@ class ul_dci_request_message_builder
   explicit ul_dci_request_message_builder(ul_dci_request_message& msg_) : msg(msg_)
   {
     msg.num_pdus_of_each_type.fill(0);
+    msg.is_last_message_in_slot = false;
   }
 
   /// Sets the UL_DCI.request basic parameters and returns a reference to the builder.
@@ -1118,6 +1129,13 @@ class ul_dci_request_message_builder
 
     return builder;
   }
+
+  /// Sets the flag of the last message in slot.
+  ul_dci_request_message_builder& set_last_message_in_slot_flag()
+  {
+    msg.is_last_message_in_slot = true;
+    return *this;
+  }
 };
 
 /// Tx_Data.request message builder that helps to fill in the parameters specified in SCF-222 v4.0 section 3.4.6.
diff --git a/include/srsran/fapi/messages.h b/include/srsran/fapi/messages.h
@@ -314,7 +314,7 @@ struct dl_pdsch_pdu {
   dl_pdsch_ptrs_maintenance_v3             ptrs_maintenance_v3;
   // :TODO: Rel16 PDSCH params v3
   dl_pdsch_parameters_v4 pdsch_parameters_v4;
-  // Vendor specific parameters.
+  /// Vendor specific parameters.
   optional<pdsch_context> context;
 };
 
@@ -427,6 +427,8 @@ struct dl_tti_request_message : public base_message {
   static_vector<dl_tti_request_pdu, MAX_DL_PDUS_PER_SLOT> pdus;
   //: TODO: groups array
   //: TODO: top level rate match patterns
+  /// Vendor specific parameters.
+  bool is_last_message_in_slot;
 };
 
 /// Downlink TTI response pdu information.
@@ -802,6 +804,8 @@ struct ul_dci_request_message : public base_message {
   uint16_t                                    slot;
   std::array<uint16_t, MAX_NUM_DL_TYPES>      num_pdus_of_each_type;
   static_vector<ul_dci_pdu, MAX_NUM_UCI_PDUS> pdus;
+  // Vendor specific parameters.
+  bool is_last_message_in_slot;
 };
 
 /// Encodes the generic information of a TLV.
diff --git a/include/srsran/fapi_adaptor/phy/phy_fapi_adaptor_factory.h b/include/srsran/fapi_adaptor/phy/phy_fapi_adaptor_factory.h
@@ -34,6 +34,8 @@ namespace fapi_adaptor {
 struct phy_fapi_adaptor_factory_config {
   /// Base station sector identifier.
   unsigned sector_id;
+  /// Request headroom size in slots.
+  unsigned nof_slots_request_headroom;
   /// Subcarrier spacing as per TS38.211 Section 4.2.
   subcarrier_spacing scs;
   /// Common subcarrier spacing as per TS38.331 Section 6.2.2.
diff --git a/include/srsran/phy/upper/upper_phy_factories.h b/include/srsran/phy/upper/upper_phy_factories.h
@@ -280,6 +280,8 @@ struct upper_phy_config {
   unsigned dl_bw_rb;
   /// Number of RBs for uplink.
   unsigned ul_bw_rb;
+  /// Request headroom size in slots.
+  unsigned nof_slots_request_headroom;
   /// List of active subcarrier spacing, indexed by numerology.
   std::array<bool, to_numerology_value(subcarrier_spacing::invalid)> active_scs;
   /// Transmit buffer pool configuration.
diff --git a/lib/du/adapters/fapi_factory.cpp b/lib/du/adapters/fapi_factory.cpp
@@ -17,19 +17,20 @@ using namespace srsran;
 using namespace fapi_adaptor;
 
 std::unique_ptr<phy_fapi_adaptor>
-srsran::build_phy_fapi_adaptor(unsigned                                                           sector_id,
-                               subcarrier_spacing                                                 scs,
-                               subcarrier_spacing                                                 scs_common,
-                               downlink_processor_pool&                                           dl_processor_pool,
-                               resource_grid_pool&                                                dl_rg_pool,
-                               uplink_request_processor&                                          ul_request_processor,
-                               resource_grid_pool&                                                ul_rg_pool,
-                               uplink_slot_pdu_repository&                                        ul_pdu_repository,
-                               const downlink_pdu_validator&                                      dl_pdu_validator,
-                               const uplink_pdu_validator&                                        ul_pdu_validator,
-                               const fapi::prach_config&                                          prach_cfg,
-                               const fapi::carrier_config&                                        carrier_cfg,
-                               std::unique_ptr<precoding_matrix_repository>                       pm_repo,
+srsran::build_phy_fapi_adaptor(unsigned                                     sector_id,
+                               unsigned                                     nof_slots_request_headroom,
+                               subcarrier_spacing                           scs,
+                               subcarrier_spacing                           scs_common,
+                               downlink_processor_pool&                     dl_processor_pool,
+                               resource_grid_pool&                          dl_rg_pool,
+                               uplink_request_processor&                    ul_request_processor,
+                               resource_grid_pool&                          ul_rg_pool,
+                               uplink_slot_pdu_repository&                  ul_pdu_repository,
+                               const downlink_pdu_validator&                dl_pdu_validator,
+                               const uplink_pdu_validator&                  ul_pdu_validator,
+                               const fapi::prach_config&                    prach_cfg,
+                               const fapi::carrier_config&                  carrier_cfg,
+                               std::unique_ptr<precoding_matrix_repository> pm_repo,
                                std::unique_ptr<fapi_adaptor::uci_part2_correspondence_repository> part2_repo,
                                task_executor&                                                     async_executor,
                                tx_buffer_pool&                                                    buffer_pool,
@@ -39,12 +40,13 @@ srsran::build_phy_fapi_adaptor(unsigned
   report_error_if_not(adaptor_factory, "Invalid PHY adaptor factory.");
 
   phy_fapi_adaptor_factory_config phy_fapi_config;
-  phy_fapi_config.sector_id   = sector_id;
-  phy_fapi_config.scs         = scs;
-  phy_fapi_config.scs_common  = scs_common;
-  phy_fapi_config.prach_cfg   = &prach_cfg;
-  phy_fapi_config.carrier_cfg = &carrier_cfg;
-  phy_fapi_config.prach_ports = std::move(prach_ports);
+  phy_fapi_config.sector_id                  = sector_id;
+  phy_fapi_config.nof_slots_request_headroom = nof_slots_request_headroom;
+  phy_fapi_config.scs                        = scs;
+  phy_fapi_config.scs_common                 = scs_common;
+  phy_fapi_config.prach_cfg                  = &prach_cfg;
+  phy_fapi_config.carrier_cfg                = &carrier_cfg;
+  phy_fapi_config.prach_ports                = std::move(prach_ports);
 
   phy_fapi_adaptor_factory_dependencies phy_fapi_dependencies;
   phy_fapi_dependencies.logger               = &srslog::fetch_basic_logger("FAPI");
diff --git a/lib/du/adapters/fapi_factory.h b/lib/du/adapters/fapi_factory.h
@@ -22,6 +22,7 @@ namespace srsran {
 
 std::unique_ptr<fapi_adaptor::phy_fapi_adaptor>
 build_phy_fapi_adaptor(unsigned                                                           sector_id,
+                       unsigned                                                           nof_slots_request_headroom,
                        subcarrier_spacing                                                 scs,
                        subcarrier_spacing                                                 scs_common,
                        downlink_processor_pool&                                           dl_processor_pool,
diff --git a/lib/du/du_impl.cpp b/lib/du/du_impl.cpp
@@ -104,6 +104,7 @@ du_impl::du_impl(const du_config& du_cfg) :
 
   // Create FAPI adaptors.
   const du_cell_config&    du_cell         = du_cfg.du_hi.cells.front();
+  const upper_phy_config&  upper_phy_cfg   = du_cfg.du_lo.upper_phy.front();
   const unsigned           sector          = du_cfg.fapi.sector;
   const subcarrier_spacing scs             = du_cell.scs_common;
   auto                     pm_tools        = fapi_adaptor::generate_precoding_matrix_tables(du_cell.dl_carrier.nof_ant);
@@ -112,6 +113,7 @@ du_impl::du_impl(const du_config& du_cfg) :
   // Instantiate adaptor of FAPI to DU-low.
   du_low_adaptor = build_phy_fapi_adaptor(
       sector,
+      upper_phy_cfg.nof_slots_request_headroom,
       scs,
       scs,
       du_lo->get_downlink_processor_pool(),
@@ -125,9 +127,10 @@ du_impl::du_impl(const du_config& du_cfg) :
       generate_carrier_config_tlv(du_cell),
       std::move(std::get<std::unique_ptr<fapi_adaptor::precoding_matrix_repository>>(pm_tools)),
       std::move(std::get<std::unique_ptr<fapi_adaptor::uci_part2_correspondence_repository>>(uci_part2_tools)),
-      *du_cfg.du_lo.upper_phy.front().dl_executors.front(),
+      *upper_phy_cfg.dl_executors.front(),
       du_lo->get_tx_buffer_pool(),
       du_cfg.fapi.prach_ports);
+
   report_error_if_not(du_low_adaptor, "Unable to create PHY adaptor.");
   du_lo->set_rx_results_notifier(du_low_adaptor->get_rx_results_notifier());
   du_lo->set_timing_notifier(du_low_adaptor->get_timing_notifier());
diff --git a/lib/fapi_adaptor/mac/mac_to_fapi_translator.cpp b/lib/fapi_adaptor/mac/mac_to_fapi_translator.cpp
@@ -205,6 +205,13 @@ void mac_to_fapi_translator::on_new_downlink_scheduler_results(const mac_dl_sche
                                *pm_mapper,
                                cell_nof_prbs);
 
+  bool is_pdsch_pdu_present_in_dl_tti = msg.num_pdus_of_each_type[static_cast<size_t>(fapi::dl_pdu_type::PDSCH)] != 0;
+  bool is_ul_dci_present              = dl_res.dl_res->ul_pdcchs.size() != 0;
+
+  if (!is_pdsch_pdu_present_in_dl_tti && !is_ul_dci_present) {
+    builder.set_last_message_in_slot_flag();
+  }
+
   // Validate the DL_TTI.request message.
   error_type<fapi::validator_report> result = validate_dl_tti_request(msg);
 
@@ -217,7 +224,9 @@ void mac_to_fapi_translator::on_new_downlink_scheduler_results(const mac_dl_sche
   // Send the message.
   msg_gw.dl_tti_request(msg);
 
-  handle_ul_dci_request(dl_res.dl_res->ul_pdcchs, dl_res.ul_pdcch_pdus, dl_res.slot);
+  bool is_ul_dci_last_message_in_slot = !is_pdsch_pdu_present_in_dl_tti && is_ul_dci_present;
+
+  handle_ul_dci_request(dl_res.dl_res->ul_pdcchs, dl_res.ul_pdcch_pdus, dl_res.slot, is_ul_dci_last_message_in_slot);
 }
 
 void mac_to_fapi_translator::on_new_downlink_data(const mac_dl_data_result& dl_data)
@@ -317,7 +326,8 @@ void mac_to_fapi_translator::on_new_uplink_scheduler_results(const mac_ul_sched_
 
 void mac_to_fapi_translator::handle_ul_dci_request(span<const pdcch_ul_information> pdcch_info,
                                                    span<const dci_payload>          payloads,
-                                                   slot_point                       slot)
+                                                   slot_point                       slot,
+                                                   bool                             is_last_message_in_slot)
 {
   // This message is optional, do not send it empty.
   if (pdcch_info.empty()) {
@@ -330,6 +340,10 @@ void mac_to_fapi_translator::handle_ul_dci_request(span<const pdcch_ul_informati
   builder.set_basic_parameters(slot.sfn(), slot.slot_index());
   add_pdcch_pdus_to_builder(builder, pdcch_info, payloads, *pm_mapper, cell_nof_prbs);
 
+  if (is_last_message_in_slot) {
+    builder.set_last_message_in_slot_flag();
+  }
+
   // Validate the UL_DCI.request message.
   error_type<fapi::validator_report> result = validate_ul_dci_request(msg);
   if (!result) {
diff --git a/lib/fapi_adaptor/mac/mac_to_fapi_translator.h b/lib/fapi_adaptor/mac/mac_to_fapi_translator.h
@@ -62,8 +62,10 @@ class mac_to_fapi_translator : public mac_cell_result_notifier
 
 private:
   /// Handles the UL_DCI.request message.
-  void
-  handle_ul_dci_request(span<const pdcch_ul_information> pdcch_info, span<const dci_payload> payloads, slot_point slot);
+  void handle_ul_dci_request(span<const pdcch_ul_information> pdcch_info,
+                             span<const dci_payload>          payloads,
+                             slot_point                       slot,
+                             bool                             is_last_message_in_slot);
 
 private:
   /// FAPI logger.
diff --git a/lib/fapi_adaptor/phy/fapi_to_phy_translator.cpp b/lib/fapi_adaptor/phy/fapi_to_phy_translator.cpp
diff --git a/lib/fapi_adaptor/phy/fapi_to_phy_translator.h b/lib/fapi_adaptor/phy/fapi_to_phy_translator.h
diff --git a/lib/fapi_adaptor/phy/phy_fapi_adaptor_factory_impl.cpp b/lib/fapi_adaptor/phy/phy_fapi_adaptor_factory_impl.cpp
diff --git a/lib/fapi_adaptor/phy/phy_fapi_adaptor_impl.cpp b/lib/fapi_adaptor/phy/phy_fapi_adaptor_impl.cpp
diff --git a/lib/fapi_adaptor/phy/phy_fapi_adaptor_impl.h b/lib/fapi_adaptor/phy/phy_fapi_adaptor_impl.h
diff --git a/tests/unittests/fapi_adaptor/phy/fapi_to_phy_translator_test.cpp b/tests/unittests/fapi_adaptor/phy/fapi_to_phy_translator_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -1570,6 +1570,7 @@ std::vector<upper_phy_config> srsran::generate_du_low_config(const gnb_appconfig`
`1570`	`1570`	`max_pusch_concurrency = 1;`
`1571`	`1571`	`}`
`1572`	`1572`
	`1573`	`+ cfg.nof_slots_request_headroom = config.expert_phy_cfg.nof_slots_request_headroom;`
`1573`	`1574`	`cfg.log_level = srslog::str_to_basic_level(config.log_cfg.phy_level);`
`1574`	`1575`	`cfg.enable_logging_broadcast = config.log_cfg.broadcast_enabled;`
`1575`	`1576`	`cfg.rx_symbol_printer_filename = config.log_cfg.phy_rx_symbols_filename;`