mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Carles Fernandez 2016-02-12 10:57:53 +01:00
parent 27afafce0f
commit 5067c5852c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h
View File

@ -434,7 +434,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(lv_16sc_t*
if (neon_iters > 0) if (neon_iters > 0)
{ {
int16x4x2_t a_val, b_val, c_val; int16x4x2_t a_val, c_val;
__VOLK_ATTR_ALIGNED(16) lv_16sc_t dotProductVector[4]; __VOLK_ATTR_ALIGNED(16) lv_16sc_t dotProductVector[4];
float32x4_t half = vdupq_n_f32(0.5f); float32x4_t half = vdupq_n_f32(0.5f);
int16x4x2_t tmp16; int16x4x2_t tmp16;
@ -508,15 +508,15 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(lv_16sc_t*
// multiply the real*real and imag*imag to get real result // multiply the real*real and imag*imag to get real result
// a0r*b0r|a1r*b1r|a2r*b2r|a3r*b3r // a0r*b0r|a1r*b1r|a2r*b2r|a3r*b3r
tmp_real16.val[0] = vmul_s16(a_val.val[0], b_val.val[0]); tmp_real16.val[0] = vmul_s16(a_val.val[0], tmp16.val[0]);
// a0i*b0i|a1i*b1i|a2i*b2i|a3i*b3i // a0i*b0i|a1i*b1i|a2i*b2i|a3i*b3i
tmp_real16.val[1] = vmul_s16(a_val.val[1], b_val.val[1]); tmp_real16.val[1] = vmul_s16(a_val.val[1], tmp16.val[1]);
// Multiply cross terms to get the imaginary result // Multiply cross terms to get the imaginary result
// a0r*b0i|a1r*b1i|a2r*b2i|a3r*b3i // a0r*b0i|a1r*b1i|a2r*b2i|a3r*b3i
tmp_imag16.val[0] = vmul_s16(a_val.val[0], b_val.val[1]); tmp_imag16.val[0] = vmul_s16(a_val.val[0], tmp16.val[1]);
// a0i*b0r|a1i*b1r|a2i*b2r|a3i*b3r // a0i*b0r|a1i*b1r|a2i*b2r|a3i*b3r
tmp_imag16.val[1] = vmul_s16(a_val.val[1], b_val.val[0]); tmp_imag16.val[1] = vmul_s16(a_val.val[1], tmp16.val[0]);
c_val.val[0] = vsub_s16(tmp_real16.val[0], tmp_real16.val[1]); c_val.val[0] = vsub_s16(tmp_real16.val[0], tmp_real16.val[1]);
c_val.val[1] = vadd_s16(tmp_imag16.val[0], tmp_imag16.val[1]); c_val.val[1] = vadd_s16(tmp_imag16.val[0], tmp_imag16.val[1]);

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic.h
View File

@ -59,7 +59,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic_generic(lv_
in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t) * num_points, volk_gnsssdr_get_alignment()); in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t) * num_points, volk_gnsssdr_get_alignment());
memcpy(in_a[n], in, sizeof(lv_16sc_t) * num_points); memcpy(in_a[n], in, sizeof(lv_16sc_t) * num_points);
} }
result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t)); //result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_generic(result, local_code, phase_inc[0], phase,(const lv_16sc_t**) in_a, num_a_vectors, num_points); volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_generic(result, local_code, phase_inc[0], phase,(const lv_16sc_t**) in_a, num_a_vectors, num_points);
for(unsigned int n = 0; n < num_a_vectors; n++) for(unsigned int n = 0; n < num_a_vectors; n++)
@ -151,7 +151,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dotprodxnpuppet_16ic_neon(lv_16s
in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_points, volk_gnsssdr_get_alignment()); in_a[n] = (lv_16sc_t*)volk_gnsssdr_malloc(sizeof(lv_16sc_t)*num_points, volk_gnsssdr_get_alignment());
memcpy(in_a[n], in, sizeof(lv_16sc_t)*num_points); memcpy(in_a[n], in, sizeof(lv_16sc_t)*num_points);
} }
result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t)); //result = (lv_16sc_t*)calloc(num_points, sizeof(lv_16sc_t));
volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(result, local_code, phase_inc[0], phase, (const lv_16sc_t**) in_a, num_a_vectors, num_points); volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_neon(result, local_code, phase_inc[0], phase, (const lv_16sc_t**) in_a, num_a_vectors, num_points);
for(unsigned int n = 0; n < num_a_vectors; n++) for(unsigned int n = 0; n < num_a_vectors; n++)