du_unit: moved the DPDK DU low code to the DU low folder

Author: AlaiaL

apps/units/flexible_du/du_low/du_low_config_cli11_schema.cpp

@@ -242,7 +242,7 @@ static void configure_cli11_bbdev_hwacc_args(CLI::App& app, std::optional<bbdev_
 {
   config.emplace();
 
-  app.add_option("--bbdev_acc_type", config->hwacc_type, "Type of BBDEV implementation")->capture_default_str();
+  app.add_option("--bbdev_acc_type", config->bbdev_acc_type, "Type of BBDEV implementation")->capture_default_str();
   app.add_option("--hwacc_type", config->hwacc_type, "Type of BBDEV hardware-accelerator")->capture_default_str();
   app.add_option("--id", config->id, "ID of the BBDEV-based hardware-accelerator.")
       ->capture_default_str()

apps/units/flexible_du/du_low/du_low_config_translator.cpp

@@ -20,7 +20,6 @@ using namespace srsran;
 
 static void generate_du_low_config(srs_du::du_low_config&             out_config,
                                    const du_low_unit_config&          du_low,
-                                   const hal_upper_phy_config&        hal_config,
                                    span<const srs_du::du_cell_config> du_cells,
                                    span<const unsigned>               max_puschs_per_slot,
                                    unsigned                           du_id)
@@ -31,9 +30,6 @@ static void generate_du_low_config(srs_du::du_low_config&             out_config
     const srs_du::du_cell_config& cell           = du_cells[i];
     upper_phy_config&             upper_phy_cell = out_config.cells.emplace_back().upper_phy_cfg;
 
-    // Initialize the HAL config of the upper PHY.
-    upper_phy_cell.hal_config = hal_config;
-
     // Get band, frequency range and duplex mode from the band.
     nr_band               band       = cell.dl_carrier.band;
     const frequency_range freq_range = band_helper::get_freq_range(band);
@@ -160,16 +156,13 @@ static void generate_du_low_config(srs_du::du_low_config&             out_config
   }
 }
 
-void srsran::generate_du_low_wrapper_config(srs_du::du_low_wrapper_config&              out_config,
-                                            const du_low_unit_config&                   du_low_unit_cfg,
-                                            const hal_upper_phy_config&                 hal_config,
-                                            std::vector<srs_du::cell_prach_ports_entry> prach_ports,
-                                            span<const srs_du::du_cell_config>          du_cells,
-                                            span<const unsigned>                        max_puschs_per_slot,
-                                            unsigned                                    du_id)
+void srsran::generate_du_low_wrapper_config(srs_du::du_low_wrapper_config&     out_config,
+                                            const du_low_unit_config&          du_low_unit_cfg,
+                                            span<const srs_du::du_cell_config> du_cells,
+                                            span<const unsigned>               max_puschs_per_slot,
+                                            unsigned                           du_id)
 {
-  generate_du_low_config(out_config.du_low_cfg, du_low_unit_cfg, hal_config, du_cells, max_puschs_per_slot, du_id);
-  out_config.prach_ports = std::move(prach_ports);
+  generate_du_low_config(out_config.du_low_cfg, du_low_unit_cfg, du_cells, max_puschs_per_slot, du_id);
 }
 
 void srsran::fill_du_low_worker_manager_config(worker_manager_config&    config,

apps/units/flexible_du/du_low/du_low_config_translator.h

@@ -23,13 +23,11 @@ struct du_low_config;
 struct du_low_unit_config;
 struct worker_manager_config;
 
-void generate_du_low_wrapper_config(srs_du::du_low_wrapper_config&              out_config,
-                                    const du_low_unit_config&                   du_low_unit_cfg,
-                                    const hal_upper_phy_config&                 hal_config,
-                                    std::vector<srs_du::cell_prach_ports_entry> prach_ports,
-                                    span<const srs_du::du_cell_config>          du_cells,
-                                    span<const unsigned>                        max_puschs_per_slot,
-                                    unsigned                                    du_id);
+void generate_du_low_wrapper_config(srs_du::du_low_wrapper_config&     out_config,
+                                    const du_low_unit_config&          du_low_unit_cfg,
+                                    span<const srs_du::du_cell_config> du_cells,
+                                    span<const unsigned>               max_puschs_per_slot,
+                                    unsigned                           du_id);
 
 /// Fills the DU low worker manager parameters of the given worker manager configuration.
 void fill_du_low_worker_manager_config(worker_manager_config&    config,

apps/units/flexible_du/du_low/du_low_wrapper_config_helper.cpp

@@ -14,6 +14,13 @@
 #include "du_low_config_translator.h"
 #include "srsran/du/du_low/du_low_wrapper_factory.h"
 #include "srsran/ran/slot_pdu_capacity_constants.h"
+#ifdef DPDK_FOUND
+#include "srsran/hal/dpdk/bbdev/bbdev_acc.h"
+#include "srsran/hal/dpdk/bbdev/bbdev_acc_factory.h"
+#include "srsran/hal/phy/upper/channel_processors/hw_accelerator_factories.h"
+#include "srsran/hal/phy/upper/channel_processors/pusch/ext_harq_buffer_context_repository_factory.h"
+#include "srsran/hal/phy/upper/channel_processors/pusch/hw_accelerator_factories.h"
+#endif // DPDK_FOUND
 
 using namespace srsran;
 
@@ -55,7 +62,6 @@ static void generate_dl_processor_config(downlink_processor_factory_sw_config& o
 void srsran::make_du_low_wrapper_config_and_dependencies(
     srs_du::du_low_wrapper_config&              out_cfg,
     const du_low_unit_config&                   du_low_unit_cfg,
-    const hal_upper_phy_config&                 hal_config,
     std::vector<srs_du::cell_prach_ports_entry> prach_ports,
     span<const srs_du::du_cell_config>          du_cells,
     span<const unsigned>                        max_puschs_per_slot,
@@ -66,8 +72,90 @@ void srsran::make_du_low_wrapper_config_and_dependencies(
 {
   out_cfg.du_low_cfg.logger = &srslog::fetch_basic_logger("DU");
 
-  generate_du_low_wrapper_config(
-      out_cfg, du_low_unit_cfg, hal_config, std::move(prach_ports), du_cells, max_puschs_per_slot, du_id);
+  // Initialize hardware-accelerator (only if needed).
+  hal_upper_phy_config hal_config  = {};
+  hal_config.hwacc_pdsch_processor = false;
+  hal_config.hwacc_pusch_processor = false;
+#ifdef DPDK_FOUND
+  if (du_low_unit_cfg.hal_config && du_low_unit_cfg.hal_config->bbdev_hwacc &&
+      !du_low_unit_cfg.hal_config->bbdev_hwacc->hwacc_type.empty()) {
+    const bbdev_appconfig& bbdev_app_cfg = du_low_unit_cfg.hal_config->bbdev_hwacc.value();
+    srslog::basic_logger&  hwacc_logger  = srslog::fetch_basic_logger("HWACC", false);
+    hwacc_logger.set_level(du_low_unit_cfg.loggers.hal_level);
+
+    hal::bbdev_hwacc_pdsch_enc_factory_configuration         hwacc_pdsch_enc_cfg = {};
+    hal::bbdev_hwacc_pusch_dec_factory_configuration         hwacc_pusch_dec_cfg = {};
+    std::shared_ptr<hal::ext_harq_buffer_context_repository> harq_buffer_context = nullptr;
+    unsigned                                                 nof_hwacc_dus       = du_cells.size();
+
+    // Create a bbdev accelerator factory.
+    std::unique_ptr<dpdk::bbdev_acc_factory> bbdev_acc_factory =
+        dpdk::create_bbdev_acc_factory(bbdev_app_cfg.bbdev_acc_type);
+    report_error_if_not(bbdev_acc_factory,
+                        "Unable to create the {} bbdev hardware-accelerator interface factory.",
+                        bbdev_app_cfg.bbdev_acc_type);
+
+    // Intefacing to the bbdev-based hardware-accelerator.
+    dpdk::bbdev_acc_configuration bbdev_config;
+    bbdev_config.id = bbdev_app_cfg.id;
+    if (bbdev_app_cfg.pdsch_enc && bbdev_app_cfg.pdsch_enc->nof_hwacc > 0) {
+      bbdev_config.nof_ldpc_enc_lcores = nof_hwacc_dus * bbdev_app_cfg.pdsch_enc->nof_hwacc;
+    }
+    if (bbdev_app_cfg.pusch_dec && bbdev_app_cfg.pusch_dec->nof_hwacc > 0) {
+      bbdev_config.nof_ldpc_dec_lcores = nof_hwacc_dus * bbdev_app_cfg.pusch_dec->nof_hwacc;
+    }
+    // If no msg_mbuf size is defined, a worst-case value will be used.
+    bbdev_config.msg_mbuf_size = bbdev_app_cfg.msg_mbuf_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
+    // If no rm_mbuf size is defined, a worst-case value will be used.
+    bbdev_config.rm_mbuf_size = bbdev_app_cfg.rm_mbuf_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
+    // If no number of mbufs is defined, a worst-case value will be used.
+    bbdev_config.nof_mbuf = bbdev_app_cfg.nof_mbuf.value_or(static_cast<unsigned>(pow2(log2_ceil(MAX_NOF_SEGMENTS))));
+    std::shared_ptr<dpdk::bbdev_acc> bbdev_accelerator = bbdev_acc_factory->create(bbdev_config, hwacc_logger);
+    report_error_if_not(bbdev_accelerator, "Unable to open the {} hardware-accelerator.", bbdev_app_cfg.hwacc_type);
+
+    // Configure the hardware-accelerated PDSCH encoding factory (only if needed).
+    if (bbdev_app_cfg.pdsch_enc && bbdev_app_cfg.pdsch_enc->nof_hwacc > 0) {
+      hwacc_pdsch_enc_cfg.acc_type          = bbdev_app_cfg.hwacc_type;
+      hwacc_pdsch_enc_cfg.bbdev_accelerator = bbdev_accelerator;
+      hwacc_pdsch_enc_cfg.cb_mode           = bbdev_app_cfg.pdsch_enc->cb_mode;
+      // If no maximum buffer size is defined, a worst-case value will be used.
+      hwacc_pdsch_enc_cfg.max_tb_size = bbdev_app_cfg.pdsch_enc->max_buffer_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
+      hwacc_pdsch_enc_cfg.dedicated_queue = bbdev_app_cfg.pdsch_enc->dedicated_queue;
+      hal_config.hwacc_pdsch_processor    = true;
+      hal_config.hwacc_pdsch_enc_cfg      = hwacc_pdsch_enc_cfg;
+    }
+
+    // Configure the hardware-accelerated PUSCH decoding factory (only if needed).
+    if (bbdev_app_cfg.pusch_dec && bbdev_app_cfg.pusch_dec->nof_hwacc > 0) {
+      hwacc_pusch_dec_cfg.acc_type          = bbdev_app_cfg.hwacc_type;
+      hwacc_pusch_dec_cfg.bbdev_accelerator = bbdev_accelerator;
+      hwacc_pusch_dec_cfg.ext_softbuffer    = bbdev_app_cfg.pusch_dec->ext_softbuffer;
+      if (hwacc_pusch_dec_cfg.ext_softbuffer) {
+        // Set up an external HARQ buffer context repository.
+        unsigned nof_cbs            = bbdev_app_cfg.pusch_dec->harq_context_size.value_or(MAX_NOF_SEGMENTS);
+        uint64_t ext_harq_buff_size = bbdev_accelerator->get_harq_buff_size_bytes();
+        harq_buffer_context = hal::create_ext_harq_buffer_context_repository(nof_cbs, ext_harq_buff_size, false);
+        report_error_if_not(harq_buffer_context,
+                            "Unable to create the external HARQ buffer context for the {} hardware-accelerator.",
+                            bbdev_app_cfg.hwacc_type);
+        hwacc_pusch_dec_cfg.harq_buffer_context = harq_buffer_context;
+      }
+      hwacc_pusch_dec_cfg.dedicated_queue = bbdev_app_cfg.pusch_dec->dedicated_queue;
+      hal_config.hwacc_pusch_processor    = true;
+      hal_config.hwacc_pusch_dec_cfg      = hwacc_pusch_dec_cfg;
+    }
+  }
+#endif // DPDK_FOUND
+
+  generate_du_low_wrapper_config(out_cfg, du_low_unit_cfg, du_cells, max_puschs_per_slot, du_id);
+
+  // Fill the hal config.
+  for (auto& cell : out_cfg.du_low_cfg.cells) {
+    cell.upper_phy_cfg.hal_config = hal_config;
+  }
+
+  // Fill the PRACH ports.
+  out_cfg.prach_ports = std::move(prach_ports);
 
   // Fill the workers information.
   for (unsigned i = 0, e = out_cfg.du_low_cfg.cells.size(); i != e; ++i) {

apps/units/flexible_du/du_low/du_low_wrapper_config_helper.h

@@ -24,7 +24,6 @@ struct worker_manager;
 
 void make_du_low_wrapper_config_and_dependencies(srs_du::du_low_wrapper_config&              out_cfg,
                                                  const du_low_unit_config&                   du_low_unit_cfg,
-                                                 const hal_upper_phy_config&                 hal_config,
                                                  std::vector<srs_du::cell_prach_ports_entry> prach_ports,
                                                  span<const srs_du::du_cell_config>          du_cells,
                                                  span<const unsigned>                        max_puschs_per_slot,

apps/units/flexible_du/split_7_2/CMakeLists.txt

@@ -21,7 +21,7 @@ if (DU_SPLIT_7_2)
 
     add_library(srsran_flexible_du STATIC ${SOURCES})
     target_include_directories(srsran_flexible_du PRIVATE ${CMAKE_SOURCE_DIR})
-    set(FLEXIBLE_DU_LIBRARIES
+    target_link_libraries(srsran_flexible_du
             srsran_du_wrapper
             srsran_pcap
             srsran_app_services
@@ -30,13 +30,4 @@ if (DU_SPLIT_7_2)
             srsran_split_7_2_app_unit_helpers
             srsran_du_high_unit_helpers)
 
-    # Hardware acceleration for both PUSCH and PDSCH is enabled by default when using DPDK.
-    if (DPDK_FOUND)
-       set_source_files_properties(split_7_2_du_factory.cpp PROPERTIES COMPILE_DEFINITIONS "DPDK_FOUND; HWACC_PDSCH_ENABLED; HWACC_PUSCH_ENABLED")
-       list(APPEND FLEXIBLE_DU_LIBRARIES hal_hwacc_pusch
-            hal_hwacc_pdsch
-            hal_bbdev_factory)
-    endif (DPDK_FOUND)
-    target_link_libraries(srsran_flexible_du ${FLEXIBLE_DU_LIBRARIES})
-
 endif ()

apps/units/flexible_du/split_7_2/split_7_2_du_factory.cpp

@@ -23,13 +23,6 @@
 #include "srsran/du/du_wrapper_factory.h"
 #include "srsran/pcap/rlc_pcap.h"
 #include "srsran/ru/ru_dummy_factory.h"
-#ifdef DPDK_FOUND
-#include "srsran/hal/dpdk/bbdev/bbdev_acc.h"
-#include "srsran/hal/dpdk/bbdev/bbdev_acc_factory.h"
-#include "srsran/hal/phy/upper/channel_processors/hw_accelerator_factories.h"
-#include "srsran/hal/phy/upper/channel_processors/pusch/ext_harq_buffer_context_repository_factory.h"
-#include "srsran/hal/phy/upper/channel_processors/pusch/hw_accelerator_factories.h"
-#endif // DPDK_FOUND
 
 using namespace srsran;
 
@@ -108,81 +101,6 @@ du_unit srsran::create_split_7_2_du(const split_7_2_du_unit_config& du_72_cfg, c
     max_pusch_per_slot.push_back(high.cell.pusch_cfg.max_puschs_per_slot);
   }
 
-  // Initialize hardware-accelerator (only if needed).
-  hal_upper_phy_config hal_config  = {};
-  hal_config.hwacc_pdsch_processor = false;
-  hal_config.hwacc_pusch_processor = false;
-#ifdef DPDK_FOUND
-  hal::bbdev_hwacc_pdsch_enc_factory_configuration         hwacc_pdsch_enc_cfg = {};
-  hal::bbdev_hwacc_pusch_dec_factory_configuration         hwacc_pusch_dec_cfg = {};
-  std::shared_ptr<hal::ext_harq_buffer_context_repository> harq_buffer_context = nullptr;
-  unsigned                                                 nof_hwacc_dus       = du_cells.size();
-  if (!du_lo.hal_config->bbdev_hwacc->hwacc_type.empty()) {
-    srslog::basic_logger& hwacc_logger = srslog::fetch_basic_logger("HWACC", false);
-    hwacc_logger.set_level(du_lo.loggers.hal_level);
-
-    // Create a bbdev accelerator factory.
-    std::unique_ptr<dpdk::bbdev_acc_factory> bbdev_acc_factory =
-        srsran::dpdk::create_bbdev_acc_factory(du_lo.hal_config->bbdev_hwacc->bbdev_acc_type);
-    report_error_if_not(bbdev_acc_factory,
-                        "Unable to create the {} bbdev hardware-accelerator interface factory.",
-                        du_lo.hal_config->bbdev_hwacc->bbdev_acc_type);
-
-    // Intefacing to the bbdev-based hardware-accelerator.
-    dpdk::bbdev_acc_configuration bbdev_config;
-    bbdev_config.id = du_lo.hal_config->bbdev_hwacc->id;
-    if (du_lo.hal_config->bbdev_hwacc->pdsch_enc->nof_hwacc > 0) {
-      bbdev_config.nof_ldpc_enc_lcores = nof_hwacc_dus * du_lo.hal_config->bbdev_hwacc->pdsch_enc->nof_hwacc;
-    }
-    if (du_lo.hal_config->bbdev_hwacc->pusch_dec->nof_hwacc > 0) {
-      bbdev_config.nof_ldpc_dec_lcores = nof_hwacc_dus * du_lo.hal_config->bbdev_hwacc->pusch_dec->nof_hwacc;
-    }
-    // If no msg_mbuf size is defined, a worst-case value will be used.
-    bbdev_config.msg_mbuf_size = du_lo.hal_config->bbdev_hwacc->msg_mbuf_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
-    // If no rm_mbuf size is defined, a worst-case value will be used.
-    bbdev_config.rm_mbuf_size = du_lo.hal_config->bbdev_hwacc->rm_mbuf_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
-    // If no number of mbufs is defined, a worst-case value will be used.
-    bbdev_config.nof_mbuf =
-        du_lo.hal_config->bbdev_hwacc->nof_mbuf.value_or(static_cast<unsigned>(pow2(log2_ceil(MAX_NOF_SEGMENTS))));
-    std::shared_ptr<dpdk::bbdev_acc> bbdev_accelerator = bbdev_acc_factory->create(bbdev_config, hwacc_logger);
-    report_error_if_not(
-        bbdev_accelerator, "Unable to open the {} hardware-accelerator.", du_lo.hal_config->bbdev_hwacc->hwacc_type);
-
-    // Configure the hardware-accelerated PDSCH encoding factory (only if needed).
-    if (du_lo.hal_config->bbdev_hwacc->pdsch_enc->nof_hwacc > 0) {
-      hwacc_pdsch_enc_cfg.acc_type          = du_lo.hal_config->bbdev_hwacc->hwacc_type;
-      hwacc_pdsch_enc_cfg.bbdev_accelerator = bbdev_accelerator;
-      hwacc_pdsch_enc_cfg.cb_mode           = du_lo.hal_config->bbdev_hwacc->pdsch_enc->cb_mode;
-      // If no maximum buffer size is defined, a worst-case value will be used.
-      hwacc_pdsch_enc_cfg.max_tb_size =
-          du_lo.hal_config->bbdev_hwacc->pdsch_enc->max_buffer_size.value_or(RTE_BBDEV_LDPC_E_MAX_MBUF);
-      hwacc_pdsch_enc_cfg.dedicated_queue = du_lo.hal_config->bbdev_hwacc->pdsch_enc->dedicated_queue;
-      hal_config.hwacc_pdsch_processor    = true;
-      hal_config.hwacc_pdsch_enc_cfg      = hwacc_pdsch_enc_cfg;
-    }
-
-    // Configure the hardware-accelerated PUSCH decoding factory (only if needed).
-    if (du_lo.hal_config->bbdev_hwacc->pusch_dec->nof_hwacc > 0) {
-      hwacc_pusch_dec_cfg.acc_type          = du_lo.hal_config->bbdev_hwacc->hwacc_type;
-      hwacc_pusch_dec_cfg.bbdev_accelerator = bbdev_accelerator;
-      hwacc_pusch_dec_cfg.ext_softbuffer    = du_lo.hal_config->bbdev_hwacc->pusch_dec->ext_softbuffer;
-      if (hwacc_pusch_dec_cfg.ext_softbuffer) {
-        // Set up an external HARQ buffer context repository.
-        unsigned nof_cbs = du_lo.hal_config->bbdev_hwacc->pusch_dec->harq_context_size.value_or(MAX_NOF_SEGMENTS);
-        uint64_t ext_harq_buff_size = bbdev_accelerator->get_harq_buff_size_bytes();
-        harq_buffer_context = hal::create_ext_harq_buffer_context_repository(nof_cbs, ext_harq_buff_size, false);
-        report_error_if_not(harq_buffer_context,
-                            "Unable to create the external HARQ buffer context for the {} hardware-accelerator.",
-                            du_lo.hal_config->bbdev_hwacc->hwacc_type);
-        hwacc_pusch_dec_cfg.harq_buffer_context = harq_buffer_context;
-      }
-      hwacc_pusch_dec_cfg.dedicated_queue = du_lo.hal_config->bbdev_hwacc->pusch_dec->dedicated_queue;
-      hal_config.hwacc_pusch_processor    = true;
-      hal_config.hwacc_pusch_dec_cfg      = hwacc_pusch_dec_cfg;
-    }
-  }
-#endif // DPDK_FOUND
-
   for (unsigned i = 0, e = du_cells.size(); i != e; ++i) {
     // Create one DU per cell.
     srs_du::du_wrapper_config du_cfg  = {};
@@ -192,7 +110,6 @@ du_unit srsran::create_split_7_2_du(const split_7_2_du_unit_config& du_72_cfg, c
 
     make_du_low_wrapper_config_and_dependencies(du_cfg.du_low_cfg,
                                                 du_lo,
-                                                hal_config,
                                                 {prach_ports[i]},
                                                 span<const srs_du::du_cell_config>(&du_cells[i], 1),
                                                 span<const unsigned>(&max_pusch_per_slot[i], 1),

apps/units/flexible_du/split_8/CMakeLists.txt

@@ -21,7 +21,7 @@ if (DU_SPLIT_8)
 
     add_library(srsran_flexible_du STATIC ${SOURCES})
     target_include_directories(srsran_flexible_du PRIVATE ${CMAKE_SOURCE_DIR})
-    set(FLEXIBLE_DU_LIBRARIES
+    target_link_libraries(srsran_flexible_du
             srsran_du_wrapper
             srsran_pcap
             srsran_app_services
@@ -30,13 +30,4 @@ if (DU_SPLIT_8)
             srsran_split_8_app_unit_helpers
             srsran_du_high_unit_helpers)
 
-    # Hardware acceleration for both PUSCH and PDSCH is enabled by default when using DPDK.
-    if (DPDK_FOUND)
-       set_source_files_properties(split_8_du_factory.cpp PROPERTIES COMPILE_DEFINITIONS "DPDK_FOUND; HWACC_PDSCH_ENABLED; HWACC_PUSCH_ENABLED")
-       list(APPEND FLEXIBLE_DU_LIBRARIES hal_hwacc_pusch
-            hal_hwacc_pdsch
-            hal_bbdev_factory)
-    endif (DPDK_FOUND)
-    target_link_libraries(srsran_flexible_du ${FLEXIBLE_DU_LIBRARIES})
-
 endif ()