From dbae016b003c69f651e2c0fe885281ca61b9cb7c Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Mon, 2 Oct 2017 18:16:03 +0100
Subject: [PATCH] Removed unused vector functions

---
 lib/include/srslte/phy/utils/vector.h |  35 +----
 lib/src/phy/utils/vector.c            | 182 +-------------------------
 lib/src/phy/utils/vector_simd.c       |  69 ----------
 3 files changed, 2 insertions(+), 284 deletions(-)

diff --git a/lib/include/srslte/phy/utils/vector.h b/lib/include/srslte/phy/utils/vector.h
index 9b99c6fff..4a5daefb3 100644
--- a/lib/include/srslte/phy/utils/vector.h
+++ b/lib/include/srslte/phy/utils/vector.h
@@ -54,7 +54,6 @@ extern "C" {
 #define SRSLTE_VEC_EMA(data, average, alpha) ((alpha)*(data)+(1-alpha)*(average))
 
 /** Return the sum of all the elements */
-SRSLTE_API int srslte_vec_acc_ii(int *x, uint32_t len);
 SRSLTE_API float srslte_vec_acc_ff(float *x, uint32_t len);
 SRSLTE_API cf_t srslte_vec_acc_cc(cf_t *x, uint32_t len);
 
@@ -77,7 +76,6 @@ SRSLTE_API void srslte_vec_save_file(char *filename, void *buffer, uint32_t len)
 SRSLTE_API void srslte_vec_load_file(char *filename, void *buffer, uint32_t len);
 
 /* sum two vectors */
-SRSLTE_API void srslte_vec_sum_ch(uint8_t *x, uint8_t *y, char *z, uint32_t len);
 SRSLTE_API void srslte_vec_sum_fff(float *x, float *y, float *z, uint32_t len);
 SRSLTE_API void srslte_vec_sum_ccc(cf_t *x, cf_t *y, cf_t *z, uint32_t len);
 SRSLTE_API void srslte_vec_sub_sss(int16_t *x, int16_t *y, int16_t *z, uint32_t len);
@@ -87,39 +85,16 @@ SRSLTE_API void srslte_vec_sum_sss(int16_t *x, int16_t *y, int16_t *z, uint32_t
 SRSLTE_API void srslte_vec_sub_fff(float *x, float *y, float *z, uint32_t len); 
 SRSLTE_API void srslte_vec_sub_ccc(cf_t *x, cf_t *y, cf_t *z, uint32_t len);
 
-/* EMA filter: output=coeff*new_data + (1-coeff)*average */
-SRSLTE_API void srslte_vec_ema_filter(cf_t *new_data, cf_t *average, cf_t *output, float coeff, uint32_t len); 
-
-/* Square distance */
-//SRSLTE_API void srslte_vec_square_dist(cf_t symbol, cf_t *points, float *distance, uint32_t npoints);
-
-/* scalar addition */
-SRSLTE_API void srslte_vec_sc_add_fff(float *x, float h, float *z, uint32_t len); 
-SRSLTE_API void srslte_vec_sc_add_cfc(cf_t *x, float h, cf_t *z, uint32_t len); 
-SRSLTE_API void srslte_vec_sc_add_ccc(cf_t *x, cf_t h, cf_t *z, uint32_t len); 
-SRSLTE_API void srslte_vec_sc_add_sss(int16_t *x, int16_t h, int16_t *z, uint32_t len); 
-
 /* scalar product */
 SRSLTE_API void srslte_vec_sc_prod_cfc(cf_t *x, float h, cf_t *z, uint32_t len);
 SRSLTE_API void srslte_vec_sc_prod_ccc(cf_t *x, cf_t h, cf_t *z, uint32_t len);
 SRSLTE_API void srslte_vec_sc_prod_fff(float *x, float h, float *z, uint32_t len); 
-SRSLTE_API void srslte_vec_sc_prod_sfs(short *x, float h, short *z, uint32_t len); 
-SRSLTE_API void srslte_vec_sc_div2_sss(short *x, int pow2_div, short *z, uint32_t len); 
 
-/* Normalization */
-SRSLTE_API void srslte_vec_norm_cfc(cf_t *x, float amplitude, cf_t *y, uint32_t len);
 
 SRSLTE_API void srslte_vec_convert_fi(float *x, int16_t *z, float scale, uint32_t len);
 SRSLTE_API void srslte_vec_convert_if(int16_t *x, float *z, float scale, uint32_t len);
-SRSLTE_API void srslte_vec_convert_ci(int8_t *x, int16_t *z, uint32_t len); 
-
-SRSLTE_API void srslte_vec_lut_fuf(float *x, uint32_t *lut, float *y, uint32_t len);
-SRSLTE_API void srslte_vec_lut_sss(short *x, unsigned short *lut, short *y, uint32_t len); 
 
-SRSLTE_API void srslte_vec_deinterleave_cf(cf_t *x, float *real, float *imag, uint32_t len); 
-SRSLTE_API void srslte_vec_deinterleave_real_cf(cf_t *x, float *real, uint32_t len);
-
-SRSLTE_API void srslte_vec_interleave_cf(float *real, float *imag, cf_t *x, uint32_t len);
+SRSLTE_API void srslte_vec_lut_sss(short *x, unsigned short *lut, short *y, uint32_t len);
 
 /* vector product (element-wise) */
 SRSLTE_API void srslte_vec_prod_ccc(cf_t *x, cf_t *y, cf_t *z, uint32_t len);
@@ -159,11 +134,6 @@ SRSLTE_API float srslte_vec_corr_ccc(cf_t *x, cf_t *y, uint32_t len);
 /* return the index of the maximum value in the vector */
 SRSLTE_API uint32_t srslte_vec_max_fi(float *x, uint32_t len);
 SRSLTE_API uint32_t srslte_vec_max_abs_ci(cf_t *x, uint32_t len);
-SRSLTE_API int16_t srslte_vec_max_star_si(int16_t *x, uint32_t len);
-SRSLTE_API int16_t srslte_vec_max_abs_star_si(int16_t *x, uint32_t len);
-
-/* maximum between two vectors */
-SRSLTE_API void srslte_vec_max_fff(float *x, float *y, float *z, uint32_t len);
 
 /* quantify vector of floats or int16 and convert to uint8_t */
 SRSLTE_API void srslte_vec_quant_fuc(float *in, uint8_t *out, float gain, float offset, float clip, uint32_t len);
@@ -173,9 +143,6 @@ SRSLTE_API void srslte_vec_quant_suc(int16_t *in, uint8_t *out, float gain, int1
 SRSLTE_API void srslte_vec_abs_cf(cf_t *x, float *abs, uint32_t len);
 SRSLTE_API void srslte_vec_abs_square_cf(cf_t *x, float *abs_square, uint32_t len);
 
-/* argument of each vector element */
-SRSLTE_API void srslte_vec_arg_cf(cf_t *x, float *arg, uint32_t len);
-
 /* Copy 256 bit aligned vector */
 SRSLTE_API void srs_vec_cf_cpy(cf_t *src, cf_t *dst, int len);
 
diff --git a/lib/src/phy/utils/vector.c b/lib/src/phy/utils/vector.c
index f85dbca0a..3bb7fb08f 100644
--- a/lib/src/phy/utils/vector.c
+++ b/lib/src/phy/utils/vector.c
@@ -37,15 +37,6 @@
 
 
 
-int srslte_vec_acc_ii(int *x, uint32_t len) {
-  int i;
-  int z=0;
-  for (i=0;i<len;i++) {
-    z+=x[i];
-  }
-  return z;
-}
-
 // Used in PRACH detector, AGC and chest_dl for noise averaging
 float srslte_vec_acc_ff(float *x, uint32_t len) {
   return srslte_vec_acc_ff_simd(x, len);
@@ -61,16 +52,6 @@ cf_t srslte_vec_acc_cc(cf_t *x, uint32_t len) {
   return srslte_vec_acc_cc_simd(x, len);
 }
 
-#warning Remove function if not used!
-/*void srslte_vec_square_dist(cf_t symbol, cf_t *points, float *distance, uint32_t npoints) {
-  uint32_t i;
-  cf_t diff; 
-  for (i=0;i<npoints;i++) {
-    diff = symbol - points[i];
-    distance[i] = crealf(diff) * crealf(diff) + cimagf(diff) * cimagf(diff);
-  }
-}*/
-
 void srslte_vec_sub_fff(float *x, float *y, float *z, uint32_t len) {
   srslte_vec_sub_fff_simd(x, y, z, len);
 }
@@ -97,86 +78,16 @@ void srslte_vec_sum_ccc(cf_t *x, cf_t *y, cf_t *z, uint32_t len) {
   srslte_vec_sum_fff((float*) x,(float*) y,(float*) z,2*len);
 }
 
-void srslte_vec_sum_bbb(uint8_t *x, uint8_t *y, uint8_t *z, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    z[i] = x[i]+y[i];
-  }
-}
-
-void srslte_vec_sc_add_fff(float *x, float h, float *z, uint32_t len) {
-  int i; 
-  for (i=0;i<len;i++) {
-    z[i] = x[i]+h;
-  }
-}
-
-void srslte_vec_sc_add_cfc(cf_t *x, float h, cf_t *z, uint32_t len) {
-  int i; 
-  for (i=0;i<len;i++) {
-    z[i] = x[i]+ h;
-  }
-}
-
-void srslte_vec_sc_add_ccc(cf_t *x, cf_t h, cf_t *z, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    z[i] = x[i]+ h;
-  }
-}
-
-void srslte_vec_sc_add_sss(int16_t *x, int16_t h, int16_t *z, uint32_t len) {
-  int i; 
-  for (i=0;i<len;i++) {
-    z[i] = x[i]+ h;
-  }
-}
-// PSS, PBCH, DEMOD, FFTW, etc. 
+// PSS, PBCH, DEMOD, FFTW, etc.
 void srslte_vec_sc_prod_fff(float *x, float h, float *z, uint32_t len) {
   srslte_vec_sc_prod_fff_simd(x, h, z, len);
 }
 
-void srslte_vec_sc_prod_sfs(short *x, float h, short *z, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    z[i] = x[i]*h;
-  }
-}
-
-#warning remove function if it is not used
-/*void srslte_vec_sc_div2_sss(short *x, int n_rightshift, short *z, uint32_t len) {
-#ifdef LV_HAVE_AVX2
-  srslte_vec_sc_div2_sss_avx2(x, n_rightshift, z, len);
-#else
-#ifdef LV_HAVE_SSE
-  srslte_vec_sc_div2_sss_sse(x, n_rightshift, z, len);
-#else
-  int i;
-  int pow2_div = 1<<n_rightshift;
-  for (i=0;i<len;i++) {
-    z[i] = x[i]/pow2_div;
-  }
-#endif
-#endif
-}*/
-
-// TODO: Improve this implementation
-void srslte_vec_norm_cfc(cf_t *x, float amplitude, cf_t *y, uint32_t len) {
-  // We should use fabs() here but is statistically should be similar
-  float *xp = (float*) x; 
-  uint32_t idx = srslte_vec_max_fi(xp, 2*len);
-  float max = xp[idx]; 
-
-  // Normalize before TX 
-  srslte_vec_sc_prod_cfc(x, amplitude/max, y, len);
-}
-
 // Used throughout 
 void srslte_vec_sc_prod_cfc(cf_t *x, float h, cf_t *z, uint32_t len) { 
   srslte_vec_sc_prod_cfc_simd(x,h,z,len);
 }
 
-
 // Chest UL 
 void srslte_vec_sc_prod_ccc(cf_t *x, cf_t h, cf_t *z, uint32_t len) {
   srslte_vec_sc_prod_ccc_simd(x,h,z,len);
@@ -190,63 +101,14 @@ void srslte_vec_convert_if(int16_t *x, float *z, float scale, uint32_t len) {
   }
 }
 
-
-void srslte_vec_convert_ci(int8_t *x, int16_t *z, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    z[i] = ((int16_t) x[i]);
-  }
-}
-
 void srslte_vec_convert_fi(float *x, int16_t *z, float scale, uint32_t len) {
   srslte_vec_convert_fi_simd(x, z, scale, len);
 }
 
-void srslte_vec_lut_fuf(float *x, uint32_t *lut, float *y, uint32_t len) {
-  for (int i=0;i<len;i++) {
-    y[lut[i]] = x[i];
-  }
-}
-
 void srslte_vec_lut_sss(short *x, unsigned short *lut, short *y, uint32_t len) {
   srslte_vec_lut_sss_simd(x, lut, y, len);
 }
 
-void srslte_vec_interleave_cf(float *real, float *imag, cf_t *x, uint32_t len) {
-#ifdef HAVE_VOLK_INTERLEAVE_FUNCTION
-  volk_32f_x2_interleave_32fc(x, real, imag, len);
-#else 
-  int i;
-  for (i=0;i<len;i++) {
-    x[i] = real[i] + _Complex_I*imag[i];
-  }
-#endif
-}
-
-void srslte_vec_deinterleave_cf(cf_t *x, float *real, float *imag, uint32_t len) {
-#ifdef HAVE_VOLK_DEINTERLEAVE_FUNCTION
-  volk_32fc_deinterleave_32f_x2(real, imag, x, len);
-#else 
-  int i;
-  for (i=0;i<len;i++) {
-    real[i] = __real__ x[i];
-    imag[i] = __imag__ x[i];
-  }
-#endif
-}
-
-void srslte_vec_deinterleave_real_cf(cf_t *x, float *real, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    real[i] = __real__ x[i];
-  }
-}
-
-/* Note: We align memory to 32 bytes (for AVX2 compatibility) 
- * because in some cases volk can incorrectly detect the architecture. 
- * This could be inefficient for SSE or non-SIMD platforms but shouldn't 
- * be a huge problem. 
- */
 void *srslte_vec_malloc(uint32_t size) {
   void *ptr;
   if (posix_memalign(&ptr, SRSLTE_SIMD_BIT_ALIGN, size)) {
@@ -493,52 +355,10 @@ void srslte_vec_abs_square_cf(cf_t *x, float *abs_square, uint32_t len) {
   srslte_vec_abs_square_cf_simd(x,abs_square,len);
 }
 
-
-void srslte_vec_arg_cf(cf_t *x, float *arg, uint32_t len) {
-  int i;
-  for (i=0;i<len;i++) {
-    arg[i] = cargf(x[i]);
-  }
-}
-
 uint32_t srslte_vec_max_fi(float *x, uint32_t len) {
   return srslte_vec_max_fi_simd(x, len);
 }
 
-int16_t srslte_vec_max_star_si(int16_t *x, uint32_t len) {
-  uint32_t i;
-  int16_t m=-INT16_MIN;
-  for (i=0;i<len;i++) {
-    if (x[i]>m) {
-      m=x[i];
-    }
-  }
-  return m;
-}
-
-int16_t srslte_vec_max_abs_star_si(int16_t *x, uint32_t len) {
-  uint32_t i;
-  int16_t m=-INT16_MIN;
-  for (i=0;i<len;i++) {
-    if (abs(x[i])>m) {
-      m=abs(x[i]);
-    }
-  }
-  return m;
-}
-
-void srslte_vec_max_fff(float *x, float *y, float *z, uint32_t len) {
-  uint32_t i; 
-  for (i=0;i<len;i++) {
-    if (x[i] > y[i]) {
-      z[i] = x[i]; 
-    } else {
-      z[i] = y[i]; 
-    }
-  }
-}
-
-
 // CP autocorr
 uint32_t srslte_vec_max_abs_ci(cf_t *x, uint32_t len) {
   return srslte_vec_max_ci_simd(x, len);
diff --git a/lib/src/phy/utils/vector_simd.c b/lib/src/phy/utils/vector_simd.c
index 109c99717..0294bd1af 100644
--- a/lib/src/phy/utils/vector_simd.c
+++ b/lib/src/phy/utils/vector_simd.c
@@ -162,75 +162,6 @@ void srslte_vec_prod_sss_simd(int16_t *x, int16_t *y, int16_t *z, int len) {
   }
 }
 
-
-
-
-#warning remove function if it is not used
-/*
-void srslte_vec_sc_div2_sss_sse(short *x, int k, short *z, uint32_t len)
-{
-#ifdef LV_HAVE_SSE
-  unsigned int number = 0;
-  const unsigned int points = len / 8;
-
-  const __m128i* xPtr = (const __m128i*) x;
-  __m128i* zPtr = (__m128i*) z;
-
-  __m128i xVal, zVal;
-  for(;number < points; number++){
-
-    xVal = _mm_load_si128(xPtr);
-    
-    zVal = _mm_srai_epi16(xVal, k);                 
-      
-    _mm_store_si128(zPtr, zVal);
-
-    xPtr ++;
-    zPtr ++;
-  }
-
-  number = points * 8;
-  short divn = (1<<k);
-  for(;number < len; number++){
-    z[number] = x[number] / divn;
-  }
-#endif
-}*/
-
-#warning remove function if it is not used
-/*
-void srslte_vec_sc_div2_sss_avx2(short *x, int k, short *z, uint32_t len)
-{
-#ifdef LV_HAVE_AVX2
-  unsigned int number = 0;
-  const unsigned int points = len / 16;
-
-  const __m256i* xPtr = (const __m256i*) x;
-  __m256i* zPtr = (__m256i*) z;
-
-  __m256i xVal, zVal;
-  for(;number < points; number++){
-
-    xVal = _mm256_load_si256(xPtr);
-    
-    zVal = _mm256_srai_epi16(xVal, k);                 
-      
-    _mm256_store_si256(zPtr, zVal); 
-
-    xPtr ++;
-    zPtr ++;
-  }
-
-  number = points * 16;
-  short divn = (1<<k);
-  for(;number < len; number++){
-    z[number] = x[number] / divn;
-  }
-#endif
-}*/
-
-
-
 /* No improvement with AVX */
 void srslte_vec_lut_sss_simd(short *x, unsigned short *lut, short *y, int len) {
   int i = 0;