[Commit-gnuradio] [gnuradio] 04/09: volk: enabling unaligned protokernels for rotator

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit b5f2cac7c6a3a532ae51579fd4899b5ce01fd70a
Author: Nathan West <address@hidden>
Date:   Mon Jan 27 18:57:27 2014 -0600

    volk: enabling unaligned protokernels for rotator
    
    Added ifdefs so that the existing unaligned kernels get built and
    tested.
---
 .../volk/volk_32fc_s32fc_rotatorpuppet_32fc.h       | 21 +++++++++++++--------
 volk/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h |  9 +++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/volk/kernels/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h 
b/volk/kernels/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
index 2bcbb81..3a1f8e4 100644
--- a/volk/kernels/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
+++ b/volk/kernels/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
@@ -22,6 +22,7 @@ static inline void 
volk_32fc_s32fc_rotatorpuppet_32fc_generic(lv_32fc_t* outVect
     volk_32fc_s32fc_x2_rotator_32fc_generic(outVector, inVector, phase_inc, 
phase, num_points);
     
 }
+
 #endif /* LV_HAVE_GENERIC */
 
 
@@ -34,15 +35,20 @@ static inline void 
volk_32fc_s32fc_rotatorpuppet_32fc_a_sse4_1(lv_32fc_t* outVec
    
 }
 
+#endif /* LV_HAVE_SSE4_1 */
+
+
+#ifdef LV_HAVE_SSE4_1
+#include <smmintrin.h>
 static inline void volk_32fc_s32fc_rotatorpuppet_32fc_u_sse4_1(lv_32fc_t* 
outVector, const lv_32fc_t* inVector, const lv_32fc_t phase_inc, unsigned int 
num_points){    
     lv_32fc_t phase[1] = {lv_cmake(.3, .95393)};
     volk_32fc_s32fc_x2_rotator_32fc_u_sse4_1(outVector, inVector, phase_inc, 
phase, num_points);
    
 }
 
-
 #endif /* LV_HAVE_SSE4_1 */
 
+
 #ifdef LV_HAVE_AVX
 #include <immintrin.h>
 
@@ -59,6 +65,12 @@ static inline void 
volk_32fc_s32fc_rotatorpuppet_32fc_a_avx(lv_32fc_t* outVector
     volk_32fc_s32fc_x2_rotator_32fc_a_avx(outVector, inVector, phase_inc, 
phase, num_points);
 }
 
+#endif /* LV_HAVE_AVX */
+
+
+#ifdef LV_HAVE_AVX
+#include <immintrin.h>
+
 static inline void volk_32fc_s32fc_rotatorpuppet_32fc_u_avx(lv_32fc_t* 
outVector, const lv_32fc_t* inVector, const lv_32fc_t phase_inc, unsigned int 
num_points){    
     lv_32fc_t phase[1] = {lv_cmake(.3, .95393)};
     volk_32fc_s32fc_x2_rotator_32fc_u_avx(outVector, inVector, phase_inc, 
phase, num_points);
@@ -66,11 +78,4 @@ static inline void 
volk_32fc_s32fc_rotatorpuppet_32fc_u_avx(lv_32fc_t* outVector
     
 #endif /* LV_HAVE_AVX */
 
-
-
-
-
-
-
-
 #endif /* INCLUDED_volk_32fc_s32fc_rotatorpuppet_32fc_a_H */
diff --git a/volk/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h 
b/volk/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
index 3212e08..e25d2a4 100644
--- a/volk/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
+++ b/volk/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
@@ -34,6 +34,7 @@ static inline void 
volk_32fc_s32fc_x2_rotator_32fc_generic(lv_32fc_t* outVector,
     }
     
 }
+
 #endif /* LV_HAVE_GENERIC */
 
 
@@ -133,6 +134,11 @@ static inline void 
volk_32fc_s32fc_x2_rotator_32fc_a_sse4_1(lv_32fc_t* outVector
 
 }
 
+#endif /* LV_HAVE_SSE4_1 for aligned */
+
+
+#ifdef LV_HAVE_SSE4_1
+#include <smmintrin.h>
 
 /*!
   \brief rotate input vector at fixed rate per sample from initial phase offset
@@ -341,8 +347,11 @@ static inline void 
volk_32fc_s32fc_x2_rotator_32fc_a_avx(lv_32fc_t* outVector, c
 
 }
 
+#endif /* LV_HAVE_AVX for aligned */
 
 
+#ifdef LV_HAVE_AVX
+#include <immintrin.h>
 
 /*!
   \brief rotate input vector at fixed rate per sample from initial phase offset