More NR PHY test enhacements

test/phy/CMakeLists.txt

@@ -22,6 +22,23 @@ if (RF_FOUND AND ENABLE_SRSUE AND ENABLE_SRSENB)
             ${ATOMIC_LIBS})
 
     add_nr_test(nr_phy_test_10MHz_dl_only nr_phy_test --duration=100 --gnb.stack.pdsch.slots=\"0,1,2,3,4,5\" --gnb.stack.pusch.slots=\"\")
-    add_nr_test(nr_phy_test_10MHz_ul_only nr_phy_test --duration=100 --gnb.stack.pdsch.slots=\"\" --gnb.stack.pusch.slots=\"6,7,8,9\")
-    add_nr_test(nr_phy_test_10MHz_bidir nr_phy_test --duration=100 --gnb.stack.pdsch.slots=\"0,1,2,3,4,5\" --gnb.stack.pusch.slots=\"6,7,8,9\")
+    add_nr_test(nr_phy_test_10MHz_ul_only nr_phy_test
+            --duration=100 # 100 slots
+            --gnb.stack.pdsch.slots=6 # No PDSCH
+            --gnb.stack.pusch.slots=6,7,8,9 # All possible UL slots
+            --gnb.stack.pusch.start=0 # Start at RB 0
+            --gnb.stack.pusch.length=52 # Full 10 MHz BW
+            --gnb.stack.pusch.mcs=28 # Maximum MCS
+            )
+    add_nr_test(nr_phy_test_10MHz_bidir nr_phy_test
+            --duration=100 # 100 slots
+            --gnb.stack.pdsch.slots=0,1,2,3,4,5 # All possible DL slots
+            --gnb.stack.pdsch.start=0 # Start at RB 0
+            --gnb.stack.pdsch.length=52 # Full 10 MHz BW
+            --gnb.stack.pdsch.mcs=28 # Maximum MCS
+            --gnb.stack.pusch.slots=6,7,8,9 # All possible UL slots
+            --gnb.stack.pusch.start=0 # Start at RB 0
+            --gnb.stack.pusch.length=52 # Full 10 MHz BW
+            --gnb.stack.pusch.mcs=28 # Maximum MCS
+            )
 endif ()

test/phy/nr_phy_test.cc

@@ -38,6 +38,7 @@ test_bench::args_t::args_t(int argc, char** argv)
   options.add_options()
         ("rnti",          bpo::value<uint16_t>(&rnti)->default_value(rnti),                              "UE RNTI")
         ("duration",      bpo::value<uint64_t>(&durations_slots)->default_value(durations_slots),        "Test duration in slots")
+        ("lib.log.level", bpo::value<std::string>(&phy_lib_log_level)->default_value(phy_lib_log_level), "PHY librray log level")
         ;
 
   options_gnb_stack.add_options()
@@ -46,12 +47,13 @@ test_bench::args_t::args_t(int argc, char** argv)
         ("gnb.stack.pdsch.start",             bpo::value<uint32_t>(&gnb_stack.pdsch.rb_start)->default_value(0),                                          "PDSCH scheduling frequency allocation start")
         ("gnb.stack.pdsch.length",            bpo::value<uint32_t>(&gnb_stack.pdsch.rb_length)->default_value(gnb_stack.pdsch.rb_length),                 "PDSCH scheduling frequency allocation length")
         ("gnb.stack.pdsch.slots",             bpo::value<std::string>(&gnb_stack.pdsch.slots)->default_value(gnb_stack.pdsch.slots),                      "Slots enabled for PDSCH")
-        ("gnb.stack.pdsch.mcs",               bpo::value<uint32_t>(&gnb_stack.pdsch.mcs)->default_value(gnb_stack.pdsch.mcs),                                         "PDSCH/PUSCH scheduling modulation code scheme")
+        ("gnb.stack.pdsch.mcs",               bpo::value<uint32_t>(&gnb_stack.pdsch.mcs)->default_value(gnb_stack.pdsch.mcs),                             "PDSCH scheduling modulation code scheme")
         ("gnb.stack.pusch.candidate",         bpo::value<uint32_t>(&gnb_stack.pdcch_ul_candidate)->default_value(gnb_stack.pdcch_ul_candidate),           "PDCCH candidate index for PUSCH")
         ("gnb.stack.pusch.start",             bpo::value<uint32_t>(&gnb_stack.pusch.rb_start)->default_value(0),                                          "PUSCH scheduling frequency allocation start")
         ("gnb.stack.pusch.length",            bpo::value<uint32_t>(&gnb_stack.pusch.rb_length)->default_value(gnb_stack.pusch.rb_length),                 "PUSCH scheduling frequency allocation length")
         ("gnb.stack.pusch.slots",             bpo::value<std::string>(&gnb_stack.pusch.slots)->default_value(gnb_stack.pusch.slots),                      "Slots enabled for PUSCH")
-        ("gnb.stack.log_level",               bpo::value<std::string>(&gnb_stack.log_level)->default_value(gnb_stack.log_level),                          "Stack log level")
+        ("gnb.stack.pusch.mcs",               bpo::value<uint32_t>(&gnb_stack.pusch.mcs)->default_value(gnb_stack.pusch.mcs),                             "PUSCH scheduling modulation code scheme")
+        ("gnb.stack.log.level",               bpo::value<std::string>(&gnb_stack.log_level)->default_value(gnb_stack.log_level),                          "Stack log level")
         ;
 
   options_gnb_phy.add_options()

test/phy/test_bench.h

@@ -47,6 +47,7 @@ public:
     srsue::phy_args_nr_t            ue_phy;
     ue_dummy_stack::args_t          ue_stack;
     std::string                     phy_com_log_level = "info";
+    std::string                     phy_lib_log_level = "none";
     uint64_t                        durations_slots   = 100;
 
     args_t(int argc, char** argv);
@@ -82,6 +83,16 @@ public:
       return;
     }
 
+    // Make sure PHY log is not set by UE or gNb PHY
+    handler_registered = 0;
+    if (args.phy_lib_log_level == "info") {
+      srsran_verbose = SRSRAN_VERBOSE_INFO;
+    } else if (args.phy_lib_log_level == "debug") {
+      srsran_verbose = SRSRAN_VERBOSE_DEBUG;
+    } else {
+      srsran_verbose = SRSRAN_VERBOSE_NONE;
+    }
+
     initialised = true;
   }