tmp

CMakeLists.txt

@@ -2063,6 +2063,21 @@ target_link_libraries(nr_srssim PRIVATE
   m pthread ITTI dl nr_ue_phy_meas physim_common softmodem_common
   )
 
+add_executable(nr_csirssim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/csirssim.c
+  ${NFAPI_USER_DIR}/nfapi.c
+  ${NFAPI_USER_DIR}/gnb_ind_vars.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
+  )
+
+target_link_libraries(nr_csirssim PRIVATE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl nr_ue_phy_meas physim_common
+  softmodem_common
+  )
+target_link_libraries(nr_csirssim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+#target_link_libraries(nr_csirssim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs UTIL physim_common m L2_NR pthread ITTI dl nr_ue_phy_meas softmodem_common)
+
 if(CUDA_ENABLE)
   if (TARGET oai_cuda_lib)
       target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)

cmake_targets/build_oai

@@ -286,7 +286,7 @@ function main() {
             SIMUS_PHY=1
             CMAKE_CMD="$CMAKE_CMD -DENABLE_PHYSIM_TESTS=ON"
             # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim"
+            TARGET_LIST="$TARGET_LIST dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim nr_srssim nr_csirssim"
             echo_info "Will compile dlsim, ulsim, ..."
             shift;;
        -V | --vcd)

openair1/SIMULATION/NR_PHY/csirssim.c

@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+#include "sim_base.h"
+#include "nr_unitary_defs.h"
+
+typedef struct {
+  PhySim base;
+  int codebook_type;
+} CsirsSim;
+
+static void print_usage(void)
+{
+  printf(
+      "CsirsSim options\n"
+      "\t-t <int> Codebook type [default: 1]\n");
+}
+
+#define OPTSTR_LEN 50
+
+static void parse_args(CsirsSim *self, int argc, char **argv)
+{
+  const char opts[] = "t:h";
+  char allopts[BASE_OPTSTR_LEN + OPTSTR_LEN];
+  snprintf(allopts, sizeof(allopts), "%s%s", self->base.optstr, opts);
+
+  optind = 1; // Start from first again after parsing common arguments
+  int c = 0;
+  while ((c = getopt(argc, argv, allopts)) != -1) {
+    switch (c) {
+      case 't':
+        self->codebook_type = atoi(optarg);
+        break;
+
+      case '?':
+      case ':':
+      case 'h':
+        physim_print_usage();
+        print_usage();
+        exit(-1);
+    }
+  }
+}
+
+CsirsSim *csirssim_new()
+{
+  CsirsSim *s = malloc(sizeof(*s));
+  return s;
+}
+
+static int init(CsirsSim *self)
+{
+  physim_init(&self->base);
+
+  return 0;
+}
+
+static void run_slot(CsirsSim *self)
+{
+}
+
+static void print_stats(CsirsSim *self)
+{
+}
+
+static void cleanup(CsirsSim *self)
+{
+  physim_cleanup(&self->base);
+}
+
+int main(int argc, char **argv)
+{
+  CsirsSim *sim = csirssim_new(argc, argv);
+
+  physim_parse_common_args(&sim->base, argc, argv);
+
+  parse_args(sim, argc, argv);
+
+  init(sim);
+
+  run_slot(sim);
+
+  print_stats(sim);
+
+  cleanup(sim);
+  return 0;
+}

openair1/SIMULATION/NR_PHY/sim_base.h

@@ -0,0 +1,182 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <getopt.h>
+
+// gNB MAC
+#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+// UE MAC
+#include "openair2/LAYER2/NR_MAC_UE/mac_defs.h"
+#include "openair2/LAYER2/NR_MAC_UE/mac_proto.h"
+// gNB PHY
+#include "openair1/PHY/defs_gNB.h"
+#include "e1ap_messages_types.h"
+#include "common/config/config_load_configmodule.h"
+// UE PHY
+#include "openair1/PHY/defs_nr_UE.h"
+#include "openair1/PHY/phy_vars_nr_ue.h"
+
+#include "nr_unitary_defs.h"
+
+#define BASE_OPTSTR_LEN 100
+
+// Necessary globals
+RAN_CONTEXT_t RC;
+configmodule_interface_t *uniqCfg;
+char *uecap_file;
+THREAD_STRUCT thread_struct;
+int64_t uplink_frequency_offset[MAX_NUM_CCs][4];
+uint64_t downlink_frequency[MAX_NUM_CCs][4];
+
+void e1_bearer_context_setup(const e1ap_bearer_setup_req_t *req)
+{
+  abort();
+}
+void e1_bearer_context_modif(const e1ap_bearer_mod_req_t *req)
+{
+  abort();
+}
+void e1_bearer_release_cmd(const e1ap_bearer_release_cmd_t *cmd)
+{
+  abort();
+}
+
+typedef struct PhySim PhySim;
+
+struct PhySim {
+  RAN_CONTEXT_t *rc;
+  gNB_MAC_INST *gnb_mac;
+  NR_UE_MAC_INST_t *ue_mac;
+  PHY_VARS_gNB gnb_phy;
+  PHY_VARS_NR_UE ue_phy;
+  int frame;
+  int slot;
+  int num_trials;
+  int mu;
+  int N_RB_BW;
+  int num_rb;
+  float snr_min, snr_max, snr_step;
+  int n_tx, n_rx;
+  NR_ServingCellConfigCommon_t *scc;
+  int loglvl;
+  char optstr[BASE_OPTSTR_LEN];
+  int verbose;
+  long n_bits_total;
+  long n_errors_total;
+};
+
+static void physim_print_usage(void)
+{
+  printf(
+      "Physim base options:\n"
+      "\t-n <int>   Number of trials                       [default: 0]\n"
+      "\t-m <int>   Numerology                             [default: 1]\n"
+      "\t-s <float> Start SNR                              [default: -2.0]\n"
+      "\t-y <int>   Number of transmit antennas            [default: 1]\n"
+      "\t-z <int>   Number of receive antennas             [default: 1]\n"
+      "\t-R <int>   Number of PRBs configured for the cell [default: 106]\n"
+      "\t-S <float> Stop SNR                               [default: 2.0]\n");
+}
+
+static void physim_parse_common_args(PhySim *self, int argc, char **argv)
+{
+  memset(self, 0, sizeof(*self));
+
+  // Defaults
+  self->frame = 0;
+  self->slot = 0;
+  self->num_trials = 1;
+  self->N_RB_BW = 106;
+  self->num_rb = 106;
+  self->snr_min = -2.0;
+  self->snr_max = -1.0;
+  self->snr_step = 1.0;
+  self->mu = 1;
+  self->loglvl = OAILOG_WARNING;
+
+  const char opts[] = "n:m:s:y:z:L:R:S:h";
+  DevAssert(sizeof(opts) < BASE_OPTSTR_LEN);
+  strncpy(self->optstr, opts, sizeof(self->optstr));
+
+  if ((uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY)) == 0) {
+    exit_fun("[NR_CSIRSSIM] Error, configuration module init failed\n");
+  }
+
+  opterr = 0; // Supress error from sim specific arguments which are parsed later
+  optind = 1;
+  int c = 0;
+
+  while ((c = getopt(argc, argv, self->optstr)) != -1) {
+    switch (c) {
+      case 'n':
+        self->num_trials = atoi(optarg);
+        break;
+
+      case 'm':
+        self->mu = atoi(optarg);
+        break;
+
+      case 'y':
+        self->n_tx = atoi(optarg);
+        break;
+
+      case 'z':
+        self->n_rx = atoi(optarg);
+        break;
+
+      case 'L':
+        self->loglvl = atoi(optarg);
+        break;
+
+      case 'R':
+        self->N_RB_BW = atoi(optarg);
+        break;
+
+      case 's':
+        self->snr_min = atof(optarg);
+        break;
+
+      case 'S':
+        self->snr_max = atof(optarg);
+        break;
+    }
+  }
+  opterr = 1;
+  optind = 1;
+}
+
+static void physim_init(PhySim *self)
+{
+  logInit();
+  set_glog(self->loglvl);
+  /* initialize the sin table */
+  InitSinLUT();
+
+  // gNB MAC
+  RC.nrmac = malloc(sizeof(*RC.nrmac));
+  RC.nrmac[0] = malloc(sizeof(**RC.nrmac));
+  self->gnb_mac = RC.nrmac[0];
+  self->scc = calloc(1, sizeof(*self->scc));
+  prepare_scc(self->scc);
+  uint64_t ssb_bitmap = 1; // Enable only first SSB with index ssb_indx=0
+  fill_scc_sim(self->scc, &ssb_bitmap, self->N_RB_BW, self->N_RB_BW, self->mu, self->mu);
+  fix_scc(self->scc, ssb_bitmap);
+  self->gnb_mac->common_channels[0].ServingCellConfigCommon = self->scc;
+  self->gnb_mac->common_channels[0].mib = get_new_MIB_NR(self->scc);
+
+  // UE MAC
+  self->ue_mac = nr_l2_init_ue(0, self->mu);
+}
+
+static void physim_cleanup(PhySim *self)
+{
+  ASN_STRUCT_FREE(asn_DEF_NR_BCCH_BCH_Message, self->gnb_mac->common_channels[0].mib);
+  ASN_STRUCT_FREE(asn_DEF_NR_ServingCellConfigCommon, self->scc);
+  free_and_zero(RC.nrmac[0]);
+  free_and_zero(RC.nrmac);
+}

openair1/SIMULATION/tests/CMakeLists.txt

@@ -383,6 +383,12 @@ add_physim_test(physim.5g.nr_srssim.test14 "SRS: 30KHz SCS, 106 PRBs, ToA 24, Co
 add_physim_test(physim.5g.nr_srssim.test15 "SRS: 30KHz SCS, 217 PRBs, ToA 8, Combsize 2, SRS symbols 4, SRS start symbol 8" nr_srssim -n300 -R217 -s0 -S5 -y2 -z2 -d 8 -b 4 -a 8)
 add_physim_test(physim.5g.nr_srssim.test16 "SRS: 30KHz SCS, 106 PRBs, SNR 2 dB to 30 dB in steps of 5 dB, ToA 24, Combsize 2" nr_srssim -n300 -R106 -s2 -S30 -y2 -z2 -d 24)
 
+####################################################################################
+######                           nr_csirssim unit test                          ######
+####################################################################################
+
+add_physim_test(physim.5g.nr_csirssim.test1 "CSIRS: 30kHz SCS, 106 PRBS" nr_csirssim -n1)
+
 ####################################################################################
 ######                           offload-specific tests                       ######
 ####################################################################################