phy: review channel equalizer

Author: xavierarteaga

include/srsran/phy/support/re_buffer.h

@@ -278,7 +278,7 @@ class static_re_buffer : public re_buffer_reader<T>, public re_buffer_writer<T>
 /// \ref set_slice method.
 ///
 /// \tparam T Resource element type.
-template <unsigned MaxNofSlices, typename T = cf_t>
+template <typename T, unsigned MaxNofSlices>
 class modular_re_buffer_reader : public re_buffer_reader<T>
 {
 public:
@@ -350,8 +350,9 @@ class modular_re_buffer_reader : public re_buffer_reader<T>
 /// In this implementation, each slice is a view to an external block of contiguous REs that must be loaded with the
 /// \ref set_slice method.
 ///
-/// \tparam T Resource element type.
-template <unsigned MaxNofSlices, typename T = cf_t>
+/// \tparam T            Resource element type.
+/// \tparam MaxNofSlices Maximum number of slices.
+template <typename T, unsigned MaxNofSlices>
 class modular_re_buffer_writer : public re_buffer_writer<T>
 {
 public:

lib/phy/support/resource_grid_mapper_impl.cpp

@@ -272,7 +272,7 @@ void resource_grid_mapper_impl::map(symbol_buffer&                 buffer,
 {
   // Temporary intermediate buffer for storing precoded symbols.
   static_re_buffer<precoding_constants::MAX_NOF_PORTS, NRE * MAX_RB, cbf16_t> precoding_buffer_copy;
-  modular_re_buffer_writer<MAX_PORTS, cbf16_t>                                precoding_buffer_view;
+  modular_re_buffer_writer<cbf16_t, MAX_PORTS>                                precoding_buffer_view;
 
   // The number of layers is equal to the number of ports.
   unsigned nof_layers = precoding.get_nof_layers();

lib/phy/upper/channel_processors/pusch/pusch_demodulator_impl.h

@@ -214,7 +214,7 @@ class pusch_demodulator_impl : public pusch_demodulator
   /// Copy buffer used to transfer channel modulation symbols from the resource grid to the equalizer.
   dynamic_re_buffer<cbf16_t> ch_re_copy;
   /// View buffer used to transfer channel modulation symbols from the resource grid to the equalizer.
-  modular_re_buffer_reader<MAX_PORTS, cbf16_t> ch_re_view;
+  modular_re_buffer_reader<cbf16_t, MAX_PORTS> ch_re_view;
   /// Buffer used to store channel modulation resource elements at the equalizer output.
   std::vector<cf_t> temp_eq_re;
   /// Buffer used to transfer symbol noise variances at the equalizer output.

lib/phy/upper/equalization/channel_equalizer_generic_impl.cpp

@@ -119,14 +119,15 @@ void equalize_zf_single_tx_layer<1>(unsigned /**/,
 }
 
 template <unsigned NOF_PORTS>
-void equalize_zf_single_tx_layer_reduction(unsigned                              nof_ports,
-                                           span<cf_t>                            eq_symbols,
+void equalize_zf_single_tx_layer_reduction(span<cf_t>                            eq_symbols,
                                            span<float>                           eq_noise_vars,
                                            const re_buffer_reader<cbf16_t>&      ch_symbols,
                                            const channel_equalizer::ch_est_list& ch_estimates,
                                            span<const float>                     noise_var,
                                            float                                 tx_scaling)
 {
+  unsigned nof_ports = noise_var.size();
+
   // Function for checking if a noise variance is valid.
   const auto func_valid_noise_var = [](float nvar) {
     return (nvar > 0) && (nvar < std::numeric_limits<float>::infinity());
@@ -146,7 +147,7 @@ void equalize_zf_single_tx_layer_reduction(unsigned
   if (nof_valid_noise_var != nof_ports) {
     // Reduce ports.
     static_vector<float, NOF_PORTS>              reduced_noise_var(nof_valid_noise_var);
-    modular_re_buffer_reader<NOF_PORTS, cbf16_t> reduced_ch_symbols(nof_ports, ch_symbols.get_nof_re());
+    modular_re_buffer_reader<cbf16_t, NOF_PORTS> reduced_ch_symbols(nof_ports, ch_symbols.get_nof_re());
     modular_ch_est_list<NOF_PORTS>               reduced_ch_estimates(nof_ports, ch_symbols.get_nof_re());
     for (unsigned i_port = 0, i_reduced_port = 0; i_port != nof_ports; ++i_port) {
       if (func_valid_noise_var(noise_var[i_port])) {
@@ -231,7 +232,7 @@ void channel_equalizer_generic_impl::equalize(span<cf_t>                       e
     // Single transmit layer and any number of receive ports.
     if (nof_tx_layers == 1) {
       equalize_zf_single_tx_layer_reduction<MAX_PORTS>(
-          nof_rx_ports, eq_symbols, eq_noise_vars, ch_symbols, ch_estimates, noise_var_estimates, tx_scaling);
+          eq_symbols, eq_noise_vars, ch_symbols, ch_estimates, noise_var_estimates, tx_scaling);
       return;
     }