PUCCH2 3-11 bits with > 2 PRB. Will work for even number of PRBs up to 16

openair1/PHY/NR_TRANSPORT/pucch_rx.c

@@ -1440,12 +1440,15 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
       }
       printf("\n");
 #endif
+      int64_t corr_tmp = 0;
+
+      for (int group=0;group<ngroup;group++) {
 	// do complex correlation
 	for (int aa=0;aa<Prx;aa++) {
-	prod_re[aa] = _mm256_srai_epi16(_mm256_adds_epi16(_mm256_mullo_epi16(pucch2_lut[nb_bit-3][cw<<1],rp_re[aa][0]),
-							  _mm256_mullo_epi16(pucch2_lut[nb_bit-3][(cw<<1)+1],rp_im[aa][0])),5);
-	prod_im[aa] = _mm256_srai_epi16(_mm256_subs_epi16(_mm256_mullo_epi16(pucch2_lut[nb_bit-3][cw<<1],rp2_im[aa][0]),
-							  _mm256_mullo_epi16(pucch2_lut[nb_bit-3][(cw<<1)+1],rp2_re[aa][0])),5);
+	  prod_re[aa] = _mm256_srai_epi16(_mm256_adds_epi16(_mm256_mullo_epi16(pucch2_lut[nb_bit-3][cw<<1],rp_re[aa][group]),
+							    _mm256_mullo_epi16(pucch2_lut[nb_bit-3][(cw<<1)+1],rp_im[aa][group])),5);
+	  prod_im[aa] = _mm256_srai_epi16(_mm256_subs_epi16(_mm256_mullo_epi16(pucch2_lut[nb_bit-3][cw<<1],rp2_im[aa][group]),
+							    _mm256_mullo_epi16(pucch2_lut[nb_bit-3][(cw<<1)+1],rp2_re[aa][group])),5);
 #ifdef DEBUG_NR_PUCCH_RX
 	  printf("prod_re[%d] => (%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)",aa,
 		 ((int16_t*)&prod_re[aa])[0],((int16_t*)&prod_re[aa])[1],((int16_t*)&prod_re[aa])[2],((int16_t*)&prod_re[aa])[3],
@@ -1470,26 +1473,27 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
 	}
 	int64_t corr_re=0,corr_im=0;
 	
-      int64_t corr_tmp = 0;
+	
 	for (int aa=0;aa<Prx;aa++) {
-	LOG_D(PHY,"pucch2 cw %d aa %d: (%d,%d)+(%d,%d) = (%d,%d)\n",cw,aa,
-	      corr32_re[0][aa],corr32_im[0][aa],
+	  LOG_D(PHY,"pucch2 cw %d group %d aa %d: (%d,%d)+(%d,%d) = (%d,%d)\n",cw,group,aa,
+		corr32_re[group][aa],corr32_im[0][aa],
 		((int16_t*)(&prod_re[aa]))[0],
 		((int16_t*)(&prod_im[aa]))[0],
-	      corr32_re[0][aa]+((int16_t*)(&prod_re[0]))[0],
-	      corr32_im[0][aa]+((int16_t*)(&prod_im[0]))[0]);
+		corr32_re[group][aa]+((int16_t*)(&prod_re[aa]))[0],
+		corr32_im[group][aa]+((int16_t*)(&prod_im[aa]))[0]);
 	  
-	corr_re = ( corr32_re[0][aa]+((int16_t*)(&prod_re[0]))[0]);
-	corr_im = ( corr32_im[0][aa]+((int16_t*)(&prod_im[0]))[0]);
+	  corr_re = ( corr32_re[group][aa]+((int16_t*)(&prod_re[aa]))[0]);
+	  corr_im = ( corr32_im[group][aa]+((int16_t*)(&prod_im[aa]))[0]);
 	  
 	  corr_tmp += corr_re*corr_re + corr_im*corr_im;	
-      }
+	} // aa loop
+      }// group loop
 
       if (corr_tmp > corr) {
 	corr = corr_tmp;
 	cw_ML=cw;
       }
-    }
+    } // cw loop
     corr_dB = dB_fixed64((uint64_t)corr);
     LOG_D(PHY,"cw_ML %d, metric %d dB\n",cw_ML,corr_dB);
     decodedPayload[0]=(uint64_t)cw_ML;

openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c

@@ -928,7 +928,17 @@ void nr_uci_encoding(uint64_t payload,
   if (A<=11) {
     // procedure in subclause 6.3.1.2.2 (UCI encoded by channel coding of small block lengths -> subclause 6.3.1.3.2)
     // CRC bits are not attached, and coding small block lengths (subclause 5.3.3)
-    b[0] = encodeSmallBlock((uint16_t*)&payload,A);
+    uint64_t b0= encodeSmallBlock((uint16_t*)&payload,A);
+    // repetition for rate-matching up to 16 PRB
+    b[0] = b0 | (b0<<32);
+    b[1] = b[0];
+    b[2] = b[0];
+    b[3] = b[0];
+    b[4] = b[0];
+    b[5] = b[0];
+    b[6] = b[0];
+    b[7] = b[0];
+    AssertFatal(nrofPRB<=16,"Number of PRB >16\n");
   } else if (A>=12) {
     AssertFatal(A<65,"Polar encoding not supported yet for UCI with more than 64 bits\n");
     t_nrPolar_params *currentPtr = nr_polar_params(NR_POLAR_UCI_PUCCH_MESSAGE_TYPE,