du: more UL-MIMO development

sched: review qweak function for UL-MIMO

ran: add end line

sched: select PUSCH tx scheme codebook to non-coeherent

sched: fix compulation

Author: xavierarteaga

include/srsran/ran/pdcch/dci_packing.h

@@ -11,13 +11,16 @@
 #pragma once
 
 #include "srsran/adt/bounded_bitset.h"
+#include "srsran/adt/bounded_integer.h"
 #include "srsran/adt/expected.h"
 #include "srsran/adt/optional.h"
 #include "srsran/adt/static_vector.h"
 #include "srsran/ran/dmrs.h"
 #include "srsran/ran/pdcch/pdcch_constants.h"
 #include "srsran/ran/physical_cell_group.h"
+#include "srsran/ran/pusch/tx_scheme_configuration.h"
 #include "srsran/support/units.h"
+#include <variant>
 
 namespace srsran {
 
@@ -31,14 +34,6 @@ enum class resource_allocation { resource_allocation_type_0, resource_allocation
 /// Dynamic resource allocation indicator for DCI formats 0_1 and 1_1.
 enum class dynamic_resource_allocation { type_0, type_1 };
 
-/// \brief Subset of PMIs addressed by TPMI, where PMIs are those supported by UEs with maximum coherence capabilities.
-/// \remark See TS38.214, Section 6.1.1.1.
-enum class tx_scheme_codebook_subset : unsigned {
-  fully_and_partial_and_non_coherent,
-  partial_and_non_coherent,
-  non_coherent
-};
-
 /// \brief DCI configuration parameters required to perform the DCI size alignment procedure.
 ///
 /// The size alignment procedure, specified in TS38.212 Section 7.3.1.0, reduces the number of different DCI sizes, to
@@ -137,11 +132,16 @@ struct dci_size_config {
   /// Set to \c true if PUSCH frequency hopping is configured, i.e., if the higher layer parameter \e frequencyHopping
   /// (see TS38.331 Section 6.3.2, Information Element \e PUSCH-Config) is configured.
   bool frequency_hopping_configured;
-  /// \brief Non-codebook based transmission flag.
+  /// \brief PUSCH transmission schemes according to TS 38.214 Section 6.1.1.
+  ///
+  /// The transmit scheme is given by the field \e txConfig in TS 38.331 Section 6.3.2, Information Element
+  /// \e PUSCH-Config.
   ///
-  /// Set to \c true if non-codebook based transmission is configured, i.e., if the higher layer parameter \e txConfig
-  /// (see TS38.331 Section 6.3.2, Information Element \e PUSCH-Config) is set for non-codebook transmission.
-  bool tx_config_non_codebook;
+  /// This field is required for DCI Format 0_1.
+  ///
+  /// The maximum rank \ref tx_scheme_codebook::max_rank must be smaller than or equal to the number of \ref
+  /// nof_srs_ports.
+  std::optional<pusch_tx_scheme_configuration> pusch_tx_scheme;
   /// \brief UL transform precoding flag.
   ///
   /// Set to \c true if UL transform precoding is enabled.
@@ -176,8 +176,8 @@ struct dci_size_config {
   /// \brief Number of antenna ports used for PUSCH codebook-based transmission.
   ///
   /// Set according to the higher layer parameter \e nrofSRS-Ports (see TS38.331 Section 6.3.2, Information Element \e
-  /// SRS-Config), as per TS38.214 Section 6.1.1.1, if codebook-based PUSCH transmission is configured, i.e., if \ref
-  /// tx_config_non_codebook is set to \c false. Otherwise, leave it unset. Values: {1, 2, 4}.
+  /// SRS-Config), as per TS38.214 Section 6.1.1.1, if the field \e txConfig is present. Otherwise, leave it
+  /// unset. Values: {1, 2, 4}.
   std::optional<unsigned> nof_srs_ports;
   /// \brief Parameter \f$N_{SRS}\f$ in TS38.212 Section 7.3.1.1.2, indicating the number of SRS resources.
   ///
@@ -195,21 +195,6 @@ struct dci_size_config {
   ///
   /// \remark Required if \ref tx_config_non_codebook is set to \c true, indicating non-codebook transmission.
   std::optional<unsigned> pusch_max_layers;
-  /// \brief Maximum UE transmission rank for codebook based operation.
-  ///
-  /// Specifies the maximum UE transmission rank, determined by the higher layer parameter \e maxRank (see TS38.331
-  /// Section 6.3.2, Information Element \e PUSCH-Config). Values: {1, ..., 4} and it must be smaller or equal than \ref
-  /// nof_srs_ports.
-  ///
-  /// \remark Required for codebook based transmission, i.e., if \ref tx_config_non_codebook is set to \c false.
-  std::optional<unsigned> max_rank;
-  /// \brief Subset of PMIs addressed by TPMI.
-  ///
-  /// Restricts the available PMIs to those supported by the UE, according to its coherence capabilities. Its value is
-  /// indicated by the higher layer parameter \e codebookSubset (see TS38.331 Section 6.3.2, Information Element \e
-  /// PUSCH-Config). It is required for codebook based transmission with more than one antenna port, i.e., if \ref
-  /// tx_config_non_codebook is set to \c false and \ref nof_srs_ports is greater than one. Otherwise, leave it unset.
-  std::optional<tx_scheme_codebook_subset> cb_subset;
   /// \brief UL DM-RS type for DM-RS mapping type A.
   ///
   /// Set according to the higher layer parameter \e dmrs-Type (see TS38.331 Section 6.3.2, Information Element \e
@@ -894,9 +879,9 @@ struct dci_0_1_configuration {
   ///
   /// The content and actual number of bits is defined by TS38.212 Tables 7.3.1.1.2-2/3/4/5, according to whether
   /// transform precoding is enabled or disabled, and the values of the higher layer parameters \e maxRank (see
-  /// dci_size_config::max_rank) and \e codebookSubset (see dci_size_config::cb_subset). It is required for codebook
-  /// based transmission with more than one antenna port, i.e., if \ref dci_size_config::cb_subset is set when computing
-  /// the DCI sizes.
+  /// tx_scheme_codebook::max_rank) and \e codebookSubset (see tx_scheme_codebook::cb_subset). It is required for
+  /// codebook based transmission with more than one antenna port, i.e., if \ref dci_size_config::cb_subset is set when
+  /// computing the DCI sizes.
   unsigned precoding_info_nof_layers;
   /// \brief Antenna ports for PUSCH transmission - 2, 3, 4 or 5 bits.
   ///

include/srsran/ran/pusch/pusch_antenna_ports_mapping.h

@@ -0,0 +1,46 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "srsran/adt/static_vector.h"
+#include "srsran/ran/srs/srs_resource_configuration.h"
+#include "srsran/scheduler/config/dmrs.h"
+
+namespace srsran {
+
+/// \brief Returns the PUSCH antenna ports mapping row index in TS 38.212, table 7.3.1.2.2-6 to 7.3.1.2.2-23.
+/// \param[in] nof_layers         Number of layers.
+/// \param[in] transform_precoder Set to \c true if the transform precoder is used.
+/// \param[in] dmrs_cfg_type      PUSCH DM-RS configuration type.
+/// \param[in] dmrs_max_len       PUSCH DM-RS maximum number of OFDM symbols.
+/// \return The PUSCH antenna ports mapping row index.
+unsigned get_pusch_antenna_port_mapping_row_index(unsigned         nof_layers,
+                                                  bool             transform_precoder,
+                                                  dmrs_config_type dmrs_cfg_type,
+                                                  dmrs_max_length  dmrs_max_len);
+
+/// \brief Returns the PUSCH precoding information mapping row index in TS 38.212, table 7.3.1.1.2-2/3/4/5.
+/// \param[in] nof_layers         Number of layers.
+/// \param[in] max_rank           Maximum number of transmission layers.
+/// \param[in] transform_precoder Set to \c true if the transform precoder is used.
+/// \param[in] dmrs_cfg_type      PUSCH DM-RS configuration type.
+/// \param[in] dmrs_max_len       PUSCH DM-RS maximum number of OFDM symbols.
+/// \param[in] tpmi               PUSCH TPMI.
+/// \return The PUSCH precoding information mapping row index.
+unsigned get_pusch_precoding_info_row_index(unsigned                                      nof_layers,
+                                            unsigned                                      max_rank,
+                                            srs_resource_configuration::one_two_four_enum nof_srs_ports,
+                                            bool                                          transform_precoder,
+                                            dmrs_config_type                              dmrs_cfg_type,
+                                            dmrs_max_length                               dmrs_max_len,
+                                            unsigned                                      tpmi);
+
+} // namespace srsran

include/srsran/ran/pusch/pusch_configuration.h

@@ -14,6 +14,7 @@
 #include "srsran/ran/alpha.h"
 #include "srsran/ran/csi_rs/csi_rs_id.h"
 #include "srsran/ran/pusch/pusch_mcs.h"
+#include "srsran/ran/pusch/tx_scheme_configuration.h"
 #include "srsran/ran/uci/uci_configuration.h"
 
 namespace srsran {
@@ -27,9 +28,6 @@ enum p0_pusch_alphaset_id : uint8_t {
 /// \brief Used to configure the UE specific PUSCH parameters applicable to a particular BWP.
 /// \remark See TS 38.331, PUSCH-Config.
 struct pusch_config {
-  /// Type of transmission schemes for PUSCH.
-  enum class tx_config { codebook, non_codebook, not_set };
-
   struct pusch_power_control {
     struct p0_pusch_alphaset {
       p0_pusch_alphaset_id id;
@@ -132,22 +130,16 @@ struct pusch_config {
   /// \remark See TS 38.214, clause 6.1.3.
   enum class transform_precoder : unsigned { enabled, disabled, not_set };
 
-  /// Subset of PMIs addressed by TPMI, where PMIs are those supported by UEs with maximum coherence capabilities.
-  /// Applicable to DCI format 0_1.
-  /// \remark See TS 38.214, clause 6.1.1.1.
-  enum class codebook_subset : unsigned {
-    fully_and_partial_and_non_coherent,
-    partial_and_non_coherent,
-    non_coherent,
-    not_set
-  };
-
   /// Identifier used to initalite data scrambling (c_init) for PUSCH. If the field is absent, the UE applies the
   /// physical cell ID. See TS 38.211, clause 6.3.1.1.
   std::optional<uint16_t> data_scrambling_id_pusch;
-  /// UE uses codebook based or non-codebook based transmission (see TS 38.214, clause 6.1.1). If the field is
-  /// not set, the UE transmits PUSCH on one antenna port.
-  tx_config tx_cfg{tx_config::not_set};
+  /// \brief PUSCH transmission schemes according to TS 38.214 Section 6.1.1.
+  ///
+  /// The transmit scheme is given by the field \e txConfig in TS 38.331 Section 6.3.2, Information Element
+  /// \e PUSCH-Config.
+  ///
+  /// The UE is not supposed to receive DCI Format 0_1 if this field is not present.
+  std::optional<pusch_tx_scheme_configuration> tx_cfg;
   /// DMRS configuration for PUSCH transmissions using PUSCH (chosen dynamically via
   /// PUSCH-TimeDomainResourceAllocation). Only the fields dmrs-Type, dmrs-AdditionalPosition and maxLength may be set
   /// differently for mapping type A and B. The field dmrs-UplinkForPUSCH-MappingTypeA applies to DCI format 0_1.
@@ -162,11 +154,6 @@ struct pusch_config {
   /// The UE specific selection of transformer precoder for PUSCH. When the field is not set the UE applies the value of
   /// the field msg3-transformPrecoder.
   transform_precoder trans_precoder{transform_precoder::not_set};
-  /// The field is mandatory present if txConfig is set to codebook and absent otherwise.
-  codebook_subset cb_subset{codebook_subset::not_set};
-  /// Subset of PMIs addressed by TRIs from 1 to ULmaxRank. The field maxRank applies to DCI format 0_1.
-  /// The field is mandatory present if txConfig is set to codebook and absent otherwise. Values {1,..,4}.
-  std::optional<uint8_t> max_rank;
 
   /// \c uci-OnPUSCH.
   std::optional<uci_on_pusch> uci_cfg;
@@ -177,8 +164,7 @@ struct pusch_config {
            pusch_mapping_type_a_dmrs == rhs.pusch_mapping_type_a_dmrs &&
            pusch_mapping_type_b_dmrs == rhs.pusch_mapping_type_b_dmrs && pusch_pwr_ctrl == rhs.pusch_pwr_ctrl &&
            res_alloc == rhs.res_alloc && mcs_table == rhs.mcs_table && trans_precoder == rhs.trans_precoder &&
-           cb_subset == rhs.cb_subset && max_rank == rhs.max_rank && uci_cfg == rhs.uci_cfg &&
-           pusch_td_alloc_list == rhs.pusch_td_alloc_list;
+           uci_cfg == rhs.uci_cfg && pusch_td_alloc_list == rhs.pusch_td_alloc_list;
   }
   bool operator!=(const pusch_config& rhs) const { return !(rhs == *this); }
 };

include/srsran/ran/pusch/pusch_tpmi_select.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "tx_scheme_configuration.h"
 #include "srsran/adt/interval.h"
 #include "srsran/adt/optional.h"
 #include "srsran/adt/static_vector.h"
@@ -64,9 +65,12 @@ class pusch_tpmi_select_info
 /// \brief Selects the Transmit Precoding Matrix Indicator (TPMI) for each possible number of layers supported by the
 /// channel topology.
 ///
-/// \param[in] channel        Channel coefficient matrix.
-/// \param[in] noise_variance Linear noise variance.
+/// \param[in] channel         Channel coefficient matrix.
+/// \param[in] noise_variance  Linear noise variance.
+/// \param[in] codebook_subset Transmission scheme codebook subset.
 /// \return The TPMI information given the channel coefficients and noise variance.
-pusch_tpmi_select_info get_tpmi_select_info(const srs_channel_matrix& channel, float noise_variance);
+pusch_tpmi_select_info get_tpmi_select_info(const srs_channel_matrix& channel,
+                                            float                     noise_variance,
+                                            tx_scheme_codebook_subset codebook_subset);
 
 } // namespace srsran

include/srsran/ran/pusch/tx_scheme_configuration.h

@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "srsran/adt/bounded_integer.h"
+#include <variant>
+
+namespace srsran {
+
+/// \brief Subset of PMIs addressed by TPMI, where PMIs are those supported by UEs with maximum coherence capabilities.
+///
+/// The UE maximum coherence capability is given by TS38.331 higher layer capability parameter \e pusch-TransCoherence
+/// in TS38.331 Section 6.3.2, Information Element \e MIMO-ParametersPerBand.
+///
+/// The PUSCH transmission scheme codebook subset is given by the higher layer parameter \e codebookSubset in TS38.331
+/// Section 6.3.2, Information Element \e PUSCH-Config.
+///
+/// See TS38.214, Section 6.1.1.1 for related physical layer procedures.
+enum class tx_scheme_codebook_subset : unsigned {
+  fully_and_partial_and_non_coherent,
+  partial_and_non_coherent,
+  non_coherent
+};
+
+/// \defgroup tx_schemes PUSCH transmission schemes defined in TS 38.214 Section 6.1.1.
+/// @{
+/// \brief Codebook based transmit scheme.
+struct tx_scheme_codebook {
+  /// \brief Maximum number of layers in PUSCH. Values {1,..,4}.
+  ///
+  /// The parameter is given by the field \e maxRank in the TS 38.331 Section 6.3.2, Information Element \e
+  /// PUSCH-Config.
+  bounded_integer<uint8_t, 1, 4> max_rank;
+  /// \brief PUSCH precoding codebook subset.
+  ///
+  /// Restricts the available PMIs to those supported by the UE, according to its coherence capabilities. Its value is
+  /// indicated by the higher layer parameter \e codebookSubset (see TS38.331 Section 6.3.2, Information Element \e
+  /// PUSCH-Config).
+  tx_scheme_codebook_subset codebook_subset;
+
+  bool operator==(const tx_scheme_codebook& rhs) const
+  {
+    return rhs.max_rank == max_rank && codebook_subset == rhs.codebook_subset;
+  }
+};
+/// Non-codebook based transmission scheme.
+struct tx_scheme_non_codebook {
+  // Empty.
+
+  bool operator==(const tx_scheme_non_codebook& rhs) const { return true; }
+};
+/// @}
+
+/// PUSCH transmit scheme configuration.
+using pusch_tx_scheme_configuration = std::variant<tx_scheme_codebook, tx_scheme_non_codebook>;
+
+} // namespace srsran

lib/du/du_high/du_manager/converters/asn1_rrc_config_helpers.cpp

@@ -1999,17 +1999,39 @@ calculate_pusch_config_diff(asn1::rrc_nr::pusch_cfg_s& out, const pusch_config&
     out.data_scrambling_id_pusch_present = true;
     out.data_scrambling_id_pusch         = dest.data_scrambling_id_pusch.value();
   }
-  if (dest.tx_cfg != srsran::pusch_config::tx_config::not_set) {
-    out.tx_cfg_present = true;
-    switch (dest.tx_cfg) {
-      case pusch_config::tx_config::codebook:
-        out.tx_cfg = pusch_cfg_s::tx_cfg_opts::codebook;
-        break;
-      case pusch_config::tx_config::non_codebook:
-        out.tx_cfg = pusch_cfg_s::tx_cfg_opts::non_codebook;
-        break;
-      default:
-        srsran_assertion_failure("Invalid PUSCH Tx cfg={}", dest.tx_cfg);
+
+  // According to TS 38.331 Section 6.3.2 Information Element PUSCH-Config, the fields codebookSubset and maxRank must
+  // be present if the field txConfig is set to codebook.
+  if (dest.tx_cfg.has_value()) {
+    if (std::holds_alternative<tx_scheme_codebook>(dest.tx_cfg.value())) {
+      // Extract codebook transmit scheme parameters.
+      const auto& tx_cfg = std::get<tx_scheme_codebook>(dest.tx_cfg.value());
+
+      // Set the transmission scheme.
+      out.tx_cfg_present = true;
+      out.tx_cfg         = pusch_cfg_s::tx_cfg_opts::codebook;
+
+      // Set the codebook subset field.
+      out.codebook_subset_present = true;
+      switch (tx_cfg.codebook_subset) {
+        case tx_scheme_codebook_subset::fully_and_partial_and_non_coherent:
+          out.codebook_subset = pusch_cfg_s::codebook_subset_opts::fully_and_partial_and_non_coherent;
+          break;
+        case tx_scheme_codebook_subset::partial_and_non_coherent:
+          out.codebook_subset = pusch_cfg_s::codebook_subset_opts::partial_and_non_coherent;
+          break;
+        case tx_scheme_codebook_subset::non_coherent:
+          out.codebook_subset = pusch_cfg_s::codebook_subset_opts::non_coherent;
+          break;
+      }
+
+      // Set maximum rank field.
+      out.max_rank_present = true;
+      out.max_rank         = tx_cfg.max_rank.to_uint();
+    } else if (std::holds_alternative<tx_scheme_non_codebook>(dest.tx_cfg.value())) {
+      // Set the transmission scheme to non-codebook.
+      out.tx_cfg_present = true;
+      out.tx_cfg         = pusch_cfg_s::tx_cfg_opts::non_codebook;
     }
   }
 
@@ -2103,28 +2125,6 @@ calculate_pusch_config_diff(asn1::rrc_nr::pusch_cfg_s& out, const pusch_config&
     }
   }
 
-  if (dest.cb_subset != srsran::pusch_config::codebook_subset::not_set) {
-    out.codebook_subset_present = true;
-    switch (dest.cb_subset) {
-      case pusch_config::codebook_subset::fully_and_partial_and_non_coherent:
-        out.codebook_subset = pusch_cfg_s::codebook_subset_opts::fully_and_partial_and_non_coherent;
-        break;
-      case pusch_config::codebook_subset::partial_and_non_coherent:
-        out.codebook_subset = pusch_cfg_s::codebook_subset_opts::partial_and_non_coherent;
-        break;
-      case pusch_config::codebook_subset::non_coherent:
-        out.codebook_subset = pusch_cfg_s::codebook_subset_opts::non_coherent;
-        break;
-      default:
-        srsran_assertion_failure("Invalid Codebook subset={}", dest.cb_subset);
-    }
-  }
-
-  if (dest.max_rank.has_value()) {
-    out.max_rank_present = true;
-    out.max_rank         = dest.max_rank.value();
-  }
-
   if ((dest.uci_cfg.has_value() && not src.uci_cfg.has_value()) ||
       (dest.uci_cfg.has_value() && src.uci_cfg.has_value() && dest.uci_cfg.has_value() != src.uci_cfg.has_value())) {
     out.uci_on_pusch_present = true;

lib/ran/CMakeLists.txt

@@ -33,6 +33,7 @@ add_library(srsran_ran
         prach/prach_helper.cpp
         precoding/precoding_codebooks.cpp
         ptrs/ptrs_pattern.cpp
+        pusch/pusch_antenna_port_mapping.cpp
         pusch/pusch_mcs.cpp
         pusch/pusch_tpmi_select.cpp
         pusch/pusch_uci_beta_offset.cpp