Fix CUDA latency

openair1/PHY/CODING/TESTBENCH/ldpctest.c

@@ -402,9 +402,17 @@ int test_ldpc(short No_iteration,
     	  start_meas(time_decoder);
 #ifdef CUDA_FLAG
         if(run_cuda){
+<<<<<<< HEAD
           n_iter = nrLDPC_decoder_LYC(&decParams, (int8_t*)channel_output_fixed[j], (int8_t*)estimated_output[j], block_length, time_decoder);
         }  
         else{ 
+=======
+          printf("***********run ldpc by cuda\n");
+          n_iter = nrLDPC_decoder_LYC(&decParams, (int8_t*)channel_output_fixed[j], (int8_t*)estimated_output[j], block_length, time_decoder);
+        }  
+        else{ 
+          printf("**************run ldpc by cpu\n");  
+>>>>>>> origin/develop
         // decode the sequence
         // decoder supports BG2, Z=128 & 256
         //esimated_output=ldpc_decoder(channel_output_fixed, block_length, No_iteration, (double)((float)nom_rate/(float)denom_rate));

openair1/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.h

@@ -23,10 +23,13 @@
 
 int32_t nrLDPC_decoder_LYC(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out, int block_length, time_stats_t *time_decoder);
 
+<<<<<<< HEAD
 void init_LLR_DMA_for_CUDA(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out, int block_length);
 
 void warmup_for_GPU(void);
 
 void set_compact_BG(int Zc, short BG);
 
+=======
+>>>>>>> origin/develop
 #endif