Merge remote-tracking branch 'origin/issue-929' into integration_2025_w16 (!3330)

NR UE: consider the ratio of PUSCH EPRE to DMRS EPRE when calculating PUSCH
DMRS power scaling

When calculating DMRS scaling ratio, we should consider PUSCH EPRE to DMRS
EPRE according to TS 38.214 Table 6.2.2-1.

Close #929

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -19,6 +19,7 @@
  *      contact@openairinterface.org
  */
 
+#include "nr_common.h"
 #include <string.h>
 
 #include "nr_ul_estimation.h"
@@ -480,6 +481,9 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
                                          pusch_pdu->scid,
                                          Ns,
                                          symbol);
+    pusch_dmrs_type_t dmrs_type = pusch_pdu->dmrs_config_type == NFAPI_NR_DMRS_TYPE1 ? pusch_dmrs_type1 : pusch_dmrs_type2;
+    float beta_dmrs_pusch = get_beta_dmrs_pusch(pusch_pdu->num_dmrs_cdm_grps_no_data, dmrs_type);
+    int16_t dmrs_scaling = (1 / beta_dmrs_pusch) * (1 << 14);
     nr_pusch_dmrs_rx(gNB,
                      Ns,
                      gold,
@@ -488,7 +492,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
                      0,
                      nb_rb_pusch,
                      (pusch_pdu->bwp_start + pusch_pdu->rb_start) * NR_NB_SC_PER_RB,
-                     pusch_pdu->dmrs_config_type);
+                     pusch_pdu->dmrs_config_type,
+                     dmrs_scaling);
   } else { // if transform precoding or SC-FDMA is enabled in Uplink
     // NR_SC_FDMA supports type1 DMRS so only 6 DMRS REs per RB possible
     const int index = get_index_for_dmrs_lowpapr_seq(nb_rb_pusch * (NR_NB_SC_PER_RB / 2));

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -34,6 +34,7 @@
 //#define NR_PBCH_DMRS_LENGTH 144
 //#define DEBUG_PUSCH
 
+#include "PHY/TOOLS/tools_defs.h"
 #include "refsig_defs_ue.h"
 #include "PHY/defs_nr_UE.h"
 #include "nr_refsig.h"
@@ -73,7 +74,8 @@ int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
                      unsigned char lp,
                      unsigned short nb_pusch_rb,
                      uint32_t re_offset,
-                     uint8_t dmrs_type)
+                     uint8_t dmrs_type,
+                     int16_t dmrs_scaling)
 {
   typedef int array_of_w[2];
   const array_of_w *wf = (dmrs_type == pusch_dmrs_type1) ? wf1 : wf2;
@@ -91,6 +93,7 @@ int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
           int i = k + dmrs_offset;
           int w = (wf[p - 1000][i & 1]) * (wt[p - 1000][lp]);
           output[k] = get_modulated(nr_gold_pusch, i, w == 1);
+          output[k] = c16mulRealShift(output[k], dmrs_scaling, 14);
 #ifdef DEBUG_PUSCH
           printf("nr_pusch_dmrs_rx dmrs config type %d port %d nb_pusch_rb %d\n", dmrs_type, p, nb_pusch_rb);
           printf("wf[%d] = %d wt[%d]= %d\n", i&1, wf[p-1000][i&1], lp, wt[p-1000][lp]);

openair1/PHY/NR_REFSIG/nr_refsig.h

@@ -36,7 +36,8 @@ int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
                      unsigned char lp,
                      unsigned short nb_pusch_rb,
                      uint32_t re_offset,
-                     uint8_t dmrs_type);
+                     uint8_t dmrs_type,
+                     int16_t dmrs_scaling);
 
 void nr_generate_csi_rs(const NR_DL_FRAME_PARMS *frame_parms,
                         int32_t **dataF,

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -392,13 +392,15 @@ static void dmrs_amp_mult(const uint32_t dmrs_port,
                           const c16_t *mod_dmrs,
                           c16_t *mod_dmrs_out,
                           const uint32_t n_dmrs,
-                          const pusch_dmrs_type_t dmrs_type)
+                          const pusch_dmrs_type_t dmrs_type,
+                          const unsigned int num_cdm_groups_no_data)
 {
+  float beta_dmrs_pusch = get_beta_dmrs_pusch(num_cdm_groups_no_data, dmrs_type);
   /* short array that hold amplitude for k_prime = 0 and k_prime = 1 */
   int32_t alpha_dmrs[2] __attribute((aligned(16)));
   for (int_fast8_t i = 0; i < sizeofArray(alpha_dmrs); i++) {
     const int32_t a = Wf[i] * Wt * AMP;
-    alpha_dmrs[i] = a;
+    alpha_dmrs[i] = a * beta_dmrs_pusch;
   }
 
   /* multiply amplitude with complex DMRS vector */
@@ -440,9 +442,9 @@ static void map_symbols(const nr_phy_pxsch_params_t p,
       c16_t mod_dmrs[ALNARS_16_4(n_dmrs)] __attribute((aligned(16)));
       if (p.transform_precoding == transformPrecoder_disabled) {
         nr_modulation(gold, n_dmrs * 2, DMRS_MOD_ORDER, (int16_t *)mod_dmrs);
-        dmrs_amp_mult(p.dmrs_port, p.Wt, p.Wf, mod_dmrs, mod_dmrs_amp, n_dmrs, p.dmrs_type);
+        dmrs_amp_mult(p.dmrs_port, p.Wt, p.Wf, mod_dmrs, mod_dmrs_amp, n_dmrs, p.dmrs_type, p.num_cdm_no_data);
       } else {
-        dmrs_amp_mult(p.dmrs_port, p.Wt, p.Wf, dmrs_seq, mod_dmrs_amp, n_dmrs, p.dmrs_type);
+        dmrs_amp_mult(p.dmrs_port, p.Wt, p.Wf, dmrs_seq, mod_dmrs_amp, n_dmrs, p.dmrs_type, p.num_cdm_no_data);
       }
     } else if ((p.pdu_bit_map & PUSCH_PDU_BITMAP_PUSCH_PTRS) && ptrs_symbol) {
       AssertFatal(p.transform_precoding == transformPrecoder_disabled, "PTRS NOT SUPPORTED IF TRANSFORM PRECODING IS ENABLED\n");

openair1/PHY/impl_defs_nr.h

@@ -344,12 +344,6 @@ typedef enum {
 * DESCRIPTION      :  configuration for PUSCH
 *
 ************************************************************************/
-
-typedef enum {
-  pusch_dmrs_type1 = 0,
-  pusch_dmrs_type2 = 1
-} pusch_dmrs_type_t;
-
 typedef enum {
   txConfig_codebook = 1,
   txConfig_nonCodebook = 2