Putting byte2bit operations within polar coders

openair1/PHY/CODING/TESTBENCH/polartest.c

@@ -7,8 +7,6 @@
 #include <time.h>
 
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
-#include "PHY/NR_TRANSPORT/nr_dci.h"
-#include "PHY/defs_gNB.h"
 #include "SIMULATION/TOOLS/sim.h"
 
 //#define DEBUG_POLAR_PARAMS
@@ -22,16 +20,6 @@ int main(int argc, char *argv[]) {
 	reset_meas(&timeEncoder);
 	reset_meas(&timeDecoder);
 
-	//gNB scheduler
-	/*PHY_VARS_gNB *gNB = RC.gNB[0][0];
-	NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
-	nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
-
-	nfapi_nr_dl_config_request_pdu_t *pdu;
-	nfapi_nr_dl_config_pdcch_parameters_rel15_t *params_rel15 = &pdu->dci_dl_pdu.pdcch_params_rel15;
-	params_rel15->rnti_type = NFAPI_NR_RNTI_RA;
-	params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0;*/
-
 	randominit(0);
 	//Default simulation values (Aim for iterations = 1000000.)
 	int itr, iterations = 1000, arguments, polarMessageType = 0; //0=PBCH, 1=DCI, -1=UCI
@@ -42,8 +30,7 @@ int main(int argc, char *argv[]) {
 	int8_t decoderState=0, blockErrorState=0; //0 = Success, -1 = Decoding failed, 1 = Block Error.
 	uint16_t testLength = 0, coderLength = 0, blockErrorCumulative=0, bitErrorCumulative=0;
 	double timeEncoderCumulative = 0, timeDecoderCumulative = 0;
-
-	uint8_t aggregation_level, decoderListSize = 8, pathMetricAppr = 0; //0 --> eq. (8a) and (11b), 1 --> eq. (9) and (12)
+	uint8_t aggregation_level;
 
 	while ((arguments = getopt (argc, argv, "s:d:f:m:i:l:a:")) != -1)
 	switch (arguments)
@@ -171,16 +158,24 @@ int main(int argc, char *argv[]) {
 				modulatedInput[i]=(-1)/sqrt(2);
 
 			channelOutput[i] = modulatedInput[i] + (gaussdouble(0.0,1.0) * (1/sqrt(2*SNR_lin)));
+			printf("%f\n",channelOutput[i]);
 		}
 
 
+
 		start_meas(&timeDecoder);
-		decoderState = polar_decoder(channelOutput,
+		/*decoderState = polar_decoder(channelOutput,
 									 estimatedOutput,
 									 currentPtr,
-									 decoderListSize,
+									 NR_POLAR_DECODER_LISTSIZE,
 									 aPrioriArray,
-									 pathMetricAppr);
+									 NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION);*/
+		decoderState = polar_decoder_aPriori(channelOutput,
+											 estimatedOutput,
+											 currentPtr,
+											 NR_POLAR_DECODER_LISTSIZE,
+											 NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION,
+											 aPrioriArray);
 		stop_meas(&timeDecoder);
 
 		//calculate errors

openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h

@@ -19,6 +19,17 @@
  *      contact@openairinterface.org
  */
 
+/*!\file PHY/CODING/nrPolar_tools/nr_polar_defs.h
+ * \brief
+ * \author Turker Yilmaz
+ * \date 2018
+ * \version 0.1
+ * \company EURECOM
+ * \email turker.yilmaz@eurecom.fr
+ * \note
+ * \warning
+*/
+
 #ifndef __NR_POLAR_DEFS__H__
 #define __NR_POLAR_DEFS__H__
 
@@ -32,6 +43,9 @@
 #include "PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
 
+#define NR_POLAR_DECODER_LISTSIZE 8 //uint8_t
+#define NR_POLAR_DECODER_PATH_METRIC_APPROXIMATION 0 //uint8_t; 0 --> eq. (8a) and (11b), 1 --> eq. (9) and (12)
+
 static const uint8_t nr_polar_subblock_interleaver_pattern[32] = { 0, 1, 2, 4, 3, 5, 6, 7, 8, 16, 9, 17, 10, 18, 11, 19, 12, 20, 13, 21, 14, 22, 15, 23, 24, 25, 26, 28, 27, 29, 30, 31 };
 
 struct nrPolar_params {
@@ -65,20 +79,33 @@ struct nrPolar_params {
 	uint8_t **crc_generator_matrix; //G_P
 	uint8_t **G_N;
 
-	//polar_encoder vectors:
+	//polar_encoder vectors
 	uint8_t *nr_polar_crc;
-	uint8_t *nr_polar_b;
+	uint8_t *nr_polar_d;
+	uint8_t *nr_polar_e;
+
+	//Polar Coding vectors
+	uint8_t *nr_polar_a;
 	uint8_t *nr_polar_cPrime;
+	uint8_t *nr_polar_b;
 	uint8_t *nr_polar_u;
-	uint8_t *nr_polar_d;
 } __attribute__ ((__packed__));
 typedef struct nrPolar_params t_nrPolar_params;
 typedef t_nrPolar_params *t_nrPolar_paramsPtr;
 
-void polar_encoder(uint8_t *input, uint8_t *output, t_nrPolar_paramsPtr polarParams);
-
-int8_t polar_decoder(double *input, uint8_t *output, t_nrPolar_paramsPtr polarParams,
-		uint8_t listSize, double *aPrioriPayload, uint8_t pathMetricAppr);
+void polar_encoder(uint32_t *input, uint32_t *output, t_nrPolar_paramsPtr polarParams);
+
+int8_t polar_decoder(double *input,
+		 	 	 	 uint32_t *output,
+					 t_nrPolar_paramsPtr polarParams,
+					 uint8_t listSize,
+					 uint8_t pathMetricAppr);
+int8_t polar_decoder_aPriori(double *input,
+							 uint32_t *output,
+							 t_nrPolar_paramsPtr polarParams,
+							 uint8_t listSize,
+							 uint8_t pathMetricAppr,
+							 double *aPrioriPayload);
 
 void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
 				   int8_t messageType,

openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c

@@ -19,40 +19,75 @@
  *      contact@openairinterface.org
  */
 
+/*!\file PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+ * \brief
+ * \author Turker Yilmaz
+ * \date 2018
+ * \version 0.1
+ * \company EURECOM
+ * \email turker.yilmaz@eurecom.fr
+ * \note
+ * \warning
+*/
+
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
-void polar_encoder(
-		uint8_t *input,
-		uint8_t *output,
+void polar_encoder(uint32_t *in,
+				   uint32_t *out,
 				   t_nrPolar_paramsPtr polarParams)
 {
+	nr_bit2byte_uint32_8_t(in, polarParams->payloadBits, polarParams->nr_polar_a);
 
 	/*
 	 * Bytewise operations
 	 */
-
 	//Calculate CRC.
-	nr_matrix_multiplication_uint8_t_1D_uint8_t_2D(input, polarParams->crc_generator_matrix,
-			polarParams->nr_polar_crc, polarParams->payloadBits, polarParams->crcParityBits);
-	for (uint8_t i = 0; i < polarParams->crcParityBits; i++) polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
+	nr_matrix_multiplication_uint8_t_1D_uint8_t_2D(polarParams->nr_polar_a,
+												   polarParams->crc_generator_matrix,
+												   polarParams->nr_polar_crc,
+												   polarParams->payloadBits,
+												   polarParams->crcParityBits);
+	for (uint8_t i = 0; i < polarParams->crcParityBits; i++)
+		polarParams->nr_polar_crc[i] = (polarParams->nr_polar_crc[i] % 2);
 
 	//Attach CRC to the Transport Block. (a to b)
-	for (uint16_t i = 0; i < polarParams->payloadBits; i++) polarParams->nr_polar_b[i] = input[i];
+	for (uint16_t i = 0; i < polarParams->payloadBits; i++) polarParams->nr_polar_b[i] = polarParams->nr_polar_a[i];
 	for (uint16_t i = polarParams->payloadBits; i < polarParams->K; i++)
 		polarParams->nr_polar_b[i]= polarParams->nr_polar_crc[i-(polarParams->payloadBits)];
 
 	//Interleaving (c to c')
-	nr_polar_interleaver(polarParams->nr_polar_b, polarParams->nr_polar_cPrime, polarParams->interleaving_pattern, polarParams->K);
+	nr_polar_interleaver(polarParams->nr_polar_b,
+						 polarParams->nr_polar_cPrime,
+						 polarParams->interleaving_pattern,
+						 polarParams->K);
 
 	//Bit insertion (c' to u)
-	nr_polar_bit_insertion(polarParams->nr_polar_cPrime, polarParams->nr_polar_u, polarParams->N, polarParams->K,
-			polarParams->Q_I_N, polarParams->Q_PC_N, polarParams->n_pc);
+	nr_polar_bit_insertion(polarParams->nr_polar_cPrime,
+						   polarParams->nr_polar_u,
+						   polarParams->N,
+						   polarParams->K,
+						   polarParams->Q_I_N,
+						   polarParams->Q_PC_N,
+						   polarParams->n_pc);
 
 	//Encoding (u to d)
-	nr_matrix_multiplication_uint8_t_1D_uint8_t_2D(polarParams->nr_polar_u, polarParams->G_N, polarParams->nr_polar_d, polarParams->N, polarParams->N);
-	for (uint16_t i = 0; i < polarParams->N; i++) polarParams->nr_polar_d[i] = (polarParams->nr_polar_d[i] % 2);
+	nr_matrix_multiplication_uint8_t_1D_uint8_t_2D(polarParams->nr_polar_u,
+												   polarParams->G_N,
+												   polarParams->nr_polar_d,
+												   polarParams->N,
+												   polarParams->N);
+	for (uint16_t i = 0; i < polarParams->N; i++)
+		polarParams->nr_polar_d[i] = (polarParams->nr_polar_d[i] % 2);
 
 	//Rate matching
 	//Sub-block interleaving (d to y) and Bit selection (y to e)
-	nr_polar_rate_matcher(polarParams->nr_polar_d, output, polarParams->rate_matching_pattern, polarParams->encoderLength);
+	nr_polar_rate_matcher(polarParams->nr_polar_d,
+						  polarParams->nr_polar_e,
+						  polarParams->rate_matching_pattern,
+						  polarParams->encoderLength);
+
+	/*
+	 * Return bits.
+	 */
+	nr_byte2bit_uint8_32_t(polarParams->nr_polar_e, polarParams->encoderLength, out);
 }

openair1/PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h

@@ -19,15 +19,15 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h
-* \brief Defines the constant variables for polar coding of the PBCH from 38-212, V15.1.1 2018-04.
-* \author
-* \date 2018
-* \version 0.1
-* \company Eurecom
-* \email:
-* \note
-* \warning
+/*!\file PHY/CODING/nrPolar_tools/nr_polar_defs.h
+ * \brief Defines the constant variables for polar coding of the PBCH from 38-212, V15.1.1 2018-04.
+ * \author Turker Yilmaz
+ * \date 2018
+ * \version 0.1
+ * \company EURECOM
+ * \email turker.yilmaz@eurecom.fr
+ * \note
+ * \warning
 */
 
 #ifndef __NR_POLAR_PBCH_DEFS__H__
@@ -52,9 +52,6 @@
 #define NR_POLAR_PBCH_I_BIL 0 //uint8_t
 #define NR_POLAR_PBCH_E 864   //uint16_t
 
-//#define NR_POLAR_PBCH_L 5 //uint8_t
-#define NR_POLAR_PBCH_PATH_METRIC_APPROXIMATION 0 //uint8_t; 0 --> eq. (8a) and (11b), 1 --> eq. (9) and (12)
-
 /*
  * TEST CODE
  */

openair1/PHY/CODING/nr_polar_init.c

@@ -19,6 +19,17 @@
  *      contact@openairinterface.org
  */
 
+/*!\file PHY/CODING/nr_polar_init.h
+ * \brief
+ * \author Turker Yilmaz
+ * \date 2018
+ * \version 0.1
+ * \company EURECOM
+ * \email turker.yilmaz@eurecom.fr
+ * \note
+ * \warning
+*/
+
 #include "nrPolar_tools/nr_polar_defs.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h"
@@ -83,13 +94,15 @@ void nr_polar_init(t_nrPolar_paramsPtr *polarParams,
 
 		//polar_encoder vectors:
 		newPolarInitNode->nr_polar_crc = malloc(sizeof(uint8_t) * newPolarInitNode->crcParityBits);
-		newPolarInitNode->nr_polar_cPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K);
 		newPolarInitNode->nr_polar_d = malloc(sizeof(uint8_t) * newPolarInitNode->N);
+		newPolarInitNode->nr_polar_e = malloc(sizeof(uint8_t) * newPolarInitNode->encoderLength);
 
 		//Polar Coding vectors
 		newPolarInitNode->nr_polar_u = malloc(sizeof(uint8_t) * newPolarInitNode->N); //Decoder: nr_polar_uHat
 		newPolarInitNode->nr_polar_cPrime = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_cHat
 		newPolarInitNode->nr_polar_b = malloc(sizeof(uint8_t) * newPolarInitNode->K); //Decoder: nr_polar_bHat
+		newPolarInitNode->nr_polar_a = malloc(sizeof(uint8_t) * newPolarInitNode->payloadBits); //Decoder: nr_polar_aHat
+
 
 
 		newPolarInitNode->Q_0_Nminus1 = nr_polar_sequence_pattern(newPolarInitNode->n);

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -501,13 +501,13 @@ uint16_t nr_rx_pbch( PHY_VARS_NR_UE *ue,
   unsigned short idx_demod =0;
   int8_t decoderState=0;
   uint8_t decoderListSize = 8, pathMetricAppr = 0;
-  double aPrioriArray[frame_parms->pbch_polar_params.payloadBits];  // assume no a priori knowledge available about the payload.
 
   memset(&pbch_a[0], 0, sizeof(uint8_t) * NR_POLAR_PBCH_PAYLOAD_BITS);
 
   //printf("nr_pbch_ue nid_cell %d\n",frame_parms->Nid_cell);
 
-  for (int i=0; i<frame_parms->pbch_polar_params.payloadBits; i++) aPrioriArray[i] = NAN;
+  /*double aPrioriArray[frame_parms->pbch_polar_params.payloadBits];  // assume no a priori knowledge available about the payload.
+  for (int i=0; i<frame_parms->pbch_polar_params.payloadBits; i++) aPrioriArray[i] = NAN;*/
 
   int subframe_rx = proc->subframe_rx;
 
@@ -605,7 +605,8 @@ uint16_t nr_rx_pbch( PHY_VARS_NR_UE *ue,
 
 		
   //polar decoding de-rate matching
-  decoderState = polar_decoder(demod_pbch_e, pbch_a, &frame_parms->pbch_polar_params, decoderListSize, aPrioriArray, pathMetricAppr);
+  decoderState = polar_decoder(demod_pbch_e, pbch_a, &frame_parms->pbch_polar_params, decoderListSize, pathMetricAppr);
+  //decoderState = polar_decoder_aPriori(demod_pbch_e, pbch_a, &frame_parms->pbch_polar_params, decoderListSize, aPrioriArray, pathMetricAppr);
 
   //for (i=0; i<NR_POLAR_PBCH_PAYLOAD_BITS; i++)
   // printf("pbch_a[%d] = %u \n", i,pbch_a[i]);