change partially pbch detection to c16_t instead of hidden complex in int16_t and int32_t

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -114,7 +114,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
     nr_pusch_dmrs_rx(gNB,
                      Ns,
                      gNB->nr_gold_pusch_dmrs[pusch_pdu->scid][Ns][symbol],
-                     (int32_t *)pilot,
+                     pilot,
                      (1000 + p),
                      0,
                      nb_rb_pusch,
@@ -129,7 +129,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
     LOG_D(PHY,"Transform Precoding params. u: %d, v: %d, index for dmrsseq: %d\n", u, v, index);
     AssertFatal(index >= 0, "Num RBs not configured according to 3GPP 38.211 section 6.3.1.4. For PUSCH with transform precoding, num RBs cannot be multiple of any other primenumber other than 2,3,5\n");
     AssertFatal(dmrs_seq != NULL, "DMRS low PAPR seq not found, check if DMRS sequences are generated");
-    nr_pusch_lowpaprtype1_dmrs_rx(gNB, Ns, dmrs_seq, (int32_t *)pilot, 1000, 0, nb_rb_pusch, 0, pusch_pdu->dmrs_config_type);
+    nr_pusch_lowpaprtype1_dmrs_rx(gNB, Ns, dmrs_seq, pilot, 1000, 0, nb_rb_pusch, 0, pusch_pdu->dmrs_config_type);
 #ifdef DEBUG_PUSCH
     printf ("NR_UL_CHANNEL_EST: index %d, u %d,v %d\n", index, u, v);
     LOG_M("gNb_DMRS_SEQ.m","gNb_DMRS_SEQ", dmrs_seq,6*nb_rb_pusch,1,1);

openair1/PHY/NR_REFSIG/nr_refsig.h

@@ -54,7 +54,7 @@ int nr_pusch_dmrs_delta(uint8_t dmrs_config_type, unsigned short p);
 int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
                      unsigned int Ns,
                      unsigned int *nr_gold_pusch,
-                     int32_t *output,
+                     c16_t *output,
                      unsigned short p,
                      unsigned char lp,
                      unsigned short nb_pusch_rb,
@@ -68,18 +68,14 @@ extern simde__m64 byte2m64_re[256];
 extern simde__m64 byte2m64_im[256];
 extern simde__m128i byte2m128i[256];
 
-
-
 int nr_pusch_lowpaprtype1_dmrs_rx(PHY_VARS_gNB *gNB,
-                     unsigned int Ns,
-                     int16_t *dmrs_seq,
-                     int32_t *output,
-                     unsigned short p,
-                     unsigned char lp,
-                     unsigned short nb_pusch_rb,
-                     uint32_t re_offset,
-                     uint8_t dmrs_type);
-
-
+                                  unsigned int Ns,
+                                  int16_t *dmrs_seq,
+                                  c16_t *output,
+                                  unsigned short p,
+                                  unsigned char lp,
+                                  unsigned short nb_pusch_rb,
+                                  uint32_t re_offset,
+                                  uint8_t dmrs_type);
 
 #endif

openair1/PHY/NR_REFSIG/refsig_defs_ue.h

@@ -27,13 +27,10 @@
 #include "PHY/defs_nr_UE.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
-
 /*!\brief This function generates the NR Gold sequence (38-211, Sec 5.2.1) for the PBCH DMRS.
 @param PHY_VARS_NR_UE* ue structure provides configuration, frame parameters and the pointers to the 32 bits sequence storage tables
  */
-int nr_pbch_dmrs_rx(int dmrss,
-                    unsigned int *nr_gold_pbch,
-                    int32_t *output);
+int nr_pbch_dmrs_rx(int dmrss, unsigned int *nr_gold_pbch, c16_t *output);
 
 /*!\brief This function generates the NR Gold sequence (38-211, Sec 5.2.1) for the PDCCH DMRS.
 @param PHY_VARS_NR_UE* ue structure provides configuration, frame parameters and the pointers to the 32 bits sequence storage tables
@@ -41,14 +38,14 @@ int nr_pbch_dmrs_rx(int dmrss,
 int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
                      unsigned int Ns,
                      unsigned int *nr_gold_pdcch,
-                     int32_t *output,
+                     c16_t *output,
                      unsigned short p,
                      unsigned short nb_rb_corset);
 
 int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
                      unsigned int Ns,
                      unsigned int *nr_gold_pdsch,
-                     int32_t *output,
+                     c16_t *output,
                      unsigned short p,
                      unsigned char lp,
                      unsigned short nb_pdsch_rb,

openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c

@@ -202,10 +202,11 @@ void generate_lowpapr_typ1_refsig_sequences(unsigned int scaling)
 {
   /* prevent multiple calls, relevant when both UE & gNB initialize this */
   static bool already_called = false;
-  if (already_called) return;
+  if (already_called)
+    return;
   already_called = true;
 
-	unsigned int u,Msc_RS;
+  unsigned int u, Msc_RS;
   unsigned int v = 0; // sequence hopping and group hopping are not supported yet
 
   for (Msc_RS=0; Msc_RS <= INDEX_SB_LESS_32; Msc_RS++) {  	

openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h

@@ -20,15 +20,16 @@
  */
 #ifndef __FILT16A_H__
 #define __FILT16A_H__
-static const short filt16a_l0[16] = {16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const c16_t filt16a_l0[8] = {{16384, 12288}, {8192, 4096}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
 
 static const short filt16a_mm0[16] = {0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0};
 
-static const short filt16a_r0[16] = {0, 0, 0, 0, 0, 4096, 8192, 12288, 16384, 20480, 24576, 28672, 0, 0, 0, 0};
+static const c16_t filt16a_r0[8] = {{0, 0}, {0, 0}, {0, 4096}, {8192, 12288}, {16384, 20480}, {24576, 28672}, {0, 0}, {0, 0}};
 
-static const short filt16a_m0[16] = {0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, -4096, -8192, -12288, 0, 0, 0, 0};
+static const c16_t filt16a_m0[8] =
+    {{0, 4096}, {8192, 12288}, {16384, 12288}, {8192, 4096}, {0, -4096}, {-8192, -12288}, {0, 0}, {0, 0}};
 
-static const short filt16a_l1[16] = {20480, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const c16_t filt16a_l1[8] = {{20480, 16384}, {12288, 8192}, {4096, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
 
 static const short filt16a_mm1[16] = {0, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0};
 
@@ -36,11 +37,12 @@ static const short filt16a_ml1[16] = {-4096, 0, 4096, 8192, 12288, 16384, 12288,
 
 static const short filt16a_mr1[16] = {0, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, -4096, -8192, 0, 0, 0, 0};
 
-static const short filt16a_r1[16] = {0, 0, 0, 0, 0, 0, 4096, 8192, 12288, 16384, 20480, 24576, 0, 0, 0, 0};
+static const c16_t filt16a_r1[8] = {{0, 0}, {0, 0}, {0, 0}, {4096, 8192}, {12288, 16384}, {20480, 24576}, {0, 0}, {0, 0}};
 
-static const short filt16a_m1[16] = {-4096, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, -4096, -8192, 0, 0, 0, 0};
+static const c16_t filt16a_m1[8] =
+    {{-4096, 0}, {4096, 8192}, {12288, 16384}, {12288, 8192}, {4096, 0}, {-4096, -8192}, {0, 0}, {0, 0}};
 
-static const short filt16a_l2[16] = {24576, 20480, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const c16_t filt16a_l2[8] = {{24576, 20480}, {16384, 12288}, {8192, 4096}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
 
 static const short filt16a_mm2[16] = {0, 0, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0};
 
@@ -48,19 +50,21 @@ static const short filt16a_ml2[16] = {-8192, -4096, 0, 4096, 8192, 12288, 16384,
 
 static const short filt16a_mr2[16] = {0, 0, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, -4096, 0, 0, 0, 0};
 
-static const short filt16a_r2[16] = {0, 0, 0, 0, 0, 0, 0, 4096, 8192, 12288, 16384, 20480, 0, 0, 0, 0};
+static const c16_t filt16a_r2[8] = {{0, 0}, {0, 0}, {0, 0}, {0, 4096}, {8192, 12288}, {16384, 20480}, {0, 0}, {0, 0}};
 
-static const short filt16a_m2[16] = {-8192, -4096, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, -4096, 0, 0, 0, 0};
+static const c16_t filt16a_m2[8] =
+    {{-8192, -4096}, {0, 4096}, {8192, 12288}, {16384, 12288}, {8192, 4096}, {0, -4096}, {0, 0}, {0, 0}};
 
-static const short filt16a_l3[16] = {28672, 24576, 20480, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const c16_t filt16a_l3[8] = {{28672, 24576}, {20480, 16384}, {12288, 8192}, {4096, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
 
 static const short filt16a_mm3[16] = {0, 0, 0, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0};
 
 static const short filt16a_ml3[16] = {-12288, -8192, -4096, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0};
 
-static const short filt16a_r3[16] = {0, 0, 0, 0, 0, 0, 0, 0, 4096, 8192, 12288, 16384, 0, 0, 0, 0};
+static const c16_t filt16a_r3[8] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {4096, 8192}, {12288, 16384}, {0, 0}, {0, 0}};
 
-static const short filt16a_m3[16] = {-12288, -8192, -4096, 0, 4096, 8192, 12288, 16384, 12288, 8192, 4096, 0, 0, 0, 0, 0};
+static const c16_t filt16a_m3[8] =
+    {{-12288, -8192}, {-4096, 0}, {4096, 8192}, {12288, 16384}, {12288, 8192}, {4096, 0}, {0, 0}, {0, 0}};
 
 static const short filt16a_l0_dc[16] = {16384, 12288, 8192, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 

openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

@@ -92,15 +92,15 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
               int,
               ue->measurements.rx_spatial_power,
               NUMBER_OF_CONNECTED_gNB_MAX,
-              frame_parms->nb_antenna_ports_gNB,
-              frame_parms->nb_antennas_rx,
+              cmax(frame_parms->nb_antenna_ports_gNB,1),
+              cmax(frame_parms->nb_antennas_rx,1),
               false);
   allocCast3D(rx_spatial_power_dB,
               unsigned short,
               ue->measurements.rx_spatial_power_dB,
               NUMBER_OF_CONNECTED_gNB_MAX,
-              frame_parms->nb_antenna_ports_gNB,
-              frame_parms->nb_antennas_rx,
+              cmax(frame_parms->nb_antenna_ports_gNB,1),
+	      cmax(frame_parms->nb_antennas_rx,1),
               false);
 
   // signal measurements

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -74,14 +74,11 @@ int nr_pbch_detection(const UE_nr_rxtx_proc_t *proc,
       for(int i=pbch_initial_symbol; i<pbch_initial_symbol+3;i++)
         nr_pbch_dmrs_correlation(ue, proc, i, i - pbch_initial_symbol, current_ssb, rxdataF);
       stop_meas(&ue->dlsch_channel_estimation_stats);
-
-      current_ssb->metric = current_ssb->c_re * current_ssb->c_re + current_ssb->c_im * current_ssb->c_im;
       current_ssb++;
     }
   }
 
-  NR_UE_SSB *temp_ptr=best_ssb;
-  while (ret!=0 && temp_ptr != NULL) {
+  for (NR_UE_SSB *temp_ptr = best_ssb; ret != 0 && temp_ptr < best_ssb + N_L * N_hf; temp_ptr++) {
     start_meas(&ue->dlsch_channel_estimation_stats);
     // computing channel estimation for selected best ssb
     const int estimateSz = frame_parms->symbols_per_slot * frame_parms->ofdm_symbol_size;
@@ -107,8 +104,6 @@ int nr_pbch_detection(const UE_nr_rxtx_proc_t *proc,
                    1,
                    1);
     }
-
-    temp_ptr++;
   }
 
   if (ret == 0) {

openair1/PHY/TOOLS/tools_defs.h

@@ -309,6 +309,25 @@ The function implemented is : \f$\mathbf{y} = y + \alpha\mathbf{x}\f$
 */
   void multadd_real_vector_complex_scalar(const int16_t *x, const int16_t *alpha, int16_t *y, uint32_t N);
 
+  // Same with correct types
+  static inline void multaddRealVectorComplexScalar(const c16_t *in, const c16_t alpha, c16_t *out, uint32_t N)
+  {
+    // do 8 multiplications at a time
+    simd_q15_t *x_128 = (simd_q15_t *)in, *y_128 = (simd_q15_t *)out;
+
+    //  printf("alpha = %d,%d\n",alpha[0],alpha[1]);
+    const simd_q15_t alpha_r_128 = set1_int16(alpha.r);
+    const simd_q15_t alpha_i_128 = set1_int16(alpha.i);
+    for (unsigned int i = 0; i < N >> 3; i++) {
+      const simd_q15_t yr = mulhi_s1_int16(alpha_r_128, x_128[i]);
+      const simd_q15_t yi = mulhi_s1_int16(alpha_i_128, x_128[i]);
+      const simd_q15_t tmp = simde_mm_loadu_si128(y_128);
+      simde_mm_storeu_si128(y_128++, simde_mm_adds_epi16(tmp, simde_mm_unpacklo_epi16(yr, yi)));
+      const simd_q15_t tmp2 = simde_mm_loadu_si128(y_128);
+      simde_mm_storeu_si128(y_128++, simde_mm_adds_epi16(tmp2, simde_mm_unpackhi_epi16(yr, yi)));
+    }
+  }
+
 static __attribute__((always_inline)) inline void multadd_real_four_symbols_vector_complex_scalar(const int16_t *x,
                                                                                            c16_t *alpha,
                                                                                            c16_t *y)

openair1/PHY/defs_nr_UE.h

@@ -311,9 +311,7 @@ typedef struct {
 typedef struct NR_UE_SSB {
   uint8_t i_ssb;   // i_ssb between 0 and 7 (it corresponds to ssb_index only for Lmax=4,8)
   uint8_t n_hf;    // n_hf = 0,1 for Lmax =4 or n_hf = 0 for Lmax =8,64
-  uint32_t metric; // metric to order SSB hypothesis
-  uint32_t c_re;
-  uint32_t c_im;
+  c32_t c;
 } NR_UE_SSB;
 
 typedef struct UE_NR_SCAN_INFO_s {