diff --git a/include/utils/vector.h b/include/utils/vector.h index 475937fab..586c07554 100644 --- a/include/utils/vector.h +++ b/include/utils/vector.h @@ -43,9 +43,9 @@ void vec_sum_ccc(cf_t *z, cf_t *x, cf_t *y, int len); void vec_sc_prod_cfc(cf_t *x, float h, cf_t *z, int len); void vec_sc_prod_ccc(cf_t *x, cf_t h, cf_t *z, int len); -/* dot product */ -void vec_dot_prod_ccc(cf_t *x, cf_t *y, cf_t *z, int len); -void vec_dot_prod_ccc_unalign(cf_t *x, cf_t *y, cf_t *z, int len); +/* vector product */ +void vec_prod_ccc(cf_t *x, cf_t *y, cf_t *z, int len); +void vec_prod_ccc_unalign(cf_t *x, cf_t *y, cf_t *z, int len); /* conjugate */ void vec_conj_cc(cf_t *x, cf_t *y, int len); diff --git a/lib/sync/src/find_sss.c b/lib/sync/src/find_sss.c index 7b4a08ac3..9747a04a5 100644 --- a/lib/sync/src/find_sss.c +++ b/lib/sync/src/find_sss.c @@ -24,7 +24,7 @@ cf_t corr_sz(cf_t *z, cf_t *s) { cf_t sum; cf_t zsprod[32]; - vec_dot_prod_ccc(z, s, zsprod, N_SSS - 1); + vec_prod_ccc(z, s, zsprod, N_SSS - 1); sum = vec_acc_cc(zsprod, N_SSS - 1); return sum; @@ -66,10 +66,10 @@ void sss_synch_m0m1(sss_synch_t *q, cf_t *input, int *m0, float *m0_value, y[1][i] = input_fft[SSS_POS_SYMBOL + 2 * i + 1]; } - vec_dot_prod_ccc(y[0], q->fc_tables.c[0], z, N_SSS); + vec_prod_ccc(y[0], q->fc_tables.c[0], z, N_SSS); memcpy(zdelay, &z[1], (N_SSS - 1) * sizeof(cf_t)); vec_conj_cc(z, zconj, N_SSS - 1); - vec_dot_prod_ccc(zdelay, zconj, zprod, N_SSS - 1); + vec_prod_ccc(zdelay, zconj, zprod, N_SSS - 1); corr_all_zs(zprod, q->fc_tables.s, tmp); vec_abs_cf(tmp, tmp_real, N_SSS); @@ -78,11 +78,11 @@ void sss_synch_m0m1(sss_synch_t *q, cf_t *input, int *m0, float *m0_value, *m0_value = tmp_real[*m0]; } - vec_dot_prod_ccc(y[1], q->fc_tables.c[1], tmp, N_SSS); - vec_dot_prod_ccc(tmp, q->fc_tables.z1[*m0], z, N_SSS); + vec_prod_ccc(y[1], q->fc_tables.c[1], tmp, N_SSS); + vec_prod_ccc(tmp, q->fc_tables.z1[*m0], z, N_SSS); memcpy(zdelay, &z[1], (N_SSS - 1) * sizeof(cf_t)); vec_conj_cc(z, zconj, N_SSS - 1); - vec_dot_prod_ccc(zdelay, zconj, zprod, N_SSS - 1); + vec_prod_ccc(zdelay, zconj, zprod, N_SSS - 1); corr_all_zs(zprod, q->fc_tables.s, tmp); vec_abs_cf(tmp, tmp_real, N_SSS); diff --git a/lib/sync/src/pss.c b/lib/sync/src/pss.c index 8d339f123..f9fff5bc6 100644 --- a/lib/sync/src/pss.c +++ b/lib/sync/src/pss.c @@ -227,7 +227,7 @@ float pss_synch_cfo_compute(pss_synch_t* q, cf_t *pss_recv) { cf_t y0, y1, yr; cf_t y[PSS_LEN_FREQ-1]; - vec_dot_prod_ccc_unalign(q->pss_signal_freq, pss_recv, y, PSS_LEN_FREQ - 1); + vec_prod_ccc_unalign(q->pss_signal_freq, pss_recv, y, PSS_LEN_FREQ - 1); y0 = vec_acc_cc(y, (PSS_LEN_FREQ - 1)/2); y1 = vec_acc_cc(&y[(PSS_LEN_FREQ - 1)/2], (PSS_LEN_FREQ - 1)/2); diff --git a/lib/utils/src/convolution.c b/lib/utils/src/convolution.c index b6ff45d08..3a869b3b4 100644 --- a/lib/utils/src/convolution.c +++ b/lib/utils/src/convolution.c @@ -66,7 +66,7 @@ int conv_fft_cc_run(conv_fft_cc_t *state, _Complex float *input, _Complex float dft_run_c2c(&state->input_plan, input, state->input_fft); dft_run_c2c(&state->filter_plan, filter, state->filter_fft); - vec_dot_prod_ccc(state->input_fft,state->filter_fft,state->output_fft,state->output_len); + vec_prod_ccc(state->input_fft,state->filter_fft,state->output_fft,state->output_len); dft_run_c2c(&state->output_plan, state->output_fft, output); diff --git a/lib/utils/src/vector.c b/lib/utils/src/vector.c index a2c49c16f..cc56d06b7 100644 --- a/lib/utils/src/vector.c +++ b/lib/utils/src/vector.c @@ -157,7 +157,7 @@ void vec_conj_cc(cf_t *x, cf_t *y, int len) { #endif } -void vec_dot_prod_ccc(cf_t *x,cf_t *y, cf_t *z, int len) { +void vec_prod_ccc(cf_t *x,cf_t *y, cf_t *z, int len) { #ifndef HAVE_VOLK int i; for (i=0;i