pusch test: fix compilation whith DPDK

Author: sauka

lib/hal/dpdk/bbdev/CMakeLists.txt

@@ -14,3 +14,5 @@ set(SOURCES
 )
 
 add_library(hal_bbdev STATIC ${SOURCES})
+target_compile_options(hal_bbdev PRIVATE ${DPDK_CFLAGS})
+target_link_libraries(hal_bbdev srslog ${DPDK_LIBRARIES})

tests/unittests/phy/upper/channel_processors/pusch/CMakeLists.txt

@@ -29,10 +29,12 @@ add_test(pusch_processor_unittest pusch_processor_unittest)
 if (USE_PHY_TESTVECTORS)
     add_executable(pusch_decoder_test pusch_decoder_vectortest.cpp)
     set(PUSCH_DECODER_LIBRARIES srsran_channel_processors srslog srsran_upper_phy_support)
-    if (DPDK_FOUND)
-        set_source_files_properties(pusch_decoder_vectortest.cpp PROPERTIES COMPILE_DEFINITIONS "DPDK_FOUND")
+
+    if (ENABLE_PUSCH_HWACC)
+        set_source_files_properties(pusch_decoder_vectortest.cpp PROPERTIES COMPILE_DEFINITIONS "HWACC_PUSCH_ENABLED")
         list(APPEND PUSCH_DECODER_LIBRARIES hal_hwacc_pusch)
-    endif (DPDK_FOUND)
+    endif (ENABLE_PUSCH_HWACC)
+
     target_link_libraries(pusch_decoder_test ${PUSCH_DECODER_LIBRARIES})
     add_test_vector(pusch_decoder_test pusch_decoder_test_data.tar.gz "-e0 -i2")
     add_test(pusch_decoder_early_stop_test pusch_decoder_test -e1 -i6)

tests/unittests/phy/upper/channel_processors/pusch/pusch_decoder_vectortest.cpp

@@ -24,14 +24,14 @@
 #include "srsran/phy/upper/rx_softbuffer_pool.h"
 #include "srsran/phy/upper/unique_rx_softbuffer.h"
 #include "srsran/support/test_utils.h"
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
 #include "srsran/hal/dpdk/bbdev/bbdev_acc.h"
 #include "srsran/hal/dpdk/bbdev/bbdev_acc_factory.h"
 #include "srsran/hal/dpdk/dpdk_eal_factory.h"
 #include "srsran/hal/phy/upper/channel_processors/pusch/ext_harq_buffer_context_repository_factory.h"
 #include "srsran/hal/phy/upper/channel_processors/pusch/hal_factories.h"
 #include "srsran/hal/phy/upper/channel_processors/pusch/hw_accelerator_pusch_dec_factory.h"
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 #include <getopt.h>
 
 /// \cond
@@ -42,30 +42,30 @@ static unsigned nof_ldpc_iterations = 6;
 
 static std::string decoder_type = "generic";
 
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
 static bool        test_harq      = true;
 static bool        ext_softbuffer = true;
 static bool        std_out_sink   = true;
 static std::string hal_log_level  = "error";
 static std::string eal_arguments  = "";
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 
 static void usage(const char* prog)
 {
   fmt::print("Usage: {} [-T X] [-e] [-i X] [-x] [-y] [-z error|warning|info|debug] [-h] [eal_args ...]\n", prog);
   fmt::print("\t-T       PUSCH decoder type [generic,acc100][Default {}]\n", decoder_type);
   fmt::print("\t-e       Use LDPC decoder early stop [Default {}]\n", use_early_stop);
   fmt::print("\t-i       Number of LDPC iterations [Default {}]\n", nof_ldpc_iterations);
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
   fmt::print("\t-x       Use the host's memory for the soft-buffer [Default {}]\n", !ext_softbuffer);
   fmt::print("\t-y       Force logging output written to a file [Default {}]\n", std_out_sink ? "std_out" : "file");
   fmt::print("\t-z       Set logging level for the HAL [Default {}]\n", hal_log_level);
   fmt::print("\teal_args EAL arguments\n");
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
   fmt::print("\t-h       This help\n");
 }
 
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
 // Separates EAL and non-EAL arguments.
 // The function assumes that 'eal_arg' flags the start of the EAL arguments and that no more non-EAL arguments follow.
 static std::string capture_eal_args(int* argc, char*** argv)
@@ -96,7 +96,7 @@ static std::string capture_eal_args(int* argc, char*** argv)
 
   return eal_argv;
 }
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 
 static void parse_args(int argc, char** argv)
 {
@@ -112,7 +112,7 @@ static void parse_args(int argc, char** argv)
       case 'i':
         nof_ldpc_iterations = strtol(optarg, nullptr, 10);
         break;
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
       case 'x':
         ext_softbuffer = false;
         break;
@@ -122,7 +122,7 @@ static void parse_args(int argc, char** argv)
       case 'z':
         hal_log_level = std::string(optarg);
         break;
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
       case 'h':
       default:
         usage(argv[0]);
@@ -156,7 +156,7 @@ static std::shared_ptr<pusch_decoder_factory> create_generic_pusch_decoder_facto
 
 static std::shared_ptr<hal::hw_accelerator_pusch_dec_factory> create_hw_accelerator_pusch_dec_factory()
 {
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
   srslog::sink* log_sink =
       std_out_sink ? srslog::create_stdout_sink() : srslog::create_file_sink("pusch_decoder_vectortest.log");
   srslog::set_default_sink(*log_sink);
@@ -198,9 +198,9 @@ static std::shared_ptr<hal::hw_accelerator_pusch_dec_factory> create_hw_accelera
 
   // ACC100 hardware-accelerator implementation.
   return create_hw_accelerator_pusch_dec_factory(hw_decoder_config);
-#else  // DPDK_FOUND
+#else  // HWACC_PUSCH_ENABLED
   return nullptr;
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 }
 
 static std::shared_ptr<pusch_decoder_factory> create_acc100_pusch_decoder_factory()
@@ -245,10 +245,10 @@ static std::shared_ptr<pusch_decoder_factory> create_pusch_decoder_factory()
 
 int main(int argc, char** argv)
 {
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
   // Separate EAL and non-EAL arguments.
   eal_arguments = capture_eal_args(&argc, &argv);
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 
   // Parse generic arguments.
   parse_args(argc, argv);
@@ -287,11 +287,11 @@ int main(int argc, char** argv)
     pool_config.max_nof_codeblocks   = nof_codeblocks;
     pool_config.expire_timeout_slots = 10;
     pool_config.external_soft_bits   = false;
-#ifdef DPDK_FOUND
+#ifdef HWACC_PUSCH_ENABLED
     if (decoder_type == "acc100") {
       pool_config.external_soft_bits = ext_softbuffer;
     }
-#endif // DPDK_FOUND
+#endif // HWACC_PUSCH_ENABLED
 
     // Create Rx softbuffer pool.
     std::unique_ptr<rx_softbuffer_pool> pool = create_rx_softbuffer_pool(pool_config);