new PRACH channel using AVX instructions

openair1/SIMULATION/TOOLS/abstraction.c

@@ -291,7 +291,7 @@ int init_freq_channel_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_sa
       else
         delay = desc->delays[l]+NB_SAMPLES_CHANNEL_OFFSET/desc->sampling_rate;
 
-        sincos256_ps(_mm256_set_ps(twopi*(4*f+7)*delay,twopi*(4*f+6)*delay,twopi*(4*f+5)*delay,twopi*(4*f+4)*delay,twopi*(4*f+3)*delay,twopi*(4*f+2)*delay,twopi*(4*f+1)*delay,twopi*(4*f)*delay), &sin_lut256, &cos_lut256);
+        sincos256_ps(_mm256_set_ps(twopi*(8*f+7)*delay,twopi*(8*f+6)*delay,twopi*(8*f+5)*delay,twopi*(8*f+4)*delay,twopi*(8*f+3)*delay,twopi*(8*f+2)*delay,twopi*(8*f+1)*delay,twopi*(8*f)*delay), &sin_lut256, &cos_lut256);
         //cos_lut256=_mm256_set_ps(cos(twopi*(8*f+7)*delay),cos(twopi*(8*f+6)*delay),cos(twopi*(8*f+5)*delay),cos(twopi*(8*f+4)*delay),cos(twopi*(8*f+3)*delay),cos(twopi*(8*f+2)*delay),cos(twopi*(8*f+1)*delay),cos(twopi*(8*f)*delay));
         //sin_lut256=_mm256_set_ps(sin(twopi*(8*f+7)*delay),sin(twopi*(8*f+6)*delay),sin(twopi*(8*f+5)*delay),sin(twopi*(8*f+4)*delay),sin(twopi*(8*f+3)*delay),sin(twopi*(8*f+2)*delay),sin(twopi*(8*f+1)*delay),sin(twopi*(8*f)*delay));
         _mm256_storeu_ps(&cos_lut_f[l][8*f+(n_samples>>1)],cos_lut256);
@@ -580,7 +580,74 @@ int init_freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_
 
   return(0);
 }
+int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb)
+{
+
+  static int first_run=1;
+  float delta_f,twopi;  // 90 kHz spacing
+  float delay;
+  int16_t f,f1;
+  uint8_t l;
+  int prach_samples, prach_pbr_offset_samples, max_nb_rb_samples;
+  __m256 cos_lut256,sin_lut256, cos_256, sin_256;
+
+  if ((n_samples&1)==0) {
+    fprintf(stderr, "freq_channel_init: n_samples has to be odd\n");
+    return(-1); 
+  }
+  if (nb_rb-n_ra_prb<6) {
+    fprintf(stderr, "freq_channel_init: Impossible to allocate PRACH, check n_ra_prb value (r_ra_prb=%d)\n",n_ra_prb);
+    return(-1); 
+  }
+  prach_samples = (prach_fmt<4)?13+839+12:3+139+2;
+  if (first_run)
+  {
+	cos_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*));
+	sin_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*));
+        for (f=max_nb_rb_samples/2-prach_pbr_offset_samples,f1=0; f<max_nb_rb_samples/2-prach_pbr_offset_samples+prach_samples; f++,f1++) {
+	    cos_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float));
+	    sin_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float));
+	}
+	first_run=0;
+  }
+
+  //cos_lut = (double **)malloc(prach_samples*sizeof(double*));
+  //sin_lut = (double **)malloc(prach_samples*sizeof(double*));
+
+  delta_f = (prach_fmt<4)?nb_rb*180000/((n_samples-1)*12):nb_rb*180000/((n_samples-1)*2);//1.25 khz for preamble format 1,2,3. 7.5 khz for preample format 4
+  max_nb_rb_samples = nb_rb*180000/delta_f;//7200 if prach_fmt<4
+  prach_pbr_offset_samples = (n_ra_prb+6)*180000/delta_f;//864 if n_ra_prb=0,7200 if n_ra_prb=44=50-6
+  twopi=2*M_PI*1e-6*delta_f;
+  //printf("prach_samples = %d, delta_f = %e, max_nb_rb_samples= %d, prach_pbr_offset_samples = %d, nb_taps = %d\n",prach_samples,delta_f,max_nb_rb_samples,prach_pbr_offset_samples,desc->nb_taps);
+  for (f=((max_nb_rb_samples/2-prach_pbr_offset_samples)>>3),f1=0; f<((max_nb_rb_samples/2-prach_pbr_offset_samples+prach_samples)>>3); f++,f1++) {//3600-864,3600-864+864|3600-7200,3600-7200+839
+    //freq=delta_f*(float)f*1e-6;// due to the fact that delays is in mus
+    //printf("[init_freq_channel_prach] freq %e\n",freq);
+    //cos_lut[f1] = (double *)malloc((int)desc->nb_taps*sizeof(double));
+    //sin_lut[f1] = (double *)malloc((int)desc->nb_taps*sizeof(double));
+
+
+    for (l=0; l<(int)desc->nb_taps; l++) {
+      if (desc->nb_taps==1)
+        delay = desc->delays[l];
+      else
+        delay = desc->delays[l]+NB_SAMPLES_CHANNEL_OFFSET/desc->sampling_rate;
+      //cos_lut256=_mm256_set_ps(cos(twopi*(8*f+3)*delay),cos(twopi*(8*f+2)*delay),cos(twopi*(8*f+1)*delay),cos(twopi*(8*f)*delay));
+      //sin_lut256=_mm256_set_ps(sin(twopi*(8*f+3)*delay),sin(twopi*(8*f+2)*delay),sin(twopi*(8*f+1)*delay),sin(twopi*(8*f)*delay));
+      sincos256_ps(_mm256_set_ps(twopi*(8*f+7)*delay,twopi*(8*f+6)*delay,twopi*(8*f+5)*delay,twopi*(8*f+4)*delay,twopi*(8*f+3)*delay,twopi*(8*f+2)*delay,twopi*(8*f+1)*delay,twopi*(8*f)*delay),&sin_256,&cos_256);
+      cos_lut256=cos_256;
+      sin_lut256=sin_256;
+      _mm256_storeu_ps(&cos_lut_f_prach[l][8*f1],cos_lut256);
+      _mm256_storeu_ps(&sin_lut_f_prach[l][8*f1],sin_lut256);
+
+      //cos_lut[f1][l] = cos(2*M_PI*freq*delay);
+      //sin_lut[f1][l] = sin(2*M_PI*freq*delay);
+      //if (f<max_nb_rb_samples/2-prach_pbr_offset_samples+10)
+      	//printf("freq: %e, f1: %d, f: %d, arg_sin_cos = %e,  cos () = %e, sin () =n %e)\n",freq, f1,f, 2*M_PI*freq*delay, cos_lut[f1][l], sin_lut[f1][l]);
+    }
+  }
 
+  return(0);
+}
 int freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb)
 {
 
@@ -688,6 +755,62 @@ int freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_s
   stop_meas(&desc->interp_freq_PRACH);
   return(0);
 }
+int freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb)
+{
+
+  int16_t f;
+  uint8_t aarx,aatx,l;
+  int prach_samples;
+  static int freq_channel_init=0;
+  static int n_samples_max=0;
+  __m256 chFx_256,chFy_256;
+
+  prach_samples = (prach_fmt<4)?13+839+12:3+139+2; 
+
+  // do some error checking
+  if (nb_rb-n_ra_prb<6) {
+    fprintf(stderr, "freq_channel_init: Impossible to allocate PRACH, check r_ra_prb value (r_ra_prb=%d)\n",n_ra_prb);
+    return(-1); 
+  }
+  if (freq_channel_init == 0) {
+    // we are initializing the lut for the largets possible n_samples=12*nb_rb+1
+    // if called with n_samples<12*nb_rb+1, we decimate the lut
+    n_samples_max=12*nb_rb+1;
+    if (init_freq_channel_prach_AVX_float(desc,nb_rb,n_samples_max,prach_fmt,n_ra_prb)==0)
+      freq_channel_init=1;
+    else
+      return(-1);
+  }
+
+  start_meas(&desc->interp_freq_PRACH);
+  for (f=0; f<(prach_samples>>3); f++) {
+    //clut = cos_lut[f];
+    //slut = sin_lut[f];
+    for (aarx=0; aarx<desc->nb_rx; aarx++) {
+      for (aatx=0; aatx<desc->nb_tx; aatx++) {
+        //desc->chF_prach[aarx+(aatx*desc->nb_rx)].x[f]=0.0;
+        //desc->chF_prach[aarx+(aatx*desc->nb_rx)].y[f]=0.0;
+	chFx_256=_mm256_setzero_ps();
+	chFy_256=_mm256_setzero_ps();
+        for (l=0; l<(int)desc->nb_taps; l++) {
+
+          //desc->chF_prach[aarx+(aatx*desc->nb_rx)].x[f]+=(desc->a[l][aarx+(aatx*desc->nb_rx)].x*cos_lut_f_prach[l][f]+
+          //    desc->a[l][aarx+(aatx*desc->nb_rx)].y*sin_lut_f_prach[l][f]);
+          //desc->chF_prach[aarx+(aatx*desc->nb_rx)].y[f]+=(-desc->a[l][aarx+(aatx*desc->nb_rx)].x*sin_lut_f_prach[l][f]+
+          //    desc->a[l][aarx+(aatx*desc->nb_rx)].y*cos_lut_f_prach[l][f]);
+	  chFx_256=_mm256_add_ps(chFx_256,_mm256_add_ps(_mm256_mul_ps(_mm256_set1_ps(desc->a[l][aarx+(aatx*desc->nb_rx)].x),_mm256_loadu_ps(&cos_lut_f_prach[l][8*f])),_mm256_mul_ps(_mm256_set1_ps(desc->a[l][aarx+(aatx*desc->nb_rx)].y),_mm256_loadu_ps(&sin_lut_f_prach[l][8*f]))));  
+	  chFy_256=_mm256_add_ps(chFy_256,_mm256_sub_ps(_mm256_mul_ps(_mm256_set1_ps(desc->a[l][aarx+(aatx*desc->nb_rx)].y),_mm256_loadu_ps(&cos_lut_f_prach[l][8*f])),_mm256_mul_ps(_mm256_set1_ps(desc->a[l][aarx+(aatx*desc->nb_rx)].x),_mm256_loadu_ps(&sin_lut_f_prach[l][8*f]))));  
+        }
+	_mm256_storeu_ps(&desc->chF_prach[aarx+(aatx*desc->nb_rx)].x[8*f],chFx_256);
+	_mm256_storeu_ps(&desc->chF_prach[aarx+(aatx*desc->nb_rx)].y[8*f],chFy_256);
+      }
+    }
+	//if (f<10 || (f>829&&f<839))
+	//	printf("chF_prach[0][%d], (x,y) = (%e,%e)\n",f,desc->chF_prach[0][f].x,desc->chF_prach[0][f].y);
+  }
+  stop_meas(&desc->interp_freq_PRACH);
+  return(0);
+}
 //#endif
 double compute_pbch_sinr(channel_desc_t *desc,
                          channel_desc_t *desc_i1,

openair1/SIMULATION/TOOLS/defs.h

@@ -510,11 +510,13 @@ int freq_channel_SSE_float(channel_desc_t *desc,uint16_t nb_rb, int16_t n_sample
 int freq_channel_AVX_float(channel_desc_t *desc,uint16_t nb_rb, int16_t n_samples);
 int freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
 int freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
+int freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
 int init_freq_channel(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples);
 int init_freq_channel_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples);
 int init_freq_channel_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples);
 int init_freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
 int init_freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
+int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb);
 
 void sincos_ps(__m128 x, __m128 *s, __m128 *c);
 void sincos256_ps(__m256 x, __m256 *s, __m256 *c);

openair1/SIMULATION/TOOLS/multipath_channel.c

@@ -951,7 +951,7 @@ void multipath_channel_prach_AVX_float(channel_desc_t *desc,
 		// do nothing - keep channel
 		} else {
 		random_channel_freq(desc,0);
-		freq_channel_prach_SSE_float(desc,nb_rb,n_samples,prach_fmt,n_ra_prb);//Find desc->chF_prach
+		freq_channel_prach_AVX_float(desc,nb_rb,n_samples,prach_fmt,n_ra_prb);//Find desc->chF_prach
 		}	
 			for (f=0;f<(length>>3); f++) {
 				//rx_tmp.x = 0;

targets/SIMU/USER/channel_sim.c

@@ -497,8 +497,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 	      sf_offset = subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;              
               //for (int idx=0;idx<10;idx++) printf("dumping DL raw subframe %d: txdataF[%d] = (%d,%d)\n", subframe, idx, ((short*)&txdataF[0][sf_offset+idx])[0], ((short*)&txdataF[0][sf_offset+idx])[1]);
               
-	      start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
+	      
 #ifdef    SSE_float
+	      start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
 	      tx_pwr = dac_fixed_gain_AVX_float(s_re_f,
 		                      s_im_f,
 		                      txdataF,
@@ -510,7 +511,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 		                      14,
 		                      frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
 		                      frame_parms->N_RB_DL*12);
+	      stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
 #else
+	      start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
 	      tx_pwr = dac_fixed_gain(s_re_f,
 		                      s_im_f,
 		                      txdataF,
@@ -522,8 +525,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 		                      14,
 		                      frame_parms->pdsch_config_common.referenceSignalPower, // dBm/RE
 		                      frame_parms->N_RB_DL*12);
-#endif
 	      stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
+#endif
+	      
 	      //print_meas (&eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain,"[DL][dac_fixed_gain]", &eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain, &eNB2UE[eNB_id][UE_id][CC_id]->DL_dac_fixed_gain);
 
 			//for (x=0;x<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;x++){
@@ -540,15 +544,19 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 #endif
       		//eNB2UE[eNB_id][UE_id]->path_loss_dB = 0;
                 //clock_t start=clock();
-		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_multipath_channel_freq);
+
 #ifdef    SSE_float
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_multipath_channel_freq);
       		multipath_channel_freq_AVX_float(eNB2UE[eNB_id][UE_id][CC_id],s_re_f,s_im_f,r_re0_f,r_im0_f,
                         frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,hold_channel,eNB_id,UE_id,CC_id,subframe&0x1);
+		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_multipath_channel_freq);
 #else
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_multipath_channel_freq);
       		multipath_channel_freq(eNB2UE[eNB_id][UE_id][CC_id],s_re_f,s_im_f,r_re0_f,r_im0_f,
                         frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,hold_channel,eNB_id,UE_id,CC_id,subframe&0x1);
-#endif
 		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_multipath_channel_freq);
+#endif
+
 	//for (int idx=0;idx<10;idx++) printf("dumping DL raw tx subframe (input) %d: s_f[%d] = (%f,%f)\n", subframe, idx, s_re_f[0][idx],s_im_f[0][idx]);
 	//for (int idx=0;idx<10;idx++) printf("dumping DL raw tx subframe (input) %d: r_f[%d] = (%f,%f)\n", subframe, idx, r_re0_f[0][idx],r_im0_f[0][idx]);
        		/*clock_t stop=clock();
@@ -582,10 +590,15 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
             eNB2UE[eNB_id][UE_id][CC_id]->path_loss_dB);
 
 #ifdef DEBUG_SIM
+#ifdef    SSE_float
+      		rx_pwr = signal_energy_fp_AVX_float(r_re0_f,r_im0_f,nb_antennas_rx,
+                                frame_parms->ofdm_symbol_size,
+                                sf_offset)/(12.0*frame_parms->N_RB_DL);
+#else
       		rx_pwr = signal_energy_fp(r_re0_f,r_im0_f,nb_antennas_rx,
                                 frame_parms->ofdm_symbol_size,
                                 sf_offset)/(12.0*frame_parms->N_RB_DL);
-
+#endif
 
       LOG_D(OCM,"[SIM][DL] UE %d : rx_pwr %f dBm/RE (%f dBm RSSI)for subframe %d\n",UE_id,
             10*log10(rx_pwr),
@@ -607,8 +620,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 #endif
 		/*count++;
 		clock_t start=clock();*/
-		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
+
 #ifdef    SSE_float
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
       		rf_rx_simple_freq_AVX_float(r_re0_f,
                    		r_im0_f,
                    		nb_antennas_rx,
@@ -618,7 +632,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 				frame_parms->symbols_per_tti,
 				frame_parms->ofdm_symbol_size,
 				12.0*frame_parms->N_RB_DL);
+		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
 #else
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
       		rf_rx_simple_freq(r_re0_f,
                    		r_im0_f,
                    		nb_antennas_rx,
@@ -628,8 +644,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 				frame_parms->symbols_per_tti,
 				frame_parms->ofdm_symbol_size,
 				12.0*frame_parms->N_RB_DL);
-#endif
 		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
+#endif
+
 	//for (int idx=0;idx<10;idx++) printf("dumping DL raw tx subframe (input) %d: r_f[%d] = (%f,%f)\n", subframe, idx, r_re0_f[0][idx],r_im0_f[0][idx]);
       	        //print_meas (&eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq,"[DL][rf_rx_simple_freq]", &eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq, &eNB2UE[eNB_id][UE_id][CC_id]->DL_rf_rx_simple_freq);
 
@@ -640,11 +657,18 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 			fprintf(file1,"%d\t%e\t%e\n",x,r_re0_f[0][x],r_im0_f[0][x]);
 		}*/
 #ifdef DEBUG_SIM
+#ifdef    SSE_float
+      		rx_pwr = signal_energy_fp_AVX_float((r_re0_f,r_im0_f,
+                                nb_antennas_rx,
+                                frame_parms->ofdm_symbol_size,//?
+                                sf_offset)/(12.0*frame_parms->N_RB_DL);
+#else
       		rx_pwr = signal_energy_fp(r_re0_f,r_im0_f,
                                 nb_antennas_rx,
                                 frame_parms->ofdm_symbol_size,//?
                                 sf_offset)/(12.0*frame_parms->N_RB_DL);
 
+#endif
       LOG_D(OCM,"[SIM][DL] UE %d : ADC in (eNB %d) %f dBm/RE for subframe %d\n",
             UE_id,eNB_id,
             10*log10(rx_pwr),subframe);
@@ -680,8 +704,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 		sf_offset = subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;
 		
 		//printf("[ch_sim] sf_offset %d\n",sf_offset);
-		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
+
 #ifdef    SSE_float
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
 	        adc_AVX_float(r_re_p_f,
 		    r_im_p_f,
 		    0,
@@ -692,7 +717,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 		    12,
 		    PHY_vars_UE_g[UE_id][CC_id]->frame_parms.N_RB_DL*12,
 		    frame_parms->ofdm_symbol_size);
+		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
 #else
+		start_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
 	        adc(r_re_p_f,
 		    r_im_p_f,
 		    0,
@@ -701,8 +728,9 @@ void do_DL_sig_freq(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][
 		    nb_antennas_rx,
 		    frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,
 		    12);
-#endif
 		stop_meas(&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
+#endif
+
 	      //for (int idx=0;idx<10;idx++) printf("dumping DL raw subframe %d: r_re_p_f[%d] = (%e,%e)\n", subframe, idx, r_re_p_f[0][idx], r_im_p_f[0][idx]);
               //for (int idx=0;idx<10;idx++) printf("dumping DL raw subframe %d: rxdataF0[%d] = (%d,%d)\n", subframe, idx, ((short*)&rxdataF[0][sf_offset+idx])[0], ((short*)&rxdataF[0][sf_offset+idx])[1]);
       	        //print_meas (&eNB2UE[eNB_id][UE_id][CC_id]->DL_adc,"[DL][adc]", &eNB2UE[eNB_id][UE_id][CC_id]->DL_adc, &eNB2UE[eNB_id][UE_id][CC_id]->DL_adc);
@@ -1007,7 +1035,7 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
   //uint8_t do_ofdm_mod = PHY_vars_UE_g[0][0]->do_ofdm_mod;
 
   if (abstraction_flag!=0)  {
-#ifdef PHY_ABSTRACTION_UL
+/*#ifdef PHY_ABSTRACTION_UL
 
     for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
       if (!hold_channel) {
@@ -1035,16 +1063,21 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
     } //UE_id
 
 #else
-#endif
+#endif*/
+	LOG_D(OCM,"[SIM][DL] Abstraction for do_UL_sig_freq is not implemented in frequency domain\n");
+	exit(-1);
+
   } else { //without abstraction
 
     pthread_mutex_lock(&UE_output_mutex[eNB_id]);
     // Clear RX signal for eNB = eNB_id
-    	for (i=0; i<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti; i++) {
+    	//for (i=0; i<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti; i++) {
 	      for (aa=0; aa<nb_antennas_rx; aa++) {
-		r_re_UL_f[eNB_id][aa][i]=0.0;
+		/*r_re_UL_f[eNB_id][aa][i]=0.0;
 		r_im_UL_f[eNB_id][aa][i]=0.0;
-	      }
+	      }*/
+		memset((void*)r_re_UL_f[eNB_id][aa],0,(frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti)*sizeof(double));
+		memset((void*)r_im_UL_f[eNB_id][aa],0,(frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti)*sizeof(double));
         }
     pthread_mutex_unlock(&UE_output_mutex[eNB_id]);
 
@@ -1072,8 +1105,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 	//printf("multipath_channel, UE too weak %e\n", ((double)PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe] +
 	//   UE2eNB[UE_id][eNB_id][CC_id]->path_loss_dB));	
       } else {
-		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
+
 #ifdef    SSE_float
+		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
 		tx_pwr = dac_fixed_gain_AVX_float((float**)s_re_f,
 					(float**)s_im_f,
 					txdataF,
@@ -1085,7 +1119,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 					14,
 					(float)PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe]-10*log10((double)PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]),
 					PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]);  // This make the previous argument the total power
+		stop_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
 #else
+		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
 		tx_pwr = dac_fixed_gain((double**)s_re_f,
 					(double**)s_im_f,
 					txdataF,
@@ -1097,8 +1133,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 					14,
 					(double)PHY_vars_UE_g[UE_id][CC_id]->tx_power_dBm[subframe]-10*log10((double)PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]),
 					PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe]);  // This make the previous argument the total power
-#endif
 		stop_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
+#endif
+
 		//print_meas (&UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain,"[UL][dac_fixed_gain]", &UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain, &UE2eNB[UE_id][eNB_id][CC_id]->UL_dac_fixed_gain);
 	        /*for (int idx=subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;idx<(subframe+1)*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;idx++){
 			if (((short*)&txdataF[0][idx])[0]!=0 || ((short*)&txdataF[0][idx])[1]!=0)
@@ -1111,15 +1148,19 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 		      PHY_vars_UE_g[UE_id][CC_id]->tx_total_RE[subframe],
 		      subframe,sf_offset);
 		//write_output("chsim_s_re_f_UL.m","chsm_sref_UL", s_re_f,10*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,1,16);
-		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq);
+
 #ifdef    SSE_float
+		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq);
 	      	multipath_channel_freq_AVX_float(UE2eNB[UE_id][eNB_id][CC_id],s_re_f,s_im_f,r_re0_f,r_im0_f,
 			  frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,hold_channel,eNB_id,UE_id,CC_id,subframe&0x1);//ue timer subframe&0x1
+		stop_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq);
 #else
+		start_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq);
 	      	multipath_channel_freq(UE2eNB[UE_id][eNB_id][CC_id],s_re_f,s_im_f,r_re0_f,r_im0_f,
 			  frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,hold_channel,eNB_id,UE_id,CC_id,subframe&0x1);//ue timer subframe&0x1
-#endif
 		stop_meas(&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq);
+#endif
+
 		//print_meas (&UE2eNB[UE_id][eNB_id][CC_id]->UL_multipath_channel_freq,"[UL][multipath_channel_freq]", NULL, NULL);
 			//for (int x=0;x<frame_parms->N_RB_DL*12;x++){
 			//	fprintf(file1,"%d\t%e\t%e\n",x,UE2eNB[UE_id][eNB_id][CC_id]->chF[0][x].x,UE2eNB[UE_id][eNB_id][CC_id]->chF[0][x].y);
@@ -1173,8 +1214,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
     double *r_re_p_f[2] = {r_re_UL_f[eNB_id][0],r_re_UL_f[eNB_id][1]};
     double *r_im_p_f[2] = {r_im_UL_f[eNB_id][0],r_im_UL_f[eNB_id][1]};
 #endif
-	start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_rf_rx_simple_freq);
-#ifdef    SSE_float  
+
+#ifdef    SSE_float 
+	start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_rf_rx_simple_freq); 
     	rf_rx_simple_freq_AVX_float(r_re_p_f,
 		 r_im_p_f,
 		 nb_antennas_rx,
@@ -1184,7 +1226,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 		 frame_parms->symbols_per_tti,
 		 frame_parms->ofdm_symbol_size,
 		 12.0*frame_parms->N_RB_DL);
+	stop_meas(&UE2eNB[0][eNB_id][CC_id]->UL_rf_rx_simple_freq);
 #else
+	start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_rf_rx_simple_freq);
     	rf_rx_simple_freq(r_re_p_f,
 		 r_im_p_f,
 		 nb_antennas_rx,
@@ -1194,8 +1238,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 		 frame_parms->symbols_per_tti,
 		 frame_parms->ofdm_symbol_size,
 		 12.0*frame_parms->N_RB_DL);
-#endif
 	stop_meas(&UE2eNB[0][eNB_id][CC_id]->UL_rf_rx_simple_freq);
+#endif
+
         //print_meas (&UE2eNB[UE_id][eNB_id][CC_id]->UL_rf_rx_simple_freq,"[UL][rf_rx_simple_freq]", &UE2eNB[UE_id][eNB_id][CC_id]->UL_rf_rx_simple_freq, &UE2eNB[UE_id][eNB_id][CC_id]->UL_rf_rx_simple_freq);
 	        /*for (int idx=subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;idx<(subframe+1)*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;idx++){
 			if (((short*)&txdataF[0][idx])[0]!=0 || ((short*)&txdataF[0][idx])[1]!=0)
@@ -1208,8 +1253,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 #endif
 	    rxdataF = PHY_vars_eNB_g[eNB_id][CC_id]->common_vars.rxdataF[0];
 	    sf_offset = 0;//subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;
-		start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_adc);
+
 #ifdef    SSE_float
+		start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_adc);
 	        adc_AVX_float(r_re_p_f,
 		r_im_p_f,
 		sf_offset,
@@ -1220,7 +1266,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 		12,
 		PHY_vars_eNB_g[eNB_id][CC_id]->frame_parms.N_RB_DL*12,
 		frame_parms->ofdm_symbol_size);
+		stop_meas(&UE2eNB[0][eNB_id][CC_id]->UL_adc);
 #else
+		start_meas(&UE2eNB[0][eNB_id][CC_id]->UL_adc);
 	        adc(r_re_p_f,
 		r_im_p_f,
 		sf_offset,
@@ -1229,8 +1277,9 @@ void do_UL_sig_freq(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][
 		nb_antennas_rx,
 		frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti,
 		12);
-#endif
 		stop_meas(&UE2eNB[0][eNB_id][CC_id]->UL_adc);
+#endif
+
 	        /*for (int idx=0;idx<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti;idx++){
 			if (((short*)&txdataF[0][idx+subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti])[0]!=0 || ((short*)&txdataF[0][idx+subframe*frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti])[1]!=0)
 				printf("dumping UL raw rx subframe %d: rxdataF[%d] = (%d,%d)\n", subframe, idx, ((short*)&rxdataF[0][idx])[0], ((short*)&rxdataF[0][idx])[1]);
@@ -1346,11 +1395,13 @@ void do_UL_sig_freq_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB
 
     pthread_mutex_lock(&UE_output_mutex[eNB_id]);
     // Clear RX signal for eNB = eNB_id
-    	for (i=0; i<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti; i++) {
+    	//for (i=0; i<frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti; i++) {
 	      for (aa=0; aa<nb_antennas_rx; aa++) {
-		r_re_UL_f_prach[eNB_id][aa][i]=0.0;
+		/*r_re_UL_f_prach[eNB_id][aa][i]=0.0;
 		r_im_UL_f_prach[eNB_id][aa][i]=0.0;
-	      }
+	      }*/
+	      memset((void*)r_re_UL_f_prach[eNB_id][aa],0,(frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti)*sizeof(double));
+	      memset((void*)r_im_UL_f_prach[eNB_id][aa],0,(frame_parms->ofdm_symbol_size*frame_parms->symbols_per_tti)*sizeof(double));
         }
     pthread_mutex_unlock(&UE_output_mutex[eNB_id]);