From 8d904dbf233f2ba29576a3a8c4ce2104b4dce471 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Tue, 19 Aug 2025 10:17:51 +0200
Subject: [PATCH] use common channel level for PUSCH

---
 .../PHY/NR_TRANSPORT/nr_ulsch_demodulation.c  | 46 +++++--------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
index e8d8efeb28..bd4ee92284 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
@@ -7,6 +7,7 @@
 #include "PHY/NR_REFSIG/ptrs_nr.h"
 #include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
 #include "PHY/defs_nr_common.h"
+#include "PHY/nr_phy_common/inc/nr_phy_common.h"
 #include "common/utils/nr/nr_common.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
 #include "PHY/sse_intrin.h"
@@ -210,31 +211,6 @@ static int get_nb_re_pusch (NR_DL_FRAME_PARMS *frame_parms, nfapi_nr_pusch_pdu_t
   } else return(rel15_ul->rb_size * NR_NB_SC_PER_RB);
 }
 
-// compute average channel_level on each (TX,RX) antenna pair
-static void nr_ulsch_channel_level(int size_est,
-                                   int ul_ch_estimates_ext[][size_est],
-                                   NR_DL_FRAME_PARMS *frame_parms,
-                                   int32_t *avg,
-                                   uint8_t symbol,
-                                   uint32_t len,
-                                   uint8_t nrOfLayers)
-{
-  int16_t x = factor2(len);
-  int16_t y = (len)>>x;
-
-  for (int aatx = 0; aatx < nrOfLayers; aatx++) {
-    for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) {
-
-      simde__m128i *ul_ch128 = (simde__m128i *)&ul_ch_estimates_ext[aatx * frame_parms->nb_antennas_rx + aarx][symbol * len];
-
-      //compute average level
-      avg[aatx * frame_parms->nb_antennas_rx + aarx] = simde_mm_average(ul_ch128, len, x, y);
-      //LOG_D(PHY, "Channel level: %d\n", avg[aatx * frame_parms->nb_antennas_rx + aarx]);
-    }
-  }
-
-}
-
 static void nr_ulsch_channel_compensation(uint32_t buffer_length,
                                           int nb_rx_ant,
                                           c16_t rxFext[][buffer_length],
@@ -1394,8 +1370,6 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
                            rel15_ul,
                            frame_parms);
 
-  int avgs = 0;
-  int avg[frame_parms->nb_antennas_rx*rel15_ul->nrOfLayers];
   uint8_t shift_ch_ext = rel15_ul->nrOfLayers > 1 ? log2_approx(max_ch >> 11) : 0;
 
   //----------------------------------------------------------
@@ -1410,15 +1384,17 @@ int nr_rx_pusch_tp(PHY_VARS_gNB *gNB,
                          rel15_ul->nrOfLayers,
                          rel15_ul->rb_size,
                          shift_ch_ext);
-  
-  nr_ulsch_channel_level(size_est,
-                         ul_ch_estimates_ext,
-                         frame_parms,
-                         avg,
-                         meas_symbol, // index of the start symbol
-                         nb_re_pusch, // number of the re in pusch
-                         rel15_ul->nrOfLayers);
 
+  int avg[frame_parms->nb_antennas_rx*rel15_ul->nrOfLayers];
+  nr_channel_level(meas_symbol,
+                   size_est,
+                   (c16_t (*)[size_est])ul_ch_estimates_ext,
+                   frame_parms->nb_antennas_rx,
+                   rel15_ul->nrOfLayers,
+                   avg,
+                   nb_re_pusch);
+
+  int avgs = 0;
   for (int nl = 0; nl < rel15_ul->nrOfLayers; nl++)
     for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++)
       avgs = cmax(avgs, avg[nl * frame_parms->nb_antennas_rx + aarx]);