From b21552973c64903c6e30270f5229a2341a16410e Mon Sep 17 00:00:00 2001 From: mir Date: Wed, 6 Mar 2024 12:27:10 +0100 Subject: [PATCH] Remove old OAI implementation --- .../PHY/CODING/nrPolar_tools/nr_polar_defs.h | 4 +-- .../CODING/nrPolar_tools/nr_polar_encoder.c | 3 +- .../nrPolar_tools/nr_polar_procedures.c | 33 +++++-------------- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h index 9516be1f77..5628bfe5ca 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h @@ -282,9 +282,7 @@ void nr_polar_generate_u(uint64_t *u, uint16_t N, uint8_t n_pc); -void nr_polar_uxG(uint64_t *D, const uint64_t *u, const fourDimArray_t *G_N_tab, uint16_t N); - -void nr_polar_uxG2(uint8_t* D, uint8_t const* u, size_t N); +void nr_polar_uxG(uint8_t const* u, size_t N, uint8_t* D); void nr_polar_info_extraction_from_u(uint64_t *Cprime, const uint8_t *u, diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c index e3cce469a5..335510953f 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c @@ -689,8 +689,7 @@ void polar_encoder_fast(uint64_t *A, #endif uint64_t D[8]; -// nr_polar_uxG(D, u, polarParams->G_N_tab, polarParams->N); - nr_polar_uxG2((uint8_t*)D, (uint8_t*)u, polarParams->N); + nr_polar_uxG((uint8_t *)u, polarParams->N, (uint8_t *)D); #ifdef POLAR_CODING_DEBUG printf("d: "); diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c index f3ceba7672..70d56246aa 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_procedures.c @@ -138,8 +138,8 @@ void encode_packed_byte(uint8_t* in_out) static void polar_encode_bits(uint8_t* in_out, size_t N) { - int num_bytes_per_block = N >> 3; - for(int i = 0; i < num_bytes_per_block; ++i){ + size_t const num_bytes_per_block = N >> 3; + for(size_t i = 0; i < num_bytes_per_block; ++i){ encode_packed_byte(&in_out[i]); } } @@ -156,12 +156,12 @@ uint32_t log2_floor(uint32_t x) static void polar_encode_bytes(uint8_t* in_out, size_t N) { - int brnch_sz = 1; - int n_brnch = N >> 4; + size_t brnch_sz = 1; + size_t n_brnch = N >> 4; size_t const blck_pwr = log2_floor(N); - for (int stage = 3; stage < blck_pwr; ++stage) { - for (int brnch = 0; brnch < n_brnch; ++brnch) { - for(int byte = 0; byte < brnch_sz; ++byte){ + for (size_t stage = 3; stage < blck_pwr; ++stage) { + for (size_t brnch = 0; brnch < n_brnch; ++brnch) { + for(size_t byte = 0; byte < brnch_sz; ++byte){ size_t const dst = 2*brnch_sz*brnch + byte; in_out[dst] ^= in_out[dst + brnch_sz]; } @@ -171,7 +171,7 @@ void polar_encode_bytes(uint8_t* in_out, size_t N) } } -void nr_polar_uxG2(uint8_t* D2, uint8_t const* u, size_t N) +void nr_polar_uxG(uint8_t const *u, size_t N, uint8_t *D2) { uint8_t tmp[N/8]; for(int i = 0; i < N/8; ++i) @@ -186,23 +186,6 @@ void nr_polar_uxG2(uint8_t* D2, uint8_t const* u, size_t N) polar_encode_bytes(D2, N); } -void nr_polar_uxG(uint64_t *D, const uint64_t *u, const fourDimArray_t *G_N_tab, uint16_t N) -{ - const int N64 = N / 64; - cast2Darray(g_n, uint64_t, G_N_tab); - for (int n = 0; n < N; n++) { - const uint64_t *Gn = g_n[N - 1 - n]; - - int n_ones = 0; - for (int a = 0; a < N64; a++) - n_ones += count_bits_set(u[a] & Gn[a]); - - int n1 = n / 64; - int n2 = n - (n1 * 64); - D[n1] |= ((uint64_t)n_ones & 1) << n2; - } -} - void nr_polar_bit_insertion(uint8_t *input, uint8_t *output, uint16_t N,