diff options
| author | Tom Rondeau | 2011-02-02 14:21:46 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-02-02 14:21:46 -0500 |
| commit | b806f6e95cd917e54884841c8e7928204ecd78f8 (patch) | |
| tree | 90b8a7bc9967567ef1c841a38189edd212f14352 /volk/include | |
| parent | 736874202f15222fa3ec10ceeb1815e8a595ed3a (diff) | |
| download | gnuradio-b806f6e95cd917e54884841c8e7928204ecd78f8.tar.gz gnuradio-b806f6e95cd917e54884841c8e7928204ecd78f8.tar.bz2 gnuradio-b806f6e95cd917e54884841c8e7928204ecd78f8.zip | |
volk: updating to readd unaligned dot product under new name scheme.
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/Makefile.am | 1 | ||||
| -rw-r--r-- | volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h (renamed from volk/include/volk/volk_32fc_conjugate_dot_prod_unaligned.h) | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index eb97775b0..7a5edd624 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -66,6 +66,7 @@ volkinclude_HEADERS = \ volk_32f_s32f_calc_spectral_noise_floor_32f_a16.h \ volk_32fc_s32f_atan2_32f_a16.h \ volk_32fc_x2_conjugate_dot_prod_32fc_a16.h \ + volk_32fc_x2_conjugate_dot_prod_32fc_u.h \ volk_32fc_deinterleave_32f_x2_a16.h \ volk_32fc_deinterleave_64f_x2_a16.h \ volk_32fc_s32f_deinterleave_real_16i_a16.h \ diff --git a/volk/include/volk/volk_32fc_conjugate_dot_prod_unaligned.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h index ead1573fe..2fa5918cc 100644 --- a/volk/include/volk/volk_32fc_conjugate_dot_prod_unaligned.h +++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h @@ -1,5 +1,5 @@ -#ifndef INCLUDED_VOLK_32fc_CONJUGATE_DOT_PROD_UNALIGNED_H -#define INCLUDED_VOLK_32fc_CONJUGATE_DOT_PROD_UNALIGNED_H +#ifndef INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_u_H +#define INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_u_H #include<volk/volk_complex.h> @@ -8,7 +8,7 @@ #if LV_HAVE_GENERIC -static inline void volk_32fc_conjugate_dot_prod_unaligned_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) { +static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) { float * res = (float*) result; float * in = (float*) input; @@ -64,7 +64,7 @@ static inline void volk_32fc_conjugate_dot_prod_unaligned_generic(lv_32fc_t* res #include <mmintrin.h> -static inline void volk_32fc_conjugate_dot_prod_unaligned_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) { +static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) { static const uint32_t conjugator[4] __attribute__((aligned(16)))= {0x00000000, 0x80000000, 0x00000000, 0x80000000}; @@ -138,7 +138,7 @@ static inline void volk_32fc_conjugate_dot_prod_unaligned_sse3(lv_32fc_t* result #endif /*LV_HAVE_SSE3*/ -#endif /*INCLUDED_VOLK_32fc_CONJUGATE_DOT_PROD_UNALIGNED_H*/ +#endif /*INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_u_H*/ |