test cuFFT gNB ok

openair1/PHY/MODULATION/slot_fep_nr.c

@@ -26,6 +26,7 @@
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
 #include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
 #include <common/utils/LOG/log.h>
+#include "PHY/CODING/nrLDPC_extern.h"
 
 //#define DEBUG_FEP
 
@@ -328,10 +329,13 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms,
 
   }
 
-  dft(dftsize,
-      rxdata_ptr,
+  cudft2048(rxdata_ptr,
       (int16_t *)&rxdataF[symbol * frame_parms->ofdm_symbol_size],
       1);
+  // dft(dftsize,
+  //     rxdata_ptr,
+  //     (int16_t *)&rxdataF[symbol * frame_parms->ofdm_symbol_size],
+  //     1);
 
   // clear DC carrier from OFDM symbols
   rxdataF[symbol * frame_parms->ofdm_symbol_size] = 0;

openair1/PHY/TOOLS/oai_dfts.c

@@ -10627,17 +10627,6 @@ int dfts_autoinit(void)
 void dft(uint8_t sizeidx, int16_t *sigF,int16_t *sig,unsigned char scale_flag){
 	AssertFatal((sizeidx>=0 && sizeidx<(int)DFT_SIZE_IDXTABLESIZE),"Invalid dft size index %i\n",sizeidx);
 	dft_ftab[sizeidx](sigF,sig,scale_flag);
-  static int cu_2048 = 1;
-  if(sizeidx==DFT_2048 && cu_2048 < 5)
-  {
-    cu_2048 ++;
-    int i;
-    printf("hs111111111111111111111111111111111111111111111:\n");
-    for (i = 0; i < 1024; i++)
-    {
-      printf("a=%d + %dj\tb=%d + %dj\n", sigF[i*2],sigF[i*2+1],sig[i*2],sig[i*2+1]);
-    }
-  }
 };
 
 void idft(uint8_t sizeidx, int16_t *sigF,int16_t *sig,unsigned char scale_flag){

openair1/PHY/TOOLS/tools_defs.h

@@ -262,7 +262,6 @@ void dft36864(int16_t *x,int16_t *y,uint8_t scale_flag);
 void dft49152(int16_t *x,int16_t *y,uint8_t scale_flag); 
 void dft73728(int16_t *x,int16_t *y,uint8_t scale_flag); 
 void dft98304(int16_t *x,int16_t *y,uint8_t scale_flag);
-extern void cudft2048(int16_t *x,int16_t *y,uint8_t scale_flag);
 
 
 void idft64(int16_t *x,int16_t *y,uint8_t scale_flag);
@@ -322,7 +321,7 @@ adftfunc_t dft_ftab[]={
 	dft512,   dft540,   dft576,   dft600,   dft648,  dft720,  dft768,   dft864,
 	dft900,   dft960,   dft972,   dft1024,  dft1080, dft1152, dft1200,  dft1296,
 	dft1440,  dft1500,  dft1536,  dft1620,  dft1728, dft1800, dft1920,  dft1944,
-	cudft2048,  dft2160,  dft2304,  dft2400,  dft2592, dft2700, dft2880,  dft2916,
+	dft2048,  dft2160,  dft2304,  dft2400,  dft2592, dft2700, dft2880,  dft2916,
 	dft3000,  dft3072,  dft3240,  dft4096,  dft6144, dft8192, dft9216,  dft12288,
 	dft18432, dft24576, dft36864, dft49152, dft73728, dft98304
 };