feat / add the MMSE and precoding

  - avoid the finction duplication
  - add the transform predoding to the nr_rx_pusch_tp
  - add the MMSE for 2 layer which modulation greater than 16 qam
  - can support to 256 qam for 1 layer and 2 layer

CMakeLists.txt

@@ -1040,6 +1040,7 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_freq_equalization.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c

executables/nr-gnb.c

@@ -479,6 +479,7 @@ void init_gNB_Tpool(int inst) {
   // ULSCH decoding threadpool
   initTpool(get_softmodem_params()->threadPoolConfig, &gNB->threadPool, cpumeas(CPUMEAS_GETSTATE));
   // ULSCH decoder result FIFO
+  initNotifiedFIFO(&gNB->respPuschSymb);
   initNotifiedFIFO(&gNB->respDecode);
 
   // L1 RX result FIFO 

openair1/PHY/INIT/nr_init.c

@@ -28,6 +28,7 @@
 #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
+#include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
 #include "openair1/PHY/MODULATION/nr_modulation.h"
 #include "openair1/PHY/defs_RU.h"
 #include "openair1/PHY/CODING/nrLDPC_extern.h"
@@ -525,6 +526,8 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
   init_scrambling_luts();
   init_pucch2_luts();
 
+  nr_init_fde(); // Init array for frequency equalization of transform precoding of PUSCH
+
   load_nrLDPClib(NULL);
 
   if (gNB->ldpc_offload_flag)

openair1/PHY/NR_ESTIMATION/nr_freq_equalization.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/defs_eNB.h"
+#include "PHY/sse_intrin.h"
+#include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
+
+// Reference of openair1/PHY/LTE_ESTIMATION/freq_equalization.c
+
+// This is 4096/(1:4096) in simde__m128i format
+simde__m128i nr_inv_ch[4096];/* = {0, 4096/1, 4096/2, 4096/3, 4096/4...}*/
+
+void nr_init_fde() 
+{
+  for (int i = 1;i < 4096; i++) 
+    nr_inv_ch[i] = simde_mm_set1_epi16(4096/i);
+}
+
+void nr_freq_equalization (NR_DL_FRAME_PARMS *frame_parms,
+                           int32_t *rxdataF_comp,
+                           int32_t *ul_ch_mag,
+                           int32_t *ul_ch_magb,
+                           uint8_t symbol,
+                           uint16_t Msc_RS,
+                           uint8_t Qm) 
+{
+  simde__m128i *rxdataF_comp128 = (simde__m128i *)rxdataF_comp;
+  simde__m128i *ul_ch_mag128    = (simde__m128i *)ul_ch_mag;
+  simde__m128i *ul_ch_magb128   = (simde__m128i *)ul_ch_magb;
+
+  AssertFatal(symbol < frame_parms->symbols_per_slot, "symbol %d >= %d\n",
+              symbol, frame_parms->symbols_per_slot);
+  AssertFatal(Msc_RS <= frame_parms->N_RB_UL*12, "Msc_RS %d >= %d\n",
+              Msc_RS, frame_parms->N_RB_UL*12);
+
+  for (uint16_t re = 0; re < (Msc_RS >> 2); re++) 
+  {
+    int16_t amp = (*((int16_t*)&ul_ch_mag128[re]));
+
+    if (amp > 4095)
+      amp = 4095;
+
+    rxdataF_comp128[re] = simde_mm_srai_epi16(simde_mm_mullo_epi16(rxdataF_comp128[re],nr_inv_ch[amp]),3);
+
+    if (Qm == 4)
+      ul_ch_mag128[re]  = simde_mm_set1_epi16(324);  // this is 512*2/sqrt(10)
+    else if (Qm == 6)
+    {
+      ul_ch_mag128[re]  = simde_mm_set1_epi16(316);  // this is 512*4/sqrt(42)
+      ul_ch_magb128[re] = simde_mm_set1_epi16(158);  // this is 512*2/sqrt(42)
+    }
+    else if(Qm != 2)
+      AssertFatal(1, "nr_freq_equalization(), Qm = %d, should be 2, 4 or 6. symbol=%d, Msc_RS=%d\n", Qm, symbol, Msc_RS);
+  }
+}

openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h

@@ -83,4 +83,15 @@ int nr_srs_channel_estimation(const PHY_VARS_gNB *gNB,
                               int32_t srs_estimated_channel_time_shifted[][1<<srs_pdu->num_ant_ports][gNB->frame_parms.ofdm_symbol_size],
                               int8_t *snr_per_rb,
                               int8_t *snr);
+
+void nr_freq_equalization(NR_DL_FRAME_PARMS *frame_parms,
+                          int *rxdataF_comp,
+                          int *ul_ch_mag,
+                          int *ul_ch_mag_b,
+                          unsigned char symbol,
+                          unsigned short Msc_RS,
+                          unsigned char Qm);
+
+void nr_init_fde(void);
+
 #endif

openair1/PHY/defs_gNB.h

@@ -760,7 +760,7 @@ typedef struct PHY_VARS_gNB_s {
   time_stats_t rx_dft_stats;
   time_stats_t ulsch_freq_offset_estimation_stats;
   */
-  notifiedFIFO_t *respPuschSymb;
+  notifiedFIFO_t respPuschSymb;
   notifiedFIFO_t respDecode;
   notifiedFIFO_t resp_L1;
   notifiedFIFO_t L1_tx_free;
@@ -769,7 +769,6 @@ typedef struct PHY_VARS_gNB_s {
   notifiedFIFO_t resp_RU_tx;
   tpool_t threadPool;
   int nbSymb;
-  int use_pusch_tp;
   int num_pusch_symbols_per_thread;
   pthread_t L1_rx_thread;
   int L1_rx_thread_core;
@@ -792,6 +791,7 @@ typedef struct puschSymbolProc_s {
   int16_t *llr;
   int16_t **llr_layers;
   int16_t *s;
+  uint32_t nvar;
 } puschSymbolProc_t;
 
 struct puschSymbolReqId {

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -398,20 +398,20 @@ static int nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int
 	pusch_pdu->qam_mod_order,
 	pusch_pdu->nrOfLayers);
 
-  if (gNB->use_pusch_tp == 0 ) 
-  { 
-    nr_ulsch_layer_demapping(gNB->pusch_vars[ULSCH_id].llr,
-                             pusch_pdu->nrOfLayers,
-                             pusch_pdu->qam_mod_order,
-                             G,
-                             gNB->pusch_vars[ULSCH_id].llr_layers);
-    //----------------------------------------------------------
-    //------------------- ULSCH unscrambling -------------------
-    //----------------------------------------------------------
-    start_meas(&gNB->ulsch_unscrambling_stats);
-    nr_ulsch_unscrambling(gNB->pusch_vars[ULSCH_id].llr, G, pusch_pdu->data_scrambling_id, pusch_pdu->rnti);
-    stop_meas(&gNB->ulsch_unscrambling_stats);
-  }
+
+
+    // nr_ulsch_layer_demapping(gNB->pusch_vars[ULSCH_id].llr,
+    //                          pusch_pdu->nrOfLayers,
+    //                          pusch_pdu->qam_mod_order,
+    //                          G,
+    //                          gNB->pusch_vars[ULSCH_id].llr_layers);
+    // //----------------------------------------------------------
+    // //------------------- ULSCH unscrambling -------------------
+    // //----------------------------------------------------------
+    // start_meas(&gNB->ulsch_unscrambling_stats);
+    // nr_ulsch_unscrambling(gNB->pusch_vars[ULSCH_id].llr, G, pusch_pdu->data_scrambling_id, pusch_pdu->rnti);
+    // stop_meas(&gNB->ulsch_unscrambling_stats);
+
   
   //----------------------------------------------------------
   //--------------------- ULSCH decoding ---------------------
@@ -902,8 +902,9 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_NR_RX_PUSCH, 1);
       start_meas(&gNB->rx_pusch_stats);
-      if (gNB->use_pusch_tp) nr_rx_pusch_tp(gNB, ULSCH_id, frame_rx, slot_rx, ulsch->harq_pid);
-      else nr_rx_pusch(gNB, ULSCH_id, frame_rx, slot_rx, ulsch->harq_pid);
+      // if (gNB->use_pusch_tp) nr_rx_pusch_tp(gNB, ULSCH_id, frame_rx, slot_rx, ulsch->harq_pid);
+      // else nr_rx_pusch(gNB, ULSCH_id, frame_rx, slot_rx, ulsch->harq_pid);
+      nr_rx_pusch_tp(gNB, ULSCH_id, frame_rx, slot_rx, ulsch->harq_pid);
       NR_gNB_PUSCH *pusch_vars = &gNB->pusch_vars[ULSCH_id];
       pusch_vars->ulsch_power_tot = 0;
       pusch_vars->ulsch_noise_power_tot = 0;

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -222,7 +222,6 @@ int main(int argc, char *argv[])
   int ibwp_rboffset=41;
   int params_from_file = 0;
   int threadCnt=0;
-  int use_tpool = 0;
   int max_ldpc_iterations = 5;
   if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == 0 ) {
     exit_fun("[NR_ULSIM] Error, configuration module init failed\n");
@@ -364,7 +363,6 @@ int main(int argc, char *argv[])
 
     case 'C':
       threadCnt = atoi(optarg);
-      use_tpool = 1;
       break;
 
     case 'u':
@@ -563,14 +561,12 @@ int main(int argc, char *argv[])
   RC.gNB[0] = calloc(1,sizeof(PHY_VARS_gNB));
   gNB = RC.gNB[0];
   gNB->ofdm_offset_divisor = UINT_MAX;
-  initNotifiedFIFO(&gNB->respDecode);
-  gNB->use_pusch_tp = use_tpool;
   gNB->num_pusch_symbols_per_thread = 1;
 
   initFloatingCoresTpool(threadCnt, &gNB->threadPool, false, "gNB-tpool");
   initNotifiedFIFO(&gNB->respDecode);
-  gNB->respPuschSymb = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
-  initNotifiedFIFO(gNB->respPuschSymb);
+
+  initNotifiedFIFO(&gNB->respPuschSymb);
   initNotifiedFIFO(&gNB->L1_tx_free);
   initNotifiedFIFO(&gNB->L1_tx_filled);
   initNotifiedFIFO(&gNB->L1_tx_out);
@@ -1602,20 +1598,16 @@ int main(int argc, char *argv[])
       printDistribution(&gNB->phy_proc_rx,table_rx,"Total PHY proc rx");
       printStatIndent(&gNB->rx_pusch_stats,"RX PUSCH time");
       printStatIndent2(&gNB->ulsch_channel_estimation_stats,"ULSCH channel estimation time");
-      if (use_tpool == 1)
-      {
-        printStatIndent2(&gNB->rx_pusch_init_stats,"RX PUSCH Initialization time");
-        printStatIndent2(&gNB->rx_pusch_symbol_processing_stats,"RX PUSCH Symbol Processing time");
-      }
-      else
-      {
-        printStatIndent2(&gNB->ulsch_ptrs_processing_stats,"ULSCH PTRS Processing time");
-        printStatIndent2(&gNB->ulsch_rbs_extraction_stats,"ULSCH rbs extraction time");
-        printStatIndent2(&gNB->ulsch_channel_compensation_stats,"ULSCH channel compensation time");
-        printStatIndent2(&gNB->ulsch_mrc_stats,"ULSCH mrc computation");
-        printStatIndent2(&gNB->ulsch_llr_stats,"ULSCH llr computation");
-        printStatIndent(&gNB->ulsch_unscrambling_stats,"ULSCH unscrambling");
-      }
+      printStatIndent2(&gNB->rx_pusch_init_stats,"RX PUSCH Initialization time");
+      printStatIndent2(&gNB->rx_pusch_symbol_processing_stats,"RX PUSCH Symbol Processing time");
+
+      // printStatIndent2(&gNB->ulsch_ptrs_processing_stats,"ULSCH PTRS Processing time");
+      // printStatIndent2(&gNB->ulsch_rbs_extraction_stats,"ULSCH rbs extraction time");
+      // printStatIndent2(&gNB->ulsch_channel_compensation_stats,"ULSCH channel compensation time");
+      // printStatIndent2(&gNB->ulsch_mrc_stats,"ULSCH mrc computation");
+      // printStatIndent2(&gNB->ulsch_llr_stats,"ULSCH llr computation");
+      // printStatIndent(&gNB->ulsch_unscrambling_stats,"ULSCH unscrambling");
+
       printStatIndent(&gNB->ulsch_decoding_stats,"ULSCH total decoding time");
       // printStatIndent2(&gNB->ulsch_deinterleaving_stats,"ULSCH deinterleaving");
       // printStatIndent2(&gNB->ulsch_rate_unmatching_stats,"ULSCH rate matching rx");