Merge branch 'feature_ldpc_test' into ldpc_encoder_decoder

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c

cmake_targets/CMakeLists.txt

@@ -1049,6 +1049,8 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
   ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/ldpc_decoder.c
+  ${OPENAIR1_DIR}/PHY/CODING/ldpc_encoder.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
@@ -1979,6 +1981,9 @@ target_link_libraries (dlsim_tm4
   pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
   )
 
+add_executable(ldpctest  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c)
+target_link_libraries(ldpctest m SIMU PHY ${ATLAS_LIBRARIES})
+
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
 
   add_executable(${myExe}

cmake_targets/build_oai

@@ -499,6 +499,11 @@ function main() {
         flash_firmware_bladerf
       fi
     fi
+    if [ "$FLEXRAN_AGENT" == "1" ] ; then
+      echo_info "installing protobuf/protobuf-c for flexran agent support"
+      install_protobuf_from_source
+      install_protobuf_c_from_source
+    fi
   fi
 
   if [ "$INSTALL_OPTIONAL" = "1" ] ; then

cmake_targets/tools/build_helper

@@ -202,10 +202,14 @@ install_protobuf_from_source(){
     (
     cd /tmp
     echo "Downloading protobuf"
-    rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
-    wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
-    tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner 
-    cd protobuf-2.6.1/
+    #rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
+    #wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+    #tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner
+    #cd protobuf-2.6.1/
+    rm -rf /tmp/protobuf-cpp-3.3.0.tar.gz* /tmp/protobuf-3.3.0
+    wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
+    tar -xzvf protobuf-cpp-3.3.0.tar.gz --owner $USER --group $USER --no-same-owner
+    cd protobuf-3.3.0/
     ./configure
     echo "Compiling protobuf"
     make -j`nproc`
@@ -671,8 +675,6 @@ check_install_oai_software() {
     install_asn1c_from_source
     $SUDO rm -fr /opt/ssh
     $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
-    install_protobuf_from_source
-    install_protobuf_c_from_source
 }
 
 ### Remove Nettle installation which was done from sources (only done for Ubuntu Distro)

openair1/PHY/CODING/TESTBENCH/ldpctest.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include <stdlib.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "SIMULATION/TOOLS/defs.h"
+
+// 4-bit quantizer
+char quantize4bit(double D,double x)
+{
+
+  double qxd;
+
+  qxd = floor(x/D);
+  //  printf("x=%f,qxd=%f\n",x,qxd);
+
+  if (qxd <= -8)
+    qxd = -8;
+  else if (qxd > 7)
+    qxd = 7;
+
+  return((char)qxd);
+}
+
+char quantize(double D,double x,unsigned char B)
+{
+
+  double qxd;
+  char maxlev;
+
+  qxd = floor(x/D);
+  //    printf("x=%f,qxd=%f\n",x,qxd);
+
+  maxlev = 1<<(B-1);
+
+  if (qxd <= -maxlev)
+    qxd = -maxlev;
+  else if (qxd >= maxlev)
+    qxd = maxlev-1;
+
+  return((char)qxd);
+}
+
+#define MAX_BLOCK_LENGTH 8448
+
+int test_ldpc(short No_iteration,
+	      double rate,	     
+	      double SNR,
+	      unsigned char qbits,
+	      short block_length,
+	      unsigned int ntrials,
+	      unsigned int *errors, 	      
+	      unsigned int *crc_misses)
+{
+
+//clock initiate
+ time_stats_t time;
+ opp_enabled=1;
+ cpu_freq_GHz = get_cpu_freq_GHz();
+ 
+  //short test_input[block_length];
+  char *test_input;
+  //short *c; //padded codeword  
+  short *esimated_output;
+  char *channel_input;
+  double *channel_output;
+  double *modulated_input;
+  short *channel_output_fixed;
+  unsigned int i,trial=0;   
+
+  /*
+short BG,Zc,Kb,nrows,ncols,channel_temp;
+int no_punctured_columns;  //new
+
+//Table of possible lifting sizes
+  short lift_size[51]={2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,18,20,22,24,26,28,30,32,36,40,44,48,52,56,60,64,72,80,88,96,104,112,120,128,144,160,176,192,208,224,240,256,288,320,352,384};
+  */
+  
+  *errors=0;
+  *crc_misses=0;
+
+  // generate input block
+  test_input=(char*)malloc(sizeof(char) * block_length/8);
+  channel_input = (char*)malloc(sizeof(char) * 68*384/8);
+  
+  while (trial++ < ntrials) 
+   {        
+     for (i=0; i<block_length/8; i++) 
+       {    
+	 test_input[i]=(char) rand();
+	 //test_input[i]=i%2;
+       }
+     
+/*
+     //determine number of bits in codeword
+     if (block_length>3840)
+       {
+          BG=1;
+	  Kb = 22;
+          nrows=46;	//parity check bits
+          ncols=22;	//info bits
+       }
+     else if (block_length<=3840)
+       {
+          BG=2;
+	  nrows=42;	//parity check bits
+          ncols=10;	// info bits
+          if (block_length>640)
+             Kb = 10;
+          else if (block_length>560)
+             Kb = 9;
+          else if (block_length>192)
+             Kb = 8;
+          else
+             Kb = 6;
+       }
+
+     //find minimum value in all sets of lifting size
+     for (i1=0; i1 < 51; i1++)
+       {
+          if (lift_size[i1] >= (double) block_length/Kb)
+            {
+              Zc = lift_size[i1];
+              // printf("%d\n",Zc);
+              break;
+            }
+       }
+
+     no_punctured_columns=(int)((nrows+Kb-2)*Zc-block_length/rate)/Zc; 
+     //printf("%d\n",no_punctured_columns);
+     */
+    start_meas(&time);
+    //// encoder
+   
+    ldpc_encoder(test_input, channel_input,block_length,rate);
+    stop_meas(&time);
+    print_meas_now(&time, "", stdout);
+
+ //for (i=0;i<10;i++)
+   //printf("channel_input[%d]=%d test_input[%d]=%d\n",i,channel_input[i],i,test_input[i]);
+ /*
+     //channel 
+     modulated_input  = (double *)malloc( (Kb+nrows) * Zc*sizeof(double));   
+     channel_output  = (double *)malloc( (Kb+nrows) * Zc*sizeof(double));
+     channel_output_fixed  = (short *)malloc( (Kb+nrows) * Zc*sizeof(short));
+     memset(channel_output_fixed,0,(Kb+nrows) * Zc*sizeof(short));
+
+     for (i = 2*Zc; i < (Kb+nrows) * Zc; i++) 
+      {
+          #ifdef DEBUG_CODER
+          if ((i&0xf)==0)
+          printf("\ne %d..%d:    ",i,i+15);
+          #endif
+
+	  if (channel_input[i]==0)
+	     modulated_input[i]=1/sqrt(2);	//QPSK
+	  else
+	     modulated_input[i]=-1/sqrt(2);
+	  channel_output[i] = modulated_input[i] + gaussdouble(0.0,1.0) * 1/sqrt(2*SNR);
+          channel_output_fixed[i] = (short) ((channel_output[i]*128)<0?(channel_output[i]*128-0.5):(channel_output[i]*128+0.5)); //fixed point 9-7
+       }
+
+//for (i=(Kb+nrows) * Zc-5;i<(Kb+nrows) * Zc;i++)
+//{
+ //  printf("channel_input[%d]=%d\n",i,channel_input[i]);
+//printf("%lf %d\n",channel_output[i], channel_output_fixed[i]);
+//printf("v[%d]=%lf\n",i,modulated_input[i]);}
+
+#ifdef DEBUG_CODER
+    printf("\n");
+    exit(-1);
+#endif
+ */
+/*
+     // decode the sequence
+     esimated_output=ldpc_decoder(channel_output_fixed, block_length, No_iteration, rate);
+
+//for (i=(Kb+nrows) * Zc-5;i<(Kb+nrows) * Zc;i++)
+ //  printf("esimated_output[%d]=%d\n",i,esimated_output[i]);  
+  
+     //count errors
+     for (i=0;i<(Kb+nrows) * Zc;i++) 
+       {
+          if (esimated_output[i] != channel_input[i]) 
+            {
+               *errors = (*errors) + 1;
+               break;
+            }
+
+       }  
+    
+     free(channel_input);
+     free(modulated_input);  
+     free(channel_output); 
+     free(channel_output_fixed); 
+*/
+   }
+  
+ return *errors;
+
+}
+
+//#define NTRIALS 10000
+#define NTRIALS 30
+
+int main(int argc, char *argv[])
+{
+  
+  unsigned int errors,crc_misses;
+  short block_length=22*384;
+  short No_iteration=25;
+  double rate=0.667;
+  double SNR,SNR_lin;
+  unsigned char qbits;  
+  
+  int i=0;
+
+  randominit(0);  
+
+  if (argc>1)
+    qbits = atoi(argv[1]);
+  else
+    qbits = 4;  
+
+  unsigned int decoded_errors[100]; // initiate the size of matrix equivalent to size of SNR
+  for (SNR=-2.1; SNR<-2; SNR+=.1) 
+   {
+
+       SNR_lin = pow(10,SNR/10);
+  
+       decoded_errors[i]=test_ldpc(No_iteration,
+		      rate,		     
+		      SNR_lin,   // noise standard deviation
+		      qbits,
+		      block_length,   // block length bytes
+		      NTRIALS,
+		      &errors,
+		      &crc_misses);
+
+       printf("SNR %f, BLER %f (%d/%d)\n",SNR,(float)decoded_errors[i]/(float)NTRIALS,decoded_errors[i],NTRIALS);
+
+       i=i+1;   
+   }
+
+  return(0);
+
+}
+
+

openair1/PHY/CODING/defs.h

@@ -571,4 +571,7 @@ uint32_t crcbit (uint8_t * ,
 int16_t reverseBits(int32_t ,int32_t);
 void phy_viterbi_dot11(int8_t *,uint8_t *,uint16_t);
 
+short *ldpc_decoder(short *msgChannel,short block_length,short No_iteration,double rate);
+short *ldpc_encoder(char *test_input,char* channel_input,short block_length,double rate);
+
 #endif

openair1/SIMULATION/TOOLS/rangen_double.c

@@ -44,7 +44,7 @@ void randominit(unsigned seed_init)
 {
   int i;
   // this need to be integrated with the existing rng, like taus: navid
-  msg("Initializing random number generator, seed %x\n",seed_init);
+  //msg("Initializing random number generator, seed %x\n",seed_init);
 
   if (seed_init == 0) {
     srand((unsigned)time(NULL));

openair2/ENB_APP/MESSAGES/V2/config_common.proto

-//'syntax = "proto2";'
+syntax = "proto2";
 package protocol;
 
 //

openair2/ENB_APP/MESSAGES/V2/config_messages.proto

-//'syntax = "proto2";'
+syntax = "proto2";
 package protocol;
 
 import "config_common.proto";

openair2/ENB_APP/MESSAGES/V2/control_delegation.proto

-//'syntax = "proto2";'
+syntax = "proto2";
 package protocol;
 
 enum flex_control_delegation_type {

openair2/ENB_APP/MESSAGES/V2/controller_commands.proto

+syntax = "proto2";
 package protocol;
 
 import "mac_primitives.proto";

openair2/ENB_APP/MESSAGES/V2/flexran.proto

-//'syntax = "proto2";' 
+syntax = "proto2";
 package protocol;
 
 import "stats_messages.proto";
@@ -40,7 +40,7 @@ enum flexran_direction {
 }
 	
 enum flexran_err {
-        option allow_alias = true;
+        //option allow_alias = true;
 	// message errors
 	NO_ERR = 0;	
 	MSG_DEQUEUING = -1;

openair2/ENB_APP/MESSAGES/V2/header.proto

+syntax = "proto2";
 package protocol;
 
 message flex_header {

openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto

+syntax = "proto2";
 package protocol;
 
 //

openair2/ENB_APP/MESSAGES/V2/stats_common.proto

+syntax = "proto2";
 package protocol;
 
 //

openair2/ENB_APP/MESSAGES/V2/stats_messages.proto

+syntax = "proto2";
 package protocol;
 
 //import "header.proto";

openair2/ENB_APP/MESSAGES/V2/time_common.proto

+syntax = "proto2";
 package protocol;
 
 enum flex_harq_status {