5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solve Issue 1: Invalid read in LDPC AVX2 Encoder/Decoder

Browse Source
master
Jesus Gomez 4 years ago committed by Andre Puschmann
parent d014a89cfb
commit c9cdb0d53c
6 changed files with 76 additions and 58 deletions
Show Stats Download Patch File Download Diff File

26
lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long.c
Unescape Escape View File

@ -75,9 +75,12 @@ struct ldpc_regs_c_avx2long {
bg_node_t* soft_bits; /*!< \brief A-posteriori log-likelihood ratios. */ bg_node_t* soft_bits; /*!< \brief A-posteriori log-likelihood ratios. */
__m256i* check_to_var; /*!< \brief Check-to-variable messages. */ __m256i* check_to_var; /*!< \brief Check-to-variable messages. */
__m256i* var_to_check; /*!< \brief Variable-to-check messages. */ __m256i* var_to_check; /*!< \brief Variable-to-check messages. */
__m256i* var_to_check_to_free; /*!< \brief the Variable-to-check messages with one extra _mm256 allocated space. */
__m256i* rotated_v2c; /*!< \brief To store a rotated version of the variable-to-check messages. */ __m256i* rotated_v2c; /*!< \brief To store a rotated version of the variable-to-check messages. */
__m256i* this_c2v_epi8; /*!< \brief Helper register for the current c2v node. */ __m256i* this_c2v_epi8; /*!< \brief Helper register for the current c2v node. */
__m256i* this_c2v_epi8_to_free; /*!< \brief Helper register for the current c2v node with one extra __m256 allocated
space. */
__m256i* minp_v2c_epi8; /*!< \brief Helper register for the minimum v2c message. */ __m256i* minp_v2c_epi8; /*!< \brief Helper register for the minimum v2c message. */
__m256i* mins_v2c_epi8; /*!< \brief Helper register for the second minimum v2c message. */ __m256i* mins_v2c_epi8; /*!< \brief Helper register for the second minimum v2c message. */
__m256i* prod_v2c_epi8; /*!< \brief Helper register for the sign of the product of all v2c messages. */ __m256i* prod_v2c_epi8; /*!< \brief Helper register for the sign of the product of all v2c messages. */
@ -153,15 +156,16 @@ void* create_ldpc_dec_c_avx2long(uint8_t bgN, uint8_t bgM, uint16_t ls, float sc
return NULL; return NULL;
} }
if ((vp->var_to_check = srslte_vec_malloc((hrr + 1) * n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->var_to_check_to_free = srslte_vec_malloc(((hrr + 1) * n_subnodes + 2) * sizeof(__m256i))) == NULL) {
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
return NULL; return NULL;
} }
vp->var_to_check = &vp->var_to_check_to_free[1];
if ((vp->minp_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->minp_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
@ -170,7 +174,7 @@ void* create_ldpc_dec_c_avx2long(uint8_t bgN, uint8_t bgM, uint16_t ls, float sc
if ((vp->mins_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->mins_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
@ -180,7 +184,7 @@ void* create_ldpc_dec_c_avx2long(uint8_t bgN, uint8_t bgM, uint16_t ls, float sc
if ((vp->prod_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->prod_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
@ -191,7 +195,7 @@ void* create_ldpc_dec_c_avx2long(uint8_t bgN, uint8_t bgM, uint16_t ls, float sc
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
@ -203,25 +207,27 @@ void* create_ldpc_dec_c_avx2long(uint8_t bgN, uint8_t bgM, uint16_t ls, float sc
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
return NULL; return NULL;
} }
if ((vp->this_c2v_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->this_c2v_epi8_to_free = srslte_vec_malloc((n_subnodes + 2) * sizeof(__m256i))) == NULL) {
free(vp->rotated_v2c); free(vp->rotated_v2c);
free(vp->min_ix_epi8); free(vp->min_ix_epi8);
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);
return NULL; return NULL;
} }
vp->this_c2v_epi8 =
&vp->this_c2v_epi8_to_free[1]; //+1 to support reading negative position in this_c2v_epi8 at rotate_node_rigth
vp->bgM = bgM; vp->bgM = bgM;
vp->bgN = bgN; vp->bgN = bgN;
@ -240,13 +246,13 @@ void delete_ldpc_dec_c_avx2long(void* p)
struct ldpc_regs_c_avx2long* vp = p; struct ldpc_regs_c_avx2long* vp = p;
if (vp != NULL) { if (vp != NULL) {
free(vp->this_c2v_epi8); free(vp->this_c2v_epi8_to_free);
free(vp->rotated_v2c); free(vp->rotated_v2c);
free(vp->min_ix_epi8); free(vp->min_ix_epi8);
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp); free(vp);

25
lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long_flood.c
Unescape Escape View File

@ -76,9 +76,12 @@ struct ldpc_regs_c_avx2long_flood {
__m256i* llrs; /*!< \brief A-priori log-likelihood ratios. */ __m256i* llrs; /*!< \brief A-priori log-likelihood ratios. */
__m256i* check_to_var; /*!< \brief Check-to-variable messages. */ __m256i* check_to_var; /*!< \brief Check-to-variable messages. */
__m256i* var_to_check; /*!< \brief Variable-to-check messages. */ __m256i* var_to_check; /*!< \brief Variable-to-check messages. */
__m256i* var_to_check_to_free; /*!< \brief Auxiliar variable-to-check messages, with 2 extra __m256 space. */
__m256i* rotated_v2c; /*!< \brief To store a rotated version of the variable-to-check messages. */ __m256i* rotated_v2c; /*!< \brief To store a rotated version of the variable-to-check messages. */
__m256i* this_c2v_epi8; /*!< \brief Helper register for the current c2v node. */ __m256i* this_c2v_epi8; /*!< \brief Helper register for the current c2v node. */
__m256i*
this_c2v_epi8_to_free; /*!< \brief Auxiliar helper register for the current c2v node, with 2 extra _mm256 space */
__m256i* minp_v2c_epi8; /*!< \brief Helper register for the minimum v2c message. */ __m256i* minp_v2c_epi8; /*!< \brief Helper register for the minimum v2c message. */
__m256i* mins_v2c_epi8; /*!< \brief Helper register for the second minimum v2c message. */ __m256i* mins_v2c_epi8; /*!< \brief Helper register for the second minimum v2c message. */
__m256i* prod_v2c_epi8; /*!< \brief Helper register for the sign of the product of all v2c messages. */ __m256i* prod_v2c_epi8; /*!< \brief Helper register for the sign of the product of all v2c messages. */
@ -160,16 +163,17 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
return NULL; return NULL;
} }
if ((vp->var_to_check = srslte_vec_malloc((hrr + 1) * bgM * n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->var_to_check_to_free = srslte_vec_malloc(((hrr + 1) * bgM * n_subnodes + 2) * sizeof(__m256i))) == NULL) {
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
free(vp); free(vp);
return NULL; return NULL;
} }
vp->var_to_check = &vp->var_to_check_to_free[1];
if ((vp->minp_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->minp_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
@ -179,7 +183,7 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
if ((vp->mins_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->mins_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
@ -190,7 +194,7 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
if ((vp->prod_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->prod_v2c_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
@ -202,7 +206,7 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
@ -215,7 +219,7 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
@ -223,19 +227,20 @@ void* create_ldpc_dec_c_avx2long_flood(uint8_t bgN, uint8_t bgM, uint16_t ls, fl
return NULL; return NULL;
} }
if ((vp->this_c2v_epi8 = srslte_vec_malloc(n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->this_c2v_epi8_to_free = srslte_vec_malloc((n_subnodes + 2) * sizeof(__m256i))) == NULL) {
free(vp->rotated_v2c); free(vp->rotated_v2c);
free(vp->min_ix_epi8); free(vp->min_ix_epi8);
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);
free(vp); free(vp);
return NULL; return NULL;
} }
vp->this_c2v_epi8 = &vp->this_c2v_epi8_to_free[1];
vp->bgM = bgM; vp->bgM = bgM;
vp->bgN = bgN; vp->bgN = bgN;
@ -254,13 +259,13 @@ void delete_ldpc_dec_c_avx2long_flood(void* p)
struct ldpc_regs_c_avx2long_flood* vp = p; struct ldpc_regs_c_avx2long_flood* vp = p;
if (vp != NULL) { if (vp != NULL) {
free(vp->this_c2v_epi8); free(vp->this_c2v_epi8_to_free);
free(vp->rotated_v2c); free(vp->rotated_v2c);
free(vp->min_ix_epi8); free(vp->min_ix_epi8);
free(vp->prod_v2c_epi8); free(vp->prod_v2c_epi8);
free(vp->mins_v2c_epi8); free(vp->mins_v2c_epi8);
free(vp->minp_v2c_epi8); free(vp->minp_v2c_epi8);
free(vp->var_to_check); free(vp->var_to_check_to_free);
free(vp->check_to_var); free(vp->check_to_var);
free(vp->soft_bits); free(vp->soft_bits);
free(vp->llrs); free(vp->llrs);

5
lib/src/phy/fec/ldpc/ldpc_decoder.c
Unescape Escape View File

@ -710,6 +710,11 @@ int srslte_ldpc_decoder_init(srslte_ldpc_decoder_t* q,
} }
q->var_indices = srslte_vec_malloc(q->bgM * sizeof(int8_t[MAX_CNCT])); q->var_indices = srslte_vec_malloc(q->bgM * sizeof(int8_t[MAX_CNCT]));
if (!q->var_indices) {
free(q->pcm);
perror("malloc");
return -1;
}
if (create_compact_pcm(q->pcm, q->var_indices, q->bg, q->ls) != 0) { if (create_compact_pcm(q->pcm, q->var_indices, q->bg, q->ls) != 0) {
perror("Create PCM"); perror("Create PCM");

21
lib/src/phy/fec/ldpc/ldpc_enc_avx2long.c
Unescape Escape View File

@ -57,9 +57,12 @@ typedef union bg_node_t {
*/ */
struct ldpc_enc_avx2long { struct ldpc_enc_avx2long {
bg_node_t* codeword; /*!< \brief Contains the entire codeword, before puncturing. */ bg_node_t* codeword; /*!< \brief Contains the entire codeword, before puncturing. */
bg_node_t* codeword_to_free; /*!< \brief Auxiliary pointer with a free memory of size CTTC_AVX2_B_SIZE previous to
codeword */
__m256i* aux; /*!< \brief Auxiliary register. */ __m256i* aux; /*!< \brief Auxiliary register. */
__m256i* rotated_node; /*!< \brief To store rotated versions of the nodes. */ __m256i* rotated_node; /*!< \brief To store rotated versions of the nodes. */
__m256i* rotated_node_to_free; /*!< \brief Auxiliary pointer to store rotated versions of the nodes with extra free
memory of size CTTC_AVX2_B_SIZE previous to rotated_node */
uint8_t n_subnodes; /*!< \brief Number of subnodes. */ uint8_t n_subnodes; /*!< \brief Number of subnodes. */
}; };
@ -86,25 +89,25 @@ void* create_ldpc_enc_avx2long(srslte_ldpc_encoder_t* q)
int left_out = q->ls % SRSLTE_AVX2_B_SIZE; int left_out = q->ls % SRSLTE_AVX2_B_SIZE;
vp->n_subnodes = q->ls / SRSLTE_AVX2_B_SIZE + (left_out > 0); vp->n_subnodes = q->ls / SRSLTE_AVX2_B_SIZE + (left_out > 0);
if ((vp->codeword = srslte_vec_malloc(q->bgN * vp->n_subnodes * sizeof(bg_node_t))) == NULL) { if ((vp->codeword_to_free = srslte_vec_malloc((q->bgN * vp->n_subnodes + 1) * sizeof(bg_node_t))) == NULL) {
free(vp); free(vp);
return NULL; return NULL;
} }
vp->codeword = &vp->codeword_to_free[1];
if ((vp->aux = srslte_vec_malloc(q->bgM * vp->n_subnodes * sizeof(__m256i))) == NULL) { if ((vp->aux = srslte_vec_malloc(q->bgM * vp->n_subnodes * sizeof(__m256i))) == NULL) {
free(vp->codeword); free(vp->codeword_to_free);
free(vp); free(vp);
return NULL; return NULL;
} }
// for some reason, the software stops with a segmentation fault when ls is a multiple of 32 if ((vp->rotated_node_to_free = srslte_vec_malloc((vp->n_subnodes + 2) * sizeof(__m256i))) == NULL) {
// if we don't add the extra block.
if ((vp->rotated_node = srslte_vec_malloc((vp->n_subnodes + 1) * sizeof(__m256i))) == NULL) {
free(vp->aux); free(vp->aux);
free(vp->codeword); free(vp->codeword_to_free);
free(vp); free(vp);
return NULL; return NULL;
} }
vp->rotated_node = &vp->rotated_node_to_free[1];
return vp; return vp;
} }
@ -114,9 +117,9 @@ void delete_ldpc_enc_avx2long(void* p)
struct ldpc_enc_avx2long* vp = p; struct ldpc_enc_avx2long* vp = p;
if (vp != NULL) { if (vp != NULL) {
free(vp->rotated_node); free(vp->rotated_node_to_free);
free(vp->aux); free(vp->aux);
free(vp->codeword); free(vp->codeword_to_free);
free(vp); free(vp);
} }
} }

3
lib/src/phy/fec/ldpc/test/CMakeLists.txt
Unescape Escape View File

@ -157,7 +157,8 @@ function(ldpc_rm_unit_tests)
endforeach() endforeach()
endforeach() endforeach()
endfunction() endfunction()
set(test_name LDPC-RM-BG1)
set(test_name LDPC-RM)
set(test_command ldpc_rm_test) set(test_command ldpc_rm_test)
ldpc_rm_unit_tests(${lifting_sizes}) ldpc_rm_unit_tests(${lifting_sizes})

8
lib/src/phy/fec/ldpc/test/ldpc_chain_test.c
Unescape Escape View File

@ -214,6 +214,9 @@ int main(int argc, char** argv)
uint32_t F = encoder.bgK - 5; // This value is arbitrary uint32_t F = encoder.bgK - 5; // This value is arbitrary
finalK = encoder.liftK;
finalN = encoder.liftN - 2 * lift_size;
if (rm_length == 0) { if (rm_length == 0) {
rm_length = finalN - F; rm_length = finalN - F;
} }
@ -235,9 +238,6 @@ int main(int argc, char** argv)
1.0 * (encoder.liftK - F) / rm_length); 1.0 * (encoder.liftK - F) / rm_length);
printf("\n Signal-to-Noise Ratio -> %.2f dB\n", snr); printf("\n Signal-to-Noise Ratio -> %.2f dB\n", snr);
finalK = encoder.liftK;
finalN = encoder.liftN - 2 * lift_size;
messages_true = malloc(finalK * batch_size * sizeof(uint8_t)); messages_true = malloc(finalK * batch_size * sizeof(uint8_t));
messages_sim_f = malloc(finalK * batch_size * sizeof(uint8_t)); messages_sim_f = malloc(finalK * batch_size * sizeof(uint8_t));
messages_sim_s = malloc(finalK * batch_size * sizeof(uint8_t)); messages_sim_s = malloc(finalK * batch_size * sizeof(uint8_t));
@ -315,8 +315,6 @@ int main(int argc, char** argv)
int n_useful_symbols = int n_useful_symbols =
(rm_length + F) % lift_size ? ((rm_length + F) / lift_size + 1) * lift_size : (rm_length + F); (rm_length + F) % lift_size ? ((rm_length + F) / lift_size + 1) * lift_size : (rm_length + F);
printf("n_useful_symbols = %d\n", n_useful_symbols);
// Encode messages // Encode messages
gettimeofday(&t[1], NULL); gettimeofday(&t[1], NULL);
for (j = 0; j < batch_size; j++) { for (j = 0; j < batch_size; j++) {

Write Preview
Loading…
Cancel
Save