From 4bc7df45c67c5e0c7476db28f0493a5122a2ba2b Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Wed, 21 Jul 2021 13:23:14 +0200
Subject: [PATCH] Added R.PDSCH.2-1.1 TDD reference for NZP-CSI-RS testing

---
 srsenb/test/mac/nr/sched_nr_test.cc |  2 +-
 test/phy/CMakeLists.txt             | 14 +++++++++++++-
 test/phy/nr_phy_test.cc             |  5 +++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/srsenb/test/mac/nr/sched_nr_test.cc b/srsenb/test/mac/nr/sched_nr_test.cc
index 885044b1b..0ae8588d4 100644
--- a/srsenb/test/mac/nr/sched_nr_test.cc
+++ b/srsenb/test/mac/nr/sched_nr_test.cc
@@ -192,4 +192,4 @@ int main()
 
   srsenb::sched_nr_cfg_serialized_test();
   srsenb::sched_nr_cfg_parallel_cc_test();
-}
\ No newline at end of file
+}
diff --git a/test/phy/CMakeLists.txt b/test/phy/CMakeLists.txt
index 60814ee3c..14f46bbd9 100644
--- a/test/phy/CMakeLists.txt
+++ b/test/phy/CMakeLists.txt
@@ -24,7 +24,7 @@ if (RF_FOUND AND ENABLE_SRSUE AND ENABLE_SRSENB)
             ${Boost_LIBRARIES}
             ${ATOMIC_LIBS})
 
-    add_nr_test(nr_phy_test_10MHz_dl_only nr_phy_test
+    add_nr_test(nr_phy_test_10MHz_dl_default nr_phy_test
             --duration=100
             --gnb.stack.pdsch.slots=\"0,1,2,3,4,5\"
             --gnb.stack.pdsch.start=0 # Start at RB 0
@@ -35,6 +35,18 @@ if (RF_FOUND AND ENABLE_SRSUE AND ENABLE_SRSENB)
             --ue.phy.nof_threads=${NR_PHY_TEST_UE_NOF_THREADS}
             )
 
+    add_nr_test(nr_phy_test_10MHz_R.PDSCH.2-1.1_TDD nr_phy_test
+            "--reference=pdsch=R.PDSCH.2-1.1 TDD"
+            --duration=100
+            --gnb.stack.pdsch.mcs=27
+            --gnb.stack.pdsch.start=0
+            --gnb.stack.pdsch.length=52
+            --gnb.stack.pdsch.slots=\"0,1,2,3,4,5\"
+            --gnb.stack.pusch.slots=\"\"
+            --gnb.phy.nof_threads=${NR_PHY_TEST_GNB_NOF_THREADS}
+            --ue.phy.nof_threads=${NR_PHY_TEST_UE_NOF_THREADS}
+            )
+
     add_nr_test(nr_phy_test_10MHz_ul_only nr_phy_test
             --duration=100 # 100 slots
             --gnb.stack.pdsch.slots=none
diff --git a/test/phy/nr_phy_test.cc b/test/phy/nr_phy_test.cc
index ccfed9a3d..603f0f0b8 100644
--- a/test/phy/nr_phy_test.cc
+++ b/test/phy/nr_phy_test.cc
@@ -23,6 +23,7 @@ namespace bpo = boost::program_options;
 
 test_bench::args_t::args_t(int argc, char** argv)
 {
+  std::string              reference_cfg_str = "";
   bpo::options_description options("Test bench options");
   bpo::options_description options_gnb_stack("gNb stack and scheduling related options");
   bpo::options_description options_gnb_phy("gNb PHY related options");
@@ -39,6 +40,7 @@ test_bench::args_t::args_t(int argc, char** argv)
         ("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")
+        ("reference", bpo::value<std::string>(&reference_cfg_str)->default_value(reference_cfg_str), "Reference PHY configuration arguments")
         ;
 
   options_gnb_stack.add_options()
@@ -100,8 +102,7 @@ test_bench::args_t::args_t(int argc, char** argv)
   }
 
   // Load default reference configuration
-  srsran::phy_cfg_nr_default_t::reference_cfg_t reference_cfg;
-  phy_cfg = srsran::phy_cfg_nr_default_t(reference_cfg);
+  phy_cfg = srsran::phy_cfg_nr_default_t(srsran::phy_cfg_nr_default_t::reference_cfg_t(reference_cfg_str));
 
   cell_list.resize(1);
   cell_list[0].carrier = phy_cfg.carrier;