phy: PDSCH processor benchmark includes precoding

Author: xavierarteaga

tests/benchmarks/phy/upper/channel_processors/pdsch_processor_benchmark.cpp

@@ -72,7 +72,6 @@ static std::string                        selected_profile_name       = "default
 static std::string                        ldpc_encoder_type           = "auto";
 static std::string                        pdsch_processor_type        = "generic";
 static benchmark_modes                    benchmark_mode              = benchmark_modes::throughput_total;
-static unsigned                           nof_tx_layers               = 1;
 static dmrs_type                          dmrs                        = dmrs_type::TYPE1;
 static unsigned                           nof_cdm_groups_without_data = 2;
 static bounded_bitset<MAX_NSYMB_PER_SLOT> dmrs_symbol_mask =
@@ -91,12 +90,15 @@ static unsigned                finish_count  = 0;
 
 // Test profile structure, initialized with default profile values.
 struct test_profile {
+  enum class mimo_topology { one_port_one_layer = 0, two_port_two_layer };
+
   std::string                      name         = "default";
   std::string                      description  = "Runs all combinations.";
   subcarrier_spacing               scs          = subcarrier_spacing::kHz15;
   std::vector<unsigned>            rv_set       = {0};
   cyclic_prefix                    cp           = cyclic_prefix::NORMAL;
   unsigned                         start_symbol = 2;
+  mimo_topology                    mimo         = mimo_topology::one_port_one_layer;
   unsigned                         nof_symbols  = get_nsymb_per_slot(cyclic_prefix::NORMAL) - 2;
   std::vector<unsigned>            nof_prb_set  = {25, 52, 106, 270};
   std::vector<sch_mcs_description> mcs_set      = {{modulation_scheme::QPSK, 120.0F},
@@ -120,6 +122,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {25},
      {{modulation_scheme::QPSK, 120.0F}}},
@@ -130,6 +133,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {25},
      {{modulation_scheme::QAM256, 948.0F}}},
@@ -140,6 +144,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {106},
      {{modulation_scheme::QPSK, 120.0F}}},
@@ -150,6 +155,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {106},
      {{modulation_scheme::QAM16, 658.0F}}},
@@ -160,6 +166,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {106},
      {{modulation_scheme::QAM64, 873.0F}}},
@@ -170,6 +177,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {106},
      {{modulation_scheme::QAM256, 948.0F}}},
@@ -180,6 +188,7 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
      12,
      {270},
      {{modulation_scheme::QPSK, 120.0F}}},
@@ -190,6 +199,29 @@ static const std::vector<test_profile> profile_set = {
      {0},
      cyclic_prefix::NORMAL,
      0,
+     test_profile::mimo_topology::one_port_one_layer,
+     12,
+     {270},
+     {{modulation_scheme::QAM256, 948.0F}}},
+
+    {"scs30_100MHz_256qam_max",
+     "Encodes PDSCH with 50 MHz of bandwidth and a 15 kHz SCS, 256-QAM modulation at maximum code rate.",
+     subcarrier_spacing::kHz30,
+     {0},
+     cyclic_prefix::NORMAL,
+     0,
+     test_profile::mimo_topology::one_port_one_layer,
+     12,
+     {270},
+     {{modulation_scheme::QAM256, 948.0F}}},
+
+    {"2port_2layer_scs30_100MHz_256qam",
+     "Encodes PDSCH with 50 MHz of bandwidth and a 15 kHz SCS, 256-QAM modulation at maximum code rate.",
+     subcarrier_spacing::kHz30,
+     {0},
+     cyclic_prefix::NORMAL,
+     0,
+     test_profile::mimo_topology::two_port_two_layer,
      12,
      {270},
      {{modulation_scheme::QAM256, 948.0F}}},
@@ -283,14 +315,25 @@ static std::vector<test_case_type> generate_test_cases(const test_profile& profi
 {
   std::vector<test_case_type> test_case_set;
 
+  // Select precoding configuration.
+  precoding_configuration precoding_config;
+  switch (profile.mimo) {
+    case test_profile::mimo_topology::one_port_one_layer:
+      precoding_config = make_single_port();
+      break;
+    case test_profile::mimo_topology::two_port_two_layer:
+      precoding_config = make_wideband_two_layer_two_ports(0);
+      break;
+  }
+
   for (sch_mcs_description mcs : profile.mcs_set) {
     for (unsigned nof_prb : profile.nof_prb_set) {
       for (unsigned i_rv : profile.rv_set) {
         // Determine the Transport Block Size.
         tbs_calculator_configuration tbs_config = {};
         tbs_config.mcs_descr                    = mcs;
         tbs_config.n_prb                        = nof_prb;
-        tbs_config.nof_layers                   = nof_tx_layers;
+        tbs_config.nof_layers                   = precoding_config.get_nof_layers();
         tbs_config.nof_symb_sh                  = profile.nof_symbols;
         tbs_config.nof_dmrs_prb                 = dmrs.nof_dmrs_per_rb() * dmrs_symbol_mask.count();
         unsigned tbs                            = tbs_calculator_calculate(tbs_config);
@@ -318,7 +361,7 @@ static std::vector<test_case_type> generate_test_cases(const test_profile& profi
                                          {},
                                          0.0,
                                          0.0,
-                                         make_single_port()};
+                                         precoding_config};
         test_case_set.emplace_back(std::tuple<pdsch_processor::pdu_t, unsigned>(config, tbs));
       }
     }
@@ -405,7 +448,7 @@ static std::tuple<std::unique_ptr<pdsch_processor>, std::unique_ptr<pdsch_pdu_va
 // Creates a resource grid.
 static std::unique_ptr<resource_grid> create_resource_grid(unsigned nof_ports, unsigned nof_symbols, unsigned nof_subc)
 {
-  std::shared_ptr<channel_precoder_factory> precoding_factory = create_channel_precoder_factory("generic");
+  std::shared_ptr<channel_precoder_factory> precoding_factory = create_channel_precoder_factory("auto");
   TESTASSERT(precoding_factory != nullptr, "Invalid channel precoder factory.");
   std::shared_ptr<resource_grid_factory> rg_factory = create_resource_grid_factory(precoding_factory);
   TESTASSERT(rg_factory != nullptr, "Invalid resource grid factory.");