LDPC decoder generator cleanup

2022-01-19 23:01:27 +01:00
parent 8d164fe2aa
commit 1f9900ba61
24 changed files with 2107 additions and 98 deletions
@@ -1,65 +0,0 @@
-SNR BLER BER UNCODED_BER ENCODER_MEAN ENCODER_STD ENCODER_MAX DECODER_TIME_MEAN DECODER_TIME_STD DECODER_TIME_MAX DECODER_ITER_MEAN DECODER_ITER_STD DECODER_ITER_MAX
-2.000000 1.000000 0.346710 0.258207 43.602415 30.126226 341.472109 216.438613 10.939821 319.554933 5.000000 0.000000 5 
-1.900000 1.000000 0.344876 0.255716 41.206220 4.019975 56.843517 216.302939 3.270367 233.994957 5.000000 0.000000 5 
-1.800000 1.000000 0.342785 0.253097 40.851186 3.896434 56.430195 215.430289 4.428097 246.536045 5.000000 0.000000 5 
-1.700000 1.000000 0.340844 0.251049 40.901418 3.745278 64.127024 215.529577 4.618868 240.568501 5.000000 0.000000 5 
-1.600000 1.000000 0.339047 0.248977 41.431427 4.101305 57.556777 215.147073 3.634402 238.697868 5.000000 0.000000 5 
-1.500000 1.000000 0.336629 0.246285 41.620505 4.581042 57.739456 215.078678 3.846847 238.079346 5.000000 0.000000 5 
-1.400000 1.000000 0.335457 0.243642 41.387865 4.240439 57.124142 215.228245 3.647046 236.904668 5.000000 0.000000 5 
-1.300000 1.000000 0.332997 0.241009 41.443562 4.371919 57.671402 215.273786 3.292128 232.785466 5.000000 0.000000 5 
-1.200000 1.000000 0.330665 0.238534 40.812640 3.650784 56.246234 214.904536 3.893906 244.015660 5.000000 0.000000 5 
-1.100000 1.000000 0.329331 0.236302 40.565430 3.404037 56.668872 215.151626 4.975081 244.228979 5.000000 0.000000 5 
-1.000000 1.000000 0.326340 0.233799 40.984374 3.867443 58.055435 214.392230 2.357469 220.968495 5.000000 0.000000 5 
-0.900000 1.000000 0.324751 0.230838 40.863863 4.143883 64.125643 215.614137 5.189590 242.780171 5.000000 0.000000 5 
-0.800000 1.000000 0.321135 0.228471 40.470152 3.513784 57.612116 214.727859 3.845100 242.821632 5.000000 0.000000 5 
-0.700000 1.000000 0.318744 0.225573 41.309409 4.026191 57.778096 214.920451 4.535966 242.414953 5.000000 0.000000 5 
-0.600000 1.000000 0.316129 0.222700 41.204626 3.124997 56.968813 215.387771 4.057238 237.436606 5.000000 0.000000 5 
-0.500000 1.000000 0.314128 0.220380 40.765115 3.394491 56.267980 215.377921 4.069656 240.466822 5.000000 0.000000 5 
-0.400000 1.000000 0.310958 0.218014 41.093157 4.003835 59.711327 215.239180 3.327907 234.288949 5.000000 0.000000 5 
-0.300000 1.000000 0.304918 0.214796 41.797207 4.146920 57.898771 216.063740 3.695298 241.591743 5.000000 0.000000 5 
-0.200000 1.000000 0.303232 0.212273 41.030377 3.715740 56.810498 214.633968 3.459259 236.183440 5.000000 0.000000 5 
-0.100000 1.000000 0.298946 0.209960 40.968387 3.286066 56.947886 214.652174 3.930641 239.869339 5.000000 0.000000 5 
-0.000000 1.000000 0.294872 0.207036 40.536720 2.548956 56.696602 214.365610 3.293869 234.367863 5.000000 0.000000 5 
-0.100000 1.000000 0.288568 0.204592 40.484272 3.071800 57.461835 214.472268 3.512439 239.158665 5.000000 0.000000 5 
-0.200000 1.000000 0.282018 0.201547 40.681261 3.278471 55.951967 214.294295 3.840460 243.284465 5.000000 0.000000 5 
-0.300000 1.000000 0.279144 0.198894 40.435529 2.499194 56.196889 214.494088 4.754185 243.060995 5.000000 0.000000 5 
-0.400000 1.000000 0.272107 0.196146 40.439310 2.236700 56.900807 214.233221 2.429697 221.554971 5.000000 0.000000 5 
-0.500000 1.000000 0.264304 0.193699 40.079304 2.102994 56.885928 215.212068 2.867987 222.409413 5.000000 0.000000 5 
-0.600000 1.000000 0.254976 0.190952 40.938251 2.319068 57.553216 215.858396 3.257873 223.568005 5.000000 0.000000 5 
-0.700000 1.000000 0.249426 0.188038 41.563554 3.790154 57.245468 214.607164 2.598470 222.620303 5.000000 0.000000 5 
-0.800000 1.000000 0.236938 0.185676 40.644131 3.390736 56.250863 214.787514 3.016321 224.174840 5.000000 0.000000 5 
-0.900000 1.000000 0.224528 0.182548 41.177649 3.753531 57.657192 214.638930 3.869935 242.175272 5.000000 0.000000 5 
-1.000000 1.000000 0.212635 0.179447 41.573615 4.514914 56.159346 214.699737 3.876814 241.176210 5.000000 0.000000 5 
-1.100000 1.000000 0.201210 0.177071 41.261829 3.264320 56.243301 214.951544 2.847856 222.583377 5.000000 0.000000 5 
-1.200000 1.000000 0.183951 0.174506 41.683136 3.591689 56.992613 214.584652 3.373178 234.362666 5.000000 0.000000 5 
-1.300000 1.000000 0.173395 0.171834 40.814328 3.204918 56.758830 215.230164 3.553699 238.588538 5.000000 0.000000 5 
-1.400000 1.000000 0.152049 0.168623 41.412958 4.196153 57.855401 215.104553 3.855987 238.806435 5.000000 0.000000 5 
-1.500000 1.000000 0.137067 0.165760 40.865453 2.472355 57.692788 215.112473 2.817110 222.469712 5.000000 0.000000 5 
-1.600000 1.000000 0.119800 0.162857 41.340190 3.443653 56.853505 215.173558 2.871523 223.737602 5.000000 0.000000 5 
-1.700000 1.000000 0.105374 0.160314 41.913044 4.326664 61.356272 215.168234 3.325743 234.564531 5.000000 0.000000 5 
-1.800000 1.000000 0.089974 0.157458 40.750192 2.697542 57.266120 214.802052 3.061822 232.936883 5.000000 0.000000 5 
-1.900000 1.000000 0.077899 0.154930 40.986799 3.782287 56.577477 214.970573 3.337138 232.486819 5.000000 0.000000 5 
-2.000000 1.000000 0.064498 0.151912 40.973867 3.733968 57.266469 214.460835 4.009518 245.990164 5.000000 0.000000 5 
-2.100000 1.000000 0.055153 0.149119 41.501986 4.068195 58.938014 215.028530 4.322608 242.986899 5.000000 0.000000 5 
-2.200000 1.000000 0.043084 0.146548 40.912591 3.140756 56.434856 215.261084 2.631197 222.724293 5.000000 0.000000 5 
-2.300000 1.000000 0.032169 0.143665 40.804191 2.644521 55.770242 215.134604 4.499185 240.916434 5.000000 0.000000 5 
-2.400000 1.000000 0.025889 0.141218 41.065216 2.783687 57.783689 214.520582 3.945613 238.811603 5.000000 0.000000 5 
-2.500000 1.000000 0.019264 0.138524 41.211270 2.448662 57.622551 214.922236 2.973268 230.669525 5.000000 0.000000 5 
-2.600000 1.000000 0.013900 0.135256 40.354411 2.250096 55.698937 214.996483 3.189890 234.888937 5.000000 0.000000 5 
-2.700000 1.000000 0.009590 0.132552 41.244662 3.881499 56.758825 214.759792 3.247172 234.516795 5.000000 0.000000 5 
-2.800000 1.000000 0.006381 0.129862 41.636845 4.629420 56.879917 215.118519 4.535658 246.588967 5.000000 0.000000 5 
-2.900000 1.000000 0.004505 0.127161 41.056717 3.728615 56.343533 215.634561 3.446083 235.626106 5.000000 0.000000 5 
-3.000000 1.000000 0.003107 0.124625 41.763560 4.761839 62.852163 214.987054 4.100187 244.479813 5.000000 0.000000 5 
-3.100000 1.000000 0.001585 0.121596 41.488940 3.655265 56.817517 215.049416 3.036645 231.524449 5.000000 0.000000 5 
-3.200000 0.990000 0.000884 0.119036 41.899580 4.667199 62.415123 215.081178 3.177671 232.511648 5.000000 0.000000 5 
-3.300000 0.980000 0.000665 0.116153 41.752611 3.754668 57.178144 215.574362 3.084230 229.518521 5.000000 0.000000 5 
-3.400000 0.790000 0.000277 0.113482 41.601818 3.333514 55.861571 215.582128 3.219449 226.902719 5.000000 0.000000 5 
-3.500000 0.700000 0.000179 0.111022 42.147840 4.133196 57.255484 215.854669 3.893844 242.048395 5.000000 0.000000 5 
-3.600000 0.410000 0.000069 0.108080 40.747050 3.759419 63.745698 215.804914 2.568863 222.540313 5.000000 0.000000 5 
-3.700000 0.370000 0.000060 0.105610 41.386558 3.815417 56.528228 215.889033 2.973628 224.110377 5.000000 0.000000 5 
-3.800000 0.130000 0.000019 0.103046 41.389957 3.987060 57.528132 216.368785 3.604357 233.239650 5.000000 0.000000 5 
-3.900000 0.110000 0.000013 0.100373 41.026006 2.726123 56.144907 216.842031 4.984859 241.533824 5.000000 0.000000 5 
-4.000000 0.040000 0.000005 0.097515 41.535921 3.298320 56.226860 216.230174 3.561244 238.655176 5.000000 0.000000 5 
-4.100000 0.020000 0.000002 0.095597 41.107849 2.874834 55.301615 216.417801 3.911892 236.928735 5.000000 0.000000 5 
-4.200000 0.010000 0.000001 0.091987 40.473716 2.580630 55.248263 216.739394 4.297853 245.792709 5.000000 0.000000 5 
-4.300000 0.000000 0.000000 0.090448 40.613263 2.726066 56.542856 217.487654 4.100344 239.897164 5.000000 0.000000 5 
@@ -494,11 +494,7 @@ if (BG==1)

    // First iteration finished

-<<<<<<< HEAD
-    while ( (i < (numMaxIter-1)) && (pcRes != 0) )
-=======
    while ( (i < numMaxIter) && (pcRes != 0) )
->>>>>>> 74ce2cf4be34a6c62ea74116c4b1c45d3cbf1536
    {
        // Increase iteration counter
        i++;
@@ -1,5 +1,5 @@
 C=gcc
-CFLAGS=-W -Wall -mavx2
+CFLAGS=-W -Wall -mavx2 -DCODEGEN=1
 LDFLAGS=
 EXEC=bnProc_gen_avx2
 SRC= $(wildcard *.c)
@@ -13,7 +13,7 @@ bnProc_gen_avx2: $(OBJ)


 %.o: %.c
-	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -g -std=c99  
+	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -I ${OPENAIR_HOME}/common/utils -I ${OPENAIR_HOME}/common/utils/T -I ${OPENAIR_HOME}/openair2/COMMON -g -std=c99  

 .PHONY: clean mrproper

@@ -1,9 +1,6 @@
-
-
-
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
-#include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
 #include "../../nrLDPC_types.h"

@@ -17,7 +14,7 @@ void nrLDPC_bnProcPc_BG1_generator_AVX2(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bnProcPc/nrLDPC_bnProcPc_BG1_R%s_AVX2.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -1,4 +1,5 @@
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -14,7 +15,7 @@ void nrLDPC_bnProc_BG1_generator_AVX2(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bnProc/nrLDPC_bnProc_BG1_R%s_AVX2.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,7 +1,6 @@
-
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
-#include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
 #include "../../nrLDPC_types.h"

@@ -1,5 +1,5 @@
 C=gcc
-CFLAGS=-W -Wall -mavx2
+CFLAGS=-W -Wall -mavx2 -DCODEGEN=1
 LDFLAGS=
 EXEC=bnProc_gen_avx512
 SRC= $(wildcard *.c)
@@ -13,7 +13,7 @@ bnProc_gen_avx512: $(OBJ)


 %.o: %.c
-	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -g -std=c99  
+	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -I ${OPENAIR_HOME}/common/utils -I ${OPENAIR_HOME}/common/utils/T -I ${OPENAIR_HOME}/openair2/COMMON -g -std=c99  

 .PHONY: clean mrproper

@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -13,7 +15,7 @@ void nrLDPC_bnProcPc_BG1_generator_AVX512(int R)



-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bn_avx512/nrLDPC_bnProcPc_BG1_R%s_AVX512.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,6 +1,5 @@
-
-
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -16,7 +15,7 @@ void nrLDPC_bnProcPc_BG2_generator_AVX512(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bn_avx512/nrLDPC_bnProcPc_BG2_R%s_AVX512.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,4 +1,5 @@
-
+#include <stdlib.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -14,7 +15,7 @@ void nrLDPC_bnProc_BG1_generator_AVX512(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bnProc_avx512/nrLDPC_bnProc_BG1_R%s_AVX512.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <immintrin.h>
 #include "../../nrLDPCdecoder_defs.h"
@@ -13,7 +15,7 @@ void nrLDPC_bnProc_BG2_generator_AVX512(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/bnProc_avx512/nrLDPC_bnProc_BG2_R%s_AVX512.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,5 +1,5 @@
 C=gcc
-CFLAGS=-W -Wall -mavx2
+CFLAGS=-W -Wall -mavx2 -DCODEGEN=1
 LDFLAGS=
 EXEC=cnProc_gen_avx2
 SRC= $(wildcard *.c)
@@ -13,7 +13,7 @@ cnProc_gen_avx2: $(OBJ)
 #main.o: cnProc_gen_avx2.h

 %.o: %.c
-	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -g -std=c99  
+	@$(CC) -o $@ -c $< $(CFLAGS) -I ${OPENAIR_HOME}/openair1 -I ${OPENAIR_HOME} -I ${OPENAIR_HOME}/common/utils -I ${OPENAIR_HOME}/common/utils/T -I ${OPENAIR_HOME}/openair2/COMMON -std=c99   

 .PHONY: clean mrproper

@@ -1,5 +1,6 @@
+#include <stdio.h>
 #include <stdint.h>
-#include <immintrin.h>
+#include <stdlib.h>
 #include "../../nrLDPCdecoder_defs.h"
 #include "../../nrLDPC_types.h"                                                                                           
 #include "../../nrLDPC_bnProc.h"
@@ -14,7 +15,7 @@ void nrLDPC_cnProc_BG2_generator_AVX2(int R)

 //  system("mkdir -p ldpc_gen_files/avx2");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/cnProc/nrLDPC_cnProc_BG2_R%s_AVX2.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include "../../nrLDPCdecoder_defs.h"

 void nrLDPC_cnProc_BG1_generator_AVX512(int R)
@@ -11,7 +12,7 @@ void nrLDPC_cnProc_BG1_generator_AVX512(int R)

 // system("mkdir -p ../ldpc_gen_files");

-  char fname[50];
+  char fname[500];
  sprintf(fname,"../ldpc_gen_files/cnProc_avx512/nrLDPC_cnProc_BG1_R%s_AVX512.h",ratestr[R]);
  FILE *fd=fopen(fname,"w");
  if (fd == NULL) {printf("Cannot create \n");abort();}
@@ -30,7 +30,9 @@

 #ifndef __NR_LDPC_TYPES__H__
 #define __NR_LDPC_TYPES__H__
+#ifndef CODEGEN
 #include "../../TOOLS/time_meas.h"
+#endif
 #include "nrLDPCdecoder_defs.h"
 // ==============================================================================
 // TYPES
@@ -76,6 +78,7 @@ typedef struct nrLDPC_dec_params {
 /**
   Structure containing LDPC decoder processing time statistics.
 */
+#ifndef CODEGEN
 typedef struct nrLDPC_time_stats {
    time_stats_t llr2llrProcBuf; /**< Statistics for function llr2llrProcBuf */
    time_stats_t llr2CnProcBuf; /**< Statistics for function llr2CnProcBuf */
@@ -89,7 +92,7 @@ typedef struct nrLDPC_time_stats {
    time_stats_t llr2bit; /**< Statistics for function llr2bit */
    time_stats_t total; /**< Statistics for total processing time */
 } t_nrLDPC_time_stats;
-
+#endif
 /**
   Structure containing the processing buffers
 */