maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_unaligned_idft' into integration_2023_w11b

Browse Source
This commit is contained in:
Robert Schmidt
2023-03-18 12:05:05 +01:00
parent 15055c26b8 b3b53506a1
commit 10a10e9910
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+2 -2
View File
@@ -120,7 +120,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
nfapi_nr_pusch_pdu_t *pusch_pdu, nfapi_nr_pusch_pdu_t *pusch_pdu,
int *max_ch) { int *max_ch) {
c16_t pilot[3280] __attribute__((aligned(16))); c16_t pilot[3280] __attribute__((aligned(32)));
const int chest_freq = gNB->chest_freq; const int chest_freq = gNB->chest_freq;
#ifdef DEBUG_CH #ifdef DEBUG_CH
@@ -183,7 +183,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#endif #endif
c16_t ul_ls_est[symbolSize]; c16_t ul_ls_est[symbolSize] __attribute__((aligned(32)));
memset(ul_ls_est, 0, sizeof(c16_t) * symbolSize); memset(ul_ls_est, 0, sizeof(c16_t) * symbolSize);
memset(&gNB->measurements.delay[ul_id], 0, sizeof(gNB->measurements.delay[ul_id])); memset(&gNB->measurements.delay[ul_id], 0, sizeof(gNB->measurements.delay[ul_id]));
openair1/PHY/TOOLS/oai_dfts.c
+1 -1
View File
@@ -9068,7 +9068,7 @@ void idft(uint8_t sizeidx, int16_t *input,int16_t *output,unsigned char scale_fl
int sz=idft_ftab[sizeidx].size; int sz=idft_ftab[sizeidx].size;
int16_t tmp[sz*2] __attribute__ ((aligned(32))); // input and output are not in right type (int16_t instead of c16_t) int16_t tmp[sz*2] __attribute__ ((aligned(32))); // input and output are not in right type (int16_t instead of c16_t)
memcpy(tmp, input, sizeof tmp); memcpy(tmp, input, sizeof tmp);
dft_ftab[sizeidx].func(tmp,output,scale_flag); idft_ftab[sizeidx].func(tmp,output,scale_flag);
} else } else
idft_ftab[sizeidx].func(input,output,scale_flag); idft_ftab[sizeidx].func(input,output,scale_flag);
}; };