diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-03-15 18:03:49 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-03-15 18:03:49 -0400 |
| commit | ac9cd0eba188e25d724878f3071a30ae6da47e48 (patch) | |
| tree | 6576c9de73667ca9f967cde7c82e7236618eb558 /volk | |
| parent | c4c985b2aed889bc49a4e30b1e8866bb214b03a2 (diff) | |
| parent | 29ac4f1f19c66d413db7876af7e58a9f983cae7d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/include/volk/volk_32f_s32f_convert_32i_a.h | 4 | ||||
| -rw-r--r-- | volk/include/volk/volk_32f_s32f_convert_32i_u.h | 6 | ||||
| -rw-r--r-- | volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h | 12 |
3 files changed, 9 insertions, 13 deletions
diff --git a/volk/include/volk/volk_32f_s32f_convert_32i_a.h b/volk/include/volk/volk_32f_s32f_convert_32i_a.h index 8f2fc791e4..15fa282fba 100644 --- a/volk/include/volk/volk_32f_s32f_convert_32i_a.h +++ b/volk/include/volk/volk_32f_s32f_convert_32i_a.h @@ -22,7 +22,7 @@ static inline void volk_32f_s32f_convert_32i_a_avx(int32_t* outputVector, const const float* inputVectorPtr = (const float*)inputVector; int32_t* outputVectorPtr = outputVector; - float min_val = -2147483648; + float min_val = -2147483647; float max_val = 2147483647; float r; @@ -71,7 +71,7 @@ static inline void volk_32f_s32f_convert_32i_a_sse2(int32_t* outputVector, const const float* inputVectorPtr = (const float*)inputVector; int32_t* outputVectorPtr = outputVector; - float min_val = -2147483648; + float min_val = -2147483647; float max_val = 2147483647; float r; diff --git a/volk/include/volk/volk_32f_s32f_convert_32i_u.h b/volk/include/volk/volk_32f_s32f_convert_32i_u.h index d8493454bd..d203546c62 100644 --- a/volk/include/volk/volk_32f_s32f_convert_32i_u.h +++ b/volk/include/volk/volk_32f_s32f_convert_32i_u.h @@ -22,10 +22,8 @@ static inline void volk_32f_s32f_convert_32i_u_sse2(int32_t* outputVector, const const float* inputVectorPtr = (const float*)inputVector; int32_t* outputVectorPtr = outputVector; - //float min_val = -2147483647; - //float max_val = 2147483647; - float min_val = -2146400000; - float max_val = 2146400000; + float min_val = -2147483647; + float max_val = 2147483647; float r; __m128 vScalar = _mm_set_ps1(scalar); diff --git a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h index a865e07371..cde9240cc7 100644 --- a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h +++ b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h @@ -196,7 +196,10 @@ static inline void volk_32fc_x2_dot_prod_32fc_a_sse_64(lv_32fc_t* result, const #if LV_HAVE_SSE && LV_HAVE_32 static inline void volk_32fc_x2_dot_prod_32fc_a_sse_32(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) { - + + volk_32fc_x2_dot_prod_32fc_a_generic(result, input, taps, num_bytes); + +#if 0 asm volatile ( " #pushl %%ebp\n\t" @@ -307,12 +310,7 @@ static inline void volk_32fc_x2_dot_prod_32fc_a_sse_32(lv_32fc_t* result, const } return; - - - - - - +#endif } #endif /*LV_HAVE_SSE*/ |