Merge remote-tracking branch 'origin/NR_fix_gold' into integration_2024_w12

openair1/PHY/NR_REFSIG/nr_gold.c

@@ -55,42 +55,39 @@ void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)
 
 void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)
 {
-  uint32_t x1 = 0, x2 = 0;
-  uint8_t reset;
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
   uint32_t ***pdcch_dmrs = gNB->nr_gold_pdcch_dmrs;
-  int pdcch_dmrs_init_length =  (((fp->N_RB_DL<<1)*3)>>5)+1;
-
-  for (uint8_t slot=0; slot<fp->slots_per_frame; slot++) {
-    for (uint8_t symb=0; symb<fp->symbols_per_slot; symb++) {
-
-      reset = 1;
-      x2 = ((1<<17) * (fp->symbols_per_slot*slot+symb+1) * ((Nid<<1)+1) + (Nid<<1));
-      LOG_D(PHY,"PDCCH DMRS slot %d, symb %d, Nid %d, x2 %x\n",slot,symb,Nid,x2);
-      for (uint32_t n=0; n<pdcch_dmrs_init_length; n++) {
+  int pdcch_dmrs_init_length = (((fp->N_RB_DL << 1) * 3) >> 5) + 1;
+
+  for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+    for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
+      uint8_t reset = 1;
+      uint32_t x1 = 0;
+      uint64_t temp_x2 = ((1UL << 17) * (fp->symbols_per_slot * slot + symb + 1) * ((Nid << 1) + 1) + (Nid << 1));
+      uint32_t x2 = temp_x2 % (1U << 31);
+      LOG_D(PHY,"PDCCH DMRS slot %d, symb %d, Nid %d, x2 %x\n", slot, symb, Nid, x2);
+      for (uint32_t n = 0; n < pdcch_dmrs_init_length; n++) {
         pdcch_dmrs[slot][symb][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }
     }  
   }
-
 }
 
 
-void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid) {
-  uint32_t x1 = 0, x2 = 0;
-  uint8_t reset;
+void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid)
+{
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
   uint32_t ****pdsch_dmrs = gNB->nr_gold_pdsch_dmrs;
-  int pdsch_dmrs_init_length =  ((fp->N_RB_DL*12)>>5)+1;
-
-  for (uint8_t slot=0; slot<fp->slots_per_frame; slot++) {
-
-    for (uint8_t symb=0; symb<fp->symbols_per_slot; symb++) {
-      reset = 1;
-      x2 = ((1<<17) * (fp->symbols_per_slot*slot+symb+1) * ((Nid<<1)+1) +((Nid<<1)+nscid));
-      LOG_D(PHY,"PDSCH DMRS slot %d, symb %d x2 %x, Nid %d,nscid %d\n",slot,symb,x2,Nid,nscid);
-      for (uint32_t n=0; n<pdsch_dmrs_init_length; n++) {
+  int pdsch_dmrs_init_length = ((fp->N_RB_DL * 12) >> 5) + 1;
+  for (int slot = 0; slot < fp->slots_per_frame; slot++) {
+    for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
+      uint8_t reset = 1;
+      uint32_t x1 = 0;
+      uint64_t temp_x2 = ((1UL << 17) * (fp->symbols_per_slot * slot + symb + 1) * ((Nid << 1) + 1) + ((Nid << 1) + nscid));
+      uint32_t x2 = temp_x2 % (1U << 31);
+      LOG_D(PHY,"PDSCH DMRS slot %d, symb %d, Nid %d, nscid %d, x2 %x\n",slot, symb, Nid, nscid, x2);
+      for (uint32_t n = 0; n < pdsch_dmrs_init_length; n++) {
         pdsch_dmrs[slot][symb][nscid][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }
@@ -99,22 +96,18 @@ void nr_init_pdsch_dmrs(PHY_VARS_gNB* gNB, uint8_t nscid, uint32_t Nid) {
 }
 
 
-void nr_gold_pusch(PHY_VARS_gNB* gNB, int nscid, uint32_t nid) {
-
-  unsigned char ns;
-  unsigned int n = 0, x1 = 0, x2 = 0;
-  int reset;
+void nr_gold_pusch(PHY_VARS_gNB* gNB, int nscid, uint32_t nid)
+{
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
-  unsigned short l;
-  int pusch_dmrs_init_length =  ((fp->N_RB_UL*12)>>5)+1;
-
-  for (ns=0; ns<fp->slots_per_frame; ns++) {
-    for (l=0; l<fp->symbols_per_slot; l++) {
-      reset = 1;
-      x2 = ((1<<17) * (fp->symbols_per_slot*ns+l+1) * ((nid<<1)+1) +((nid<<1)+nscid));
-      LOG_D(PHY,"DMRS slot %d, symb %d x2 %x\n",ns,l,x2);
-
-      for (n=0; n<pusch_dmrs_init_length; n++) {
+  int pusch_dmrs_init_length = ((fp->N_RB_UL * 12) >> 5) + 1;
+  for (int ns = 0; ns < fp->slots_per_frame; ns++) {
+    for (int l = 0; l < fp->symbols_per_slot; l++) {
+      int reset = 1;
+      uint32_t x1 = 0;
+      uint64_t temp_x2 = ((1UL << 17) * (fp->symbols_per_slot * ns + l + 1) * ((nid << 1) + 1) + ((nid << 1) + nscid));
+      uint32_t x2 = temp_x2 % (1U << 31);
+      LOG_D(PHY,"DMRS slot %d, symb %d, nscid %d, nid %d, x2 %x\n", ns, l, nscid, nid, x2);
+      for (int n = 0; n < pusch_dmrs_init_length; n++) {
         gNB->nr_gold_pusch_dmrs[nscid][ns][l][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }

openair1/PHY/NR_REFSIG/nr_gold_ue.c

@@ -54,17 +54,17 @@ void nr_gold_pbch(PHY_VARS_NR_UE* ue)
 void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
                    unsigned short nid)
 {
-  unsigned int n = 0, x1 = 0, x2 = 0, x2tmp0 = 0;
-  uint8_t reset;
   int pdcch_dmrs_init_length = (((ue->frame_parms.N_RB_DL << 1) * 3) >> 5) + 1;
-
   for (int ns = 0; ns < ue->frame_parms.slots_per_frame; ns++) {
     for (int l = 0; l < ue->frame_parms.symbols_per_slot; l++) {
-      reset = 1;
-      x2tmp0 = ((ue->frame_parms.symbols_per_slot * ns + l + 1) * ((nid << 1) + 1));
+      uint8_t reset = 1;
+      uint64_t x2tmp0 = ((ue->frame_parms.symbols_per_slot * ns + l + 1) * ((nid << 1) + 1));
       x2tmp0 <<= 17;
-      x2 = (x2tmp0 + (nid << 1)) % (1U << 31);  //cinit
-      for (n=0; n<pdcch_dmrs_init_length; n++) {
+      x2tmp0 += (nid << 1);
+      uint32_t x1 = 0;
+      uint32_t x2 = x2tmp0 % (1U << 31);  //cinit
+      LOG_D(PHY,"PDCCH DMRS slot %d, symb %d, Nid %d, x2 %x\n", ns, l, nid, x2);
+      for (int n = 0; n < pdcch_dmrs_init_length; n++) {
         ue->nr_gold_pdcch[0][ns][l][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }    
@@ -74,21 +74,17 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
                    int nscid,
-                   uint32_t nid) {
-  unsigned int x1 = 0, x2 = 0, x2tmp0 = 0;
-  uint8_t reset;
-  int pdsch_dmrs_init_length =  ((ue->frame_parms.N_RB_DL*12)>>5)+1;
-
+                   uint32_t nid)
+{
+  int pdsch_dmrs_init_length = ((ue->frame_parms.N_RB_DL * 12) >> 5) + 1;
   for (int ns=0; ns<ue->frame_parms.slots_per_frame; ns++) {
-
     for (int l=0; l<ue->frame_parms.symbols_per_slot; l++) {
-
-      reset = 1;
-      x2tmp0 = ((ue->frame_parms.symbols_per_slot*ns+l+1)*((nid<<1)+1))<<17;
-      x2 = (x2tmp0+(nid<<1)+nscid)%(1U<<31);  //cinit
-      LOG_D(PHY,"UE DMRS slot %d, symb %d, x2 %x, nscid %d\n",ns,l,x2,nscid);
-
-      for (int n=0; n<pdsch_dmrs_init_length; n++) {
+      uint8_t reset = 1;
+      uint64_t x2tmp0 = ((ue->frame_parms.symbols_per_slot * ns + l + 1) * ((nid << 1) + 1)) << 17;
+      uint32_t x1 = 0;
+      uint32_t x2 = (x2tmp0 + (nid << 1) + nscid) % (1U << 31);  //cinit
+      LOG_D(PHY,"UE DMRS slot %d, symb %d, nscid %d, x2 %x\n", ns, l, nscid, x2);
+      for (int n = 0; n < pdsch_dmrs_init_length; n++) {
         ue->nr_gold_pdsch[0][ns][l][nscid][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }
@@ -96,21 +92,19 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
   }
 }
 
-void nr_init_pusch_dmrs(PHY_VARS_NR_UE* ue,
-                        uint16_t N_n_scid,
-                        uint8_t n_scid)
+void nr_init_pusch_dmrs(PHY_VARS_NR_UE* ue, uint16_t N_n_scid, uint8_t n_scid)
 {
-  uint32_t x1 = 0, x2 = 0, n = 0;
   NR_DL_FRAME_PARMS *fp = &ue->frame_parms;
   uint32_t ****pusch_dmrs = ue->nr_gold_pusch_dmrs;
   int pusch_dmrs_init_length = ((fp->N_RB_UL * 12) >> 5) + 1;
-
   for (int slot = 0; slot < fp->slots_per_frame; slot++) {
     for (int symb = 0; symb < fp->symbols_per_slot; symb++) {
       int reset = 1;
-      x2 = ((1U << 17) * (fp->symbols_per_slot*slot + symb + 1) * ((N_n_scid << 1) + 1) + ((N_n_scid << 1) + n_scid));
-      LOG_D(PHY,"DMRS slot %d, symb %d x2 %x\n", slot, symb, x2);
-      for (n=0; n<pusch_dmrs_init_length; n++) {
+      uint32_t x1 = 0;
+      uint64_t t_x2 = ((1UL << 17) * (fp->symbols_per_slot*slot + symb + 1) * ((N_n_scid << 1) + 1) + ((N_n_scid << 1) + n_scid));
+      uint32_t x2 = t_x2 % (1U << 31);
+      LOG_D(PHY,"DMRS slot %d, symb %d, N_n_scid %d, n_scid %d, x2 %x\n", slot, symb, N_n_scid, n_scid, x2);
+      for (int n = 0; n < pusch_dmrs_init_length; n++) {
         pusch_dmrs[slot][symb][n_scid][n] = lte_gold_generic(&x1, &x2, reset);
         reset = 0;
       }