Merge remote-tracking branch 'origin/NR_2port_CSIRS' into CSI-SA

Conflicts: ci-scripts/xml_files/fr1_sa_quectel.xml executables/nr-gnb.c openair1/SCHED_NR/phy_procedures_nr_gNB.c openair1/SIMULATION/NR_PHY/dlsim.c openair2/GNB_APP/gnb_paramdef.h openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c openair2/LAYER2/NR_MAC_gNB/mac_proto.h openair2/LAYER2/NR_MAC_gNB/main.c openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-12-01 14:51:10 +01:00
parent a0f6545733 fa2ce6e680
commit 6fb731ea5d
281 changed files with 22529 additions and 16682 deletions
@@ -19,10 +19,10 @@
 *      contact@openairinterface.org
 */

-#include<stdio.h>
-#include<string.h>
-#include<gpib/ib.h>
-#include"gpib_send.h"
+#include <stdio.h>
+#include <string.h>
+#include <gpib/ib.h>
+#include "gpib_send.h"
 void gpib_send(unsigned int gpib_board, unsigned int gpib_device, char *command_string )
 {
  unsigned short addlist[2] = {gpib_device, NOADDR};
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include "common/ran_context.h"
 #include "common/config/config_userapi.h"
+#include "common/utils/nr/nr_common.h"
 #include "common/utils/LOG/log.h"
 #include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "LAYER2/NR_MAC_UE/mac_defs.h"
@@ -267,11 +268,6 @@ void nr_dlsim_preprocessor(module_id_t module_id,

  NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;

-  ps->nrOfLayers = 0;
-
-  int dci_format = sched_ctrl->search_space && sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats ?
-      NR_DL_DCI_FORMAT_1_1 : NR_DL_DCI_FORMAT_1_0;
-
  nr_set_pdsch_semi_static(scc,
                           UE_info->CellGroup[0],
                           sched_ctrl->active_bwp,
@@ -288,7 +284,6 @@ void nr_dlsim_preprocessor(module_id_t module_id,
  /* the following might override the table that is mandated by RRC
   * configuration */
  ps->mcsTableIdx = g_mcsTableIdx;
-  ps->nrOfLayers = g_nrOfLayers;

  sched_pdsch->Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
  sched_pdsch->R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
@@ -431,7 +426,9 @@ int main(int argc, char **argv)

  FILE *scg_fd=NULL;
  
-  while ((c = getopt (argc, argv, "f:hA:pf:g:in:s:S:t:x:y:z:M:N:F:GR:dPIL:Ea:b:d:e:m:w:T:U:q")) != -1) {
+
+  while ((c = getopt (argc, argv, "f:hA:pf:g:in:s:S:t:x:y:z:M:N:F:GR:dPIL:Ea:b:D:e:m:w:T:U:q")) != -1) {
+
    switch (c) {
    case 'f':
      scg_fd = fopen(optarg,"r");
@@ -597,7 +594,7 @@ int main(int argc, char **argv)
    case 'b':
      g_rbSize = atoi(optarg);
      break;
-    case 'd':
+    case 'D':
      dlsch_threads = atoi(optarg);
      break;    
    case 'e':
@@ -670,7 +667,7 @@ int main(int argc, char **argv)
      printf("-U Change DMRS Config, arguments list DMRS TYPE{0=A,1=B} DMRS AddPos{0:2} DMRS ConfType{1:2}, e.g. -U 3 0 2 1 \n");
      printf("-P Print DLSCH performances\n");
      printf("-w Write txdata to binary file (one frame)\n");
-      printf("-d number of dlsch threads, 0: no dlsch parallelization\n");
+      printf("-D number of dlsch threads, 0: no dlsch parallelization\n");
      exit (-1);
      break;
    }
@@ -687,7 +684,7 @@ int main(int argc, char **argv)

  if (snr1set==0)
    snr1 = snr0+10;
-  init_dlsch_tpool(dlsch_threads);
+


  RC.gNB = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
@@ -987,7 +984,11 @@ int main(int argc, char **argv)
  reset_meas(&msgDataTx->phy_proc_tx);
  gNB->phy_proc_tx_0 = &msgDataTx->phy_proc_tx;
  pushTpool(gNB->threadPool,msgL1Tx);
-
+  if (dlsch_threads ) { 
+    init_dlsch_tpool(dlsch_threads);
+    pthread_t dlsch0_threads;
+    threadCreate(&dlsch0_threads, dlsch_thread, (void *)UE, "DLthread", -1, OAI_PRIORITY_RT_MAX-1);
+  }
  for (SNR = snr0; SNR < snr1; SNR += .2) {

    varArray_t *table_tx=initVarArray(1000,sizeof(double));
@@ -1204,9 +1205,8 @@ int main(int argc, char **argv)
        }

        nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
-        UE_harq_process->Nl = g_nrOfLayers;
        nr_ue_scheduled_response(&scheduled_response);
-        
+
        phy_procedures_nrUE_RX(UE,
                               &UE_proc,
                               0,
@@ -28,6 +28,7 @@
 #include "common/config/config_userapi.h"
 #include "common/utils/LOG/log.h"
 #include "common/ran_context.h" 
+#include "common/utils/nr/nr_common.h"
 #include "PHY/types.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/defs_nr_UE.h"
@@ -47,6 +47,7 @@
 #include "nr_unitary_defs.h"
 #include "OCG_vars.h"
 #include <openair2/LAYER2/MAC/mac_vars.h>
+#include <openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h>
 #include <openair2/RRC/LTE/rrc_vars.h>
 #include <executables/softmodem-common.h>
 #include <openair2/RRC/NR_UE/rrc_defs.h>
@@ -1708,7 +1708,8 @@ void set_channeldesc_name(channel_desc_t *cdesc,char *modelname) {
 int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
  double s;
  int i,k,l,aarx,aatx;
-  struct complexd anew[desc->nb_tx*desc->nb_rx],acorr[desc->nb_tx*desc->nb_rx];
+  struct complexd anew[desc->nb_tx*desc->nb_rx];
+  struct complexd acorr[desc->nb_tx*desc->nb_rx];
  struct complexd phase, alpha, beta;
  start_meas(&desc->random_channel);

@@ -1750,6 +1751,11 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
    */
    //apply correlation matrix
    //compute acorr = R_sqrt[i] * anew
+    bzero(acorr,desc->nb_tx*desc->nb_rx*sizeof(struct complexd));
+    cblas_zaxpy(desc->nb_tx*desc->nb_rx, (void *) desc->R_sqrt[i/3], (void *) anew, 1, (void *) acorr, 1);
+
+    /*
+    FIXME: Function cblas_zgemv has an undefined output (for the same input) after a second call in RHEL8 (acorr = nan)
    alpha.r = 1.0;
    alpha.i = 0.0;
    beta.r = 0.0;
@@ -1757,6 +1763,7 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
    cblas_zgemv(CblasRowMajor, CblasNoTrans, desc->nb_tx*desc->nb_rx, desc->nb_tx*desc->nb_rx,
                (void *) &alpha, (void *) desc->R_sqrt[i/3], desc->nb_rx*desc->nb_tx,
                (void *) anew, 1, (void *) &beta, (void *) acorr, 1);
+    */

    /*
    for (aarx=0;aarx<desc->nb_rx;aarx++) {