[Commit-gnuradio] [gnuradio] 01/02: volk: add missing sse2 puppets for popcnt

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit c37a6714120f1af566a68cca7404be3863e40c40
Author: Nathan West <address@hidden>
Date:   Mon Dec 22 08:25:42 2014 -0600

    volk: add missing sse2 puppets for popcnt
---
 volk/kernels/volk/volk_32u_popcntpuppet_32u.h |  4 ++--
 volk/kernels/volk/volk_64u_popcntpuppet_64u.h | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/volk/kernels/volk/volk_32u_popcntpuppet_32u.h 
b/volk/kernels/volk/volk_32u_popcntpuppet_32u.h
index 056983e..d5edd35 100644
--- a/volk/kernels/volk/volk_32u_popcntpuppet_32u.h
+++ b/volk/kernels/volk/volk_32u_popcntpuppet_32u.h
@@ -35,13 +35,13 @@ static inline void 
volk_32u_popcntpuppet_32u_generic(uint32_t* outVector, const
 }
 #endif /* LV_HAVE_GENERIC */
 
-#ifdef LV_HAVE_SSE_4_2
+#ifdef LV_HAVE_SSE4_2
 static inline void volk_32u_popcntpuppet_32u_a_sse4_2(uint32_t* outVector, 
const uint32_t* inVector, unsigned int num_points){
     unsigned int ii;
     for(ii=0; ii < num_points; ++ii) {
         volk_32u_popcnt_a_sse4_2(outVector+ii, *(inVector+ii) );
     }
 }
-#endif /* LV_HAVE_GENERIC */
+#endif /* LV_HAVE_SSE4_2 */
 
 #endif /* INCLUDED_volk_32fc_s32fc_rotatorpuppet_32fc_a_H */
diff --git a/volk/kernels/volk/volk_64u_popcntpuppet_64u.h 
b/volk/kernels/volk/volk_64u_popcntpuppet_64u.h
index 3903e0d..ae20ff4 100644
--- a/volk/kernels/volk/volk_64u_popcntpuppet_64u.h
+++ b/volk/kernels/volk/volk_64u_popcntpuppet_64u.h
@@ -31,11 +31,21 @@ static inline void 
volk_64u_popcntpuppet_64u_generic(uint64_t* outVector, const
     unsigned int ii;
     for(ii=0; ii < num_points; ++ii) {
         volk_64u_popcnt_generic(outVector+ii, num_points );
-        
+
     }
 }
 #endif /* LV_HAVE_GENERIC */
 
+#ifdef LV_HAVE_SSE4_2
+static inline void volk_64u_popcntpuppet_64u_a_sse4_2(uint64_t* outVector, 
const uint64_t* inVector, unsigned int num_points){
+    unsigned int ii;
+    for(ii=0; ii < num_points; ++ii) {
+        volk_64u_popcnt_a_sse4_2(outVector+ii, num_points );
+
+    }
+}
+#endif /* LV_HAVE_SSE4_2 */
+
 #ifdef LV_HAVE_NEON
 static inline void volk_64u_popcntpuppet_64u_neon(uint64_t* outVector, const 
uint64_t* inVector, unsigned int num_points){
     unsigned int ii;