From e7e01f753a4b4a60b15764555081eb723b8abfc2 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Thu, 16 Jan 2025 09:25:28 +0100 Subject: [PATCH] remove unsed LUT --- openair1/PHY/INIT/nr_init.c | 2 +- openair1/PHY/INIT/nr_init_ue.c | 2 +- openair1/PHY/NR_REFSIG/nr_refsig.h | 4 +-- openair1/PHY/NR_REFSIG/scrambling_luts.c | 34 ------------------------ 4 files changed, 3 insertions(+), 39 deletions(-) diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index 581338fa45..75a5710b94 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -128,7 +128,7 @@ void phy_init_nr_gNB(PHY_VARS_gNB *gNB) load_dftslib(); crcTableInit(); - init_scrambling_luts(); + init_byte2m128i(); init_pucch2_luts(); nr_init_fde(); // Init array for frequency equalization of transform precoding of PUSCH diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c index 5c4ace4106..5a595af8ab 100644 --- a/openair1/PHY/INIT/nr_init_ue.c +++ b/openair1/PHY/INIT/nr_init_ue.c @@ -515,7 +515,7 @@ void phy_init_nr_top(PHY_VARS_NR_UE *ue) { NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms; init_delay_table(frame_parms->ofdm_symbol_size, MAX_DELAY_COMP, NR_MAX_OFDM_SYMBOL_SIZE, frame_parms->delay_table); crcTableInit(); - init_scrambling_luts(); + init_byte2m128i(); load_dftslib(); init_context_synchro_nr(frame_parms); generate_ul_reference_signal_sequences(SHRT_MAX); diff --git a/openair1/PHY/NR_REFSIG/nr_refsig.h b/openair1/PHY/NR_REFSIG/nr_refsig.h index 7996db109a..c79d0b70aa 100644 --- a/openair1/PHY/NR_REFSIG/nr_refsig.h +++ b/openair1/PHY/NR_REFSIG/nr_refsig.h @@ -44,12 +44,10 @@ void nr_generate_csi_rs(const NR_DL_FRAME_PARMS *frame_parms, const nfapi_nr_dl_tti_csi_rs_pdu_rel15_t *csi_params, const int slot, const csi_mapping_parms_t *phy_csi_parms); +void init_byte2m128i(void); -void init_scrambling_luts(void); void nr_generate_modulation_table(void); -extern simde__m64 byte2m64_re[256]; -extern simde__m64 byte2m64_im[256]; extern simde__m128i byte2m128i[256]; int nr_pusch_lowpaprtype1_dmrs_rx(PHY_VARS_gNB *gNB, diff --git a/openair1/PHY/NR_REFSIG/scrambling_luts.c b/openair1/PHY/NR_REFSIG/scrambling_luts.c index 39130b5696..f6b1207838 100644 --- a/openair1/PHY/NR_REFSIG/scrambling_luts.c +++ b/openair1/PHY/NR_REFSIG/scrambling_luts.c @@ -22,40 +22,13 @@ /* Lookup tables for 3GPP scrambling/unscrambling */ /* Author R. Knopp / EURECOM / OpenAirInterface.org */ -#ifndef __SCRAMBLING_LUTS__C__ -#define __SCRAMBLING_LUTS__C__ #include "PHY/impl_defs_nr.h" #include "PHY/sse_intrin.h" #include -simde__m64 byte2m64_re[256]; -simde__m64 byte2m64_im[256]; - simde__m128i byte2m128i[256]; -void init_byte2m64(void) { - - for (int s=0;s<256;s++) { - byte2m64_re[s] = simde_mm_insert_pi16(byte2m64_re[s],(1-2*(s&1)),0); - byte2m64_im[s] = simde_mm_insert_pi16(byte2m64_im[s],(1-2*((s>>1)&1)),0); - byte2m64_re[s] = simde_mm_insert_pi16(byte2m64_re[s],(1-2*((s>>2)&1)),1); - byte2m64_im[s] = simde_mm_insert_pi16(byte2m64_im[s],(1-2*((s>>3)&1)),1); - byte2m64_re[s] = simde_mm_insert_pi16(byte2m64_re[s],(1-2*((s>>4)&1)),2); - byte2m64_im[s] = simde_mm_insert_pi16(byte2m64_im[s],(1-2*((s>>5)&1)),2); - byte2m64_re[s] = simde_mm_insert_pi16(byte2m64_re[s],(1-2*((s>>6)&1)),3); - byte2m64_im[s] = simde_mm_insert_pi16(byte2m64_im[s],(1-2*((s>>7)&1)),3); - LOG_T(PHY,"init_scrambling_luts: s %x (%d) ((%d,%d),(%d,%d),(%d,%d),(%d,%d))\n", - ((uint16_t*)&s)[0], - (1-2*(s&1)), - ((int16_t*)&byte2m64_re[s])[0],((int16_t*)&byte2m64_im[s])[0], - ((int16_t*)&byte2m64_re[s])[1],((int16_t*)&byte2m64_im[s])[1], - ((int16_t*)&byte2m64_re[s])[2],((int16_t*)&byte2m64_im[s])[2], - ((int16_t*)&byte2m64_re[s])[3],((int16_t*)&byte2m64_im[s])[3]); - - } -} - void init_byte2m128i(void) { for (int s=0;s<256;s++) { @@ -70,10 +43,3 @@ void init_byte2m128i(void) { } } -void init_scrambling_luts(void) { - - init_byte2m64(); - init_byte2m128i(); -} - -#endif