Skip to content

O
OpenXG-RAN
Commit 7aad1584 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

removed logging

parent 59c4ddef
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
View file @ 7aad1584
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h" #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
#include "PHY/TOOLS/time_meas.h" #include "PHY/TOOLS/time_meas.h"
#define SHOWCOMP 1
int8_t polar_decoder( int8_t polar_decoder(
double *input, double *input,
...@@ -125,8 +126,8 @@ int8_t polar_decoder( ...@@ -125,8 +126,8 @@ int8_t polar_decoder(
for (uint8_t i = 0; i < 2*listSize; i++) sorted_dlist[i] = &dlist[i]; for (uint8_t i = 0; i < 2*listSize; i++) sorted_dlist[i] = &dlist[i];
for (uint16_t currentBit=0; currentBit<polarParams->N; currentBit++){ for (uint16_t currentBit=0; currentBit<polarParams->N; currentBit++){
printf("***************** BIT %d (currentListSize %d, information_bit_pattern %d)\n", // printf("***************** BIT %d (currentListSize %d, information_bit_pattern %d)\n",
currentBit,currentListSize,polarParams->information_bit_pattern[currentBit]); // currentBit,currentListSize,polarParams->information_bit_pattern[currentBit]);
start_meas(update_LLR); start_meas(update_LLR);
updateLLR(sorted_dlist, llrUpdated, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr); updateLLR(sorted_dlist, llrUpdated, bitUpdated, currentListSize, currentBit, 0, polarParams->N, (polarParams->n+1), pathMetricAppr);
...@@ -154,9 +155,6 @@ int8_t polar_decoder( ...@@ -154,9 +155,6 @@ int8_t polar_decoder(
start_meas(sorting); start_meas(sorting);
for (int i=0;i<currentListSize;i++) {
printf("sorted_dlist[%d] pathmetric %f\n",i,32*sorted_dlist[i]->pathMetric);
}
if (currentListSize <= listSize/2) { if (currentListSize <= listSize/2) {
// until listsize is full we need to copy bit and LLR arrays to new entries // until listsize is full we need to copy bit and LLR arrays to new entries
// below we only copy the ones we need to keep for sure // below we only copy the ones we need to keep for sure
...@@ -195,7 +193,6 @@ int8_t polar_decoder( ...@@ -195,7 +193,6 @@ int8_t polar_decoder(
// copy the llr/bit arrays that are needed // copy the llr/bit arrays that are needed
for (int i = 0; i < listSize; i++) { for (int i = 0; i < listSize; i++) {
printf("listIndex[%d] %d\n",i,listIndex[i]);
if ((listIndex2[i+listSize]<listSize) && (listIndex2[i]<listSize)) { // both '0' and '1' path metrics are to be kept if ((listIndex2[i+listSize]<listSize) && (listIndex2[i]<listSize)) { // both '0' and '1' path metrics are to be kept
// do memcpy of LLR and Bit arrays // do memcpy of LLR and Bit arrays
...@@ -512,6 +509,9 @@ int8_t polar_decoder_int8(int16_t *input, ...@@ -512,6 +509,9 @@ int8_t polar_decoder_int8(int16_t *input,
currentBit, currentBit,
currentListSize, currentListSize,
listSize); listSize);
#ifdef SHOWCOMP
printf("decoder_int8_C(sorted_dlist,polarParams,%d,%d,%d);\n",currentBit,currentListSize,listSize);
#endif
currentListSize = listSize; currentListSize = listSize;
} }
......
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
View file @ 7aad1584
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h" #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
//#define SHOWCOMP 1 #define SHOWCOMP 1
inline void computeLLR(double llr[1+nmax][Nmax], uint16_t row, uint16_t col, inline void computeLLR(double llr[1+nmax][Nmax], uint16_t row, uint16_t col,
uint16_t offset, uint8_t approximation) __attribute__((always_inline)); uint16_t offset, uint8_t approximation) __attribute__((always_inline));
...@@ -45,9 +45,9 @@ inline void computeLLR(double llr[1+nmax][Nmax], uint16_t row, uint16_t col, ...@@ -45,9 +45,9 @@ inline void computeLLR(double llr[1+nmax][Nmax], uint16_t row, uint16_t col,
// printf("LLR (a %f, b %f): llr[%d][%d] %f\n",32*a,32*b,col,row,32*llr[col][row]); // printf("LLR (a %f, b %f): llr[%d][%d] %f\n",32*a,32*b,col,row,32*llr[col][row]);
} }
inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t col, inline void computeLLR_int8(decoder_list_int8_t **dlist,int i, uint16_t row, uint16_t col,
uint16_t offset) __attribute__((always_inline)); uint16_t offset) __attribute__((always_inline));
inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t col, inline void computeLLR_int8(decoder_list_int8_t **dlist,int i, uint16_t row, uint16_t col,
uint16_t offset) { uint16_t offset) {
int16_t a; int16_t a;
...@@ -55,12 +55,13 @@ inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t co ...@@ -55,12 +55,13 @@ inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t co
int16_t absA,absB; int16_t absA,absB;
int16_t maska,maskb; int16_t maska,maskb;
int16_t minabs; int16_t minabs;
// int16_t **llr=dlist[i]->llr;
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("computeLLR_int8(llr,%d,%d,%d);\n",row,col,offset); printf("computeLLR_int8(sorted_dlist,%d,%d,%d);\n",i,row,col,offset);
#endif #endif
a = llr[col + 1][row]; a = dlist[i]->llr[col + 1][row];
b = llr[col+1][row + offset]; b = dlist[i]->llr[col+1][row + offset];
// printf("LLR: a %d, b %d\n",a,b); // printf("LLR: a %d, b %d\n",a,b);
maska = a>>15; maska = a>>15;
maskb = b>>15; maskb = b>>15;
...@@ -69,9 +70,9 @@ inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t co ...@@ -69,9 +70,9 @@ inline void computeLLR_int8(int16_t llr[1+nmax][Nmax], uint16_t row, uint16_t co
// printf("LLR: absA %d, absB %d\n",absA,absB); // printf("LLR: absA %d, absB %d\n",absA,absB);
minabs = absA<absB ? absA : absB; minabs = absA<absB ? absA : absB;
if ((maska^maskb) == 0) if ((maska^maskb) == 0)
llr[col][row] = minabs; dlist[i]->llr[col][row] = minabs;
else else
llr[col][row] = -minabs; dlist[i]->llr[col][row] = -minabs;
// printf("LLR (a %d, b %d): llr[%d][%d] %d\n",a,b,col,row,llr[col][row]); // printf("LLR (a %d, b %d): llr[%d][%d] %d\n",a,b,col,row,llr[col][row]);
} }
...@@ -109,7 +110,7 @@ void updateLLR_int8(decoder_list_int8_t **dlist,uint8_t **llrU, uint8_t **bitU, ...@@ -109,7 +110,7 @@ void updateLLR_int8(decoder_list_int8_t **dlist,uint8_t **llrU, uint8_t **bitU,
for (uint8_t i=0; i<listSize; i++) { for (uint8_t i=0; i<listSize; i++) {
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updateLLR_int8_A(dlist,%d,%d,%d,%d);\n",i,row,col,offset); printf("updateLLR_int8_A(sorted_dlist,%d,%d,%d,%d);\n",i,row,col,offset);
#endif #endif
updateLLR_int8_A(dlist,i,col,row,offset); updateLLR_int8_A(dlist,i,col,row,offset);
/* /*
...@@ -121,7 +122,7 @@ void updateLLR_int8(decoder_list_int8_t **dlist,uint8_t **llrU, uint8_t **bitU, ...@@ -121,7 +122,7 @@ void updateLLR_int8(decoder_list_int8_t **dlist,uint8_t **llrU, uint8_t **bitU,
} else { } else {
if (llrU[row][col+1]==0) updateLLR_int8(dlist, llrU, bitU, listSize, row, (col+1), xlen, ylen); if (llrU[row][col+1]==0) updateLLR_int8(dlist, llrU, bitU, listSize, row, (col+1), xlen, ylen);
if (llrU[row+offset][col+1]==0) updateLLR_int8(dlist, llrU, bitU, listSize, (row+offset), (col+1), xlen, ylen); if (llrU[row+offset][col+1]==0) updateLLR_int8(dlist, llrU, bitU, listSize, (row+offset), (col+1), xlen, ylen);
for (int i=0;i<listSize;i++) computeLLR_int8(dlist[i]->llr, row, col, offset); for (int i=0;i<listSize;i++) computeLLR_int8(dlist,i, row, col, offset);
} }
llrU[row][col]=1; llrU[row][col]=1;
...@@ -157,7 +158,7 @@ void updateBit_int8(decoder_list_int8_t **dlist, uint8_t **bitU, uint8_t listSiz ...@@ -157,7 +158,7 @@ void updateBit_int8(decoder_list_int8_t **dlist, uint8_t **bitU, uint8_t listSiz
if (bitU[row][col-1]==0) updateBit_int8(dlist, bitU, listSize, row, (col-1), xlen, ylen); if (bitU[row][col-1]==0) updateBit_int8(dlist, bitU, listSize, row, (col-1), xlen, ylen);
// dlist[i]->bit[col][row] = dlist[i]->bit[col-1][row]; // dlist[i]->bit[col][row] = dlist[i]->bit[col-1][row];
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updateBit_int8_A(dlist,%d,%d,%d);\n",i,col,row); printf("updateBit_int8_A(sorted_dlist,%d,%d,%d);\n",i,col,row);
#endif #endif
updateBit_int8_A(dlist,i,col,row); updateBit_int8_A(dlist,i,col,row);
...@@ -167,7 +168,7 @@ void updateBit_int8(decoder_list_int8_t **dlist, uint8_t **bitU, uint8_t listSiz ...@@ -167,7 +168,7 @@ void updateBit_int8(decoder_list_int8_t **dlist, uint8_t **bitU, uint8_t listSiz
// dlist[i]->bit[col][row] = dlist[i]->bit[col-1][row]^dlist[i]->bit[col-1][row+offset]; // dlist[i]->bit[col][row] = dlist[i]->bit[col-1][row]^dlist[i]->bit[col-1][row+offset];
// printf("updating dlist[%d]->bit[%d][%d] => %d\n",i,col,row,dlist[i]->bit[col][row]); // printf("updating dlist[%d]->bit[%d][%d] => %d\n",i,col,row,dlist[i]->bit[col][row]);
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updateBit_int8_B(dlist,%d,%d,%d,%d);\n",i,col,row,offset); printf("updateBit_int8_B(sorted_dlist,%d,%d,%d,%d);\n",i,col,row,offset);
#endif #endif
updateBit_int8_B(dlist,i,col,row,offset); updateBit_int8_B(dlist,i,col,row,offset);
} }
...@@ -201,7 +202,7 @@ void updatePathMetric0_int8(decoder_list_int8_t **dlist,uint8_t listSize, uint16 ...@@ -201,7 +202,7 @@ void updatePathMetric0_int8(decoder_list_int8_t **dlist,uint8_t listSize, uint16
updatePathMetric0_int8_A(dlist,i,row,mask,absllr); updatePathMetric0_int8_A(dlist,i,row,mask,absllr);
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updatePathMetric0_int8_A(dlist,i,%d,%d);\n",listSize,row); printf("updatePathMetric0_int8_A(sorted_dlist,i,%d,%d);\n",listSize,row);
#endif #endif
...@@ -253,7 +254,7 @@ void updatePathMetric2_int8(decoder_list_int8_t **dlist, uint8_t listSize, uint1 ...@@ -253,7 +254,7 @@ void updatePathMetric2_int8(decoder_list_int8_t **dlist, uint8_t listSize, uint1
for (i = 0; i < listSize; i++) { for (i = 0; i < listSize; i++) {
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updatePathMetric2_int8_A(dlist,%d,%d,%d);\n", printf("updatePathMetric2_int8_A(sorted_dlist,%d,%d,%d);\n",
i,listSize,row); i,listSize,row);
#endif #endif
updatePathMetric2_int8_A(dlist,i,listSize,row); updatePathMetric2_int8_A(dlist,i,listSize,row);
...@@ -288,7 +289,7 @@ void updateCrcChecksum_int8(decoder_list_int8_t **dlist, uint8_t **crcGen, ...@@ -288,7 +289,7 @@ void updateCrcChecksum_int8(decoder_list_int8_t **dlist, uint8_t **crcGen,
uint8_t listSize, uint32_t i2, uint8_t len) { uint8_t listSize, uint32_t i2, uint8_t len) {
for (uint8_t i = 0; i < listSize; i++) { for (uint8_t i = 0; i < listSize; i++) {
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updateCrcChecksum_int8_A(dlist,%d,crcGen,%d,%d);\n",i,i2,len); printf("updateCrcChecksum_int8_A(sorted_dlist,%d,crcGen,%d,%d);\n",i,i2,len);
#endif #endif
updateCrcChecksum_int8_A(dlist,i,crcGen,i2,len); updateCrcChecksum_int8_A(dlist,i,crcGen,i2,len);
// for (uint8_t j = 0; j < len; j++) { // for (uint8_t j = 0; j < len; j++) {
...@@ -303,7 +304,7 @@ void updateCrcChecksum2_int8(decoder_list_int8_t **dlist, uint8_t **crcGen, ...@@ -303,7 +304,7 @@ void updateCrcChecksum2_int8(decoder_list_int8_t **dlist, uint8_t **crcGen,
uint8_t listSize, uint32_t i2, uint8_t len) { uint8_t listSize, uint32_t i2, uint8_t len) {
for (uint8_t i = 0; i < listSize; i++) { for (uint8_t i = 0; i < listSize; i++) {
#ifdef SHOWCOMP #ifdef SHOWCOMP
printf("updateCrcChecksum2_int8_A(dlist,%d,%d,crcGen,%d,%d);\n",i,listSize,i2,len); printf("updateCrcChecksum2_int8_A(sorted_dlist,%d,%d,crcGen,%d,%d);\n",i,listSize,i2,len);
#endif #endif
updateCrcChecksum2_int8_A(dlist,i,listSize,crcGen,i2,len); updateCrcChecksum2_int8_A(dlist,i,listSize,crcGen,i2,len);
// for (uint8_t j = 0; j < len; j++) { // for (uint8_t j = 0; j < len; j++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment