diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-01-06 14:44:51 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-01-06 14:44:51 -0500 |
| commit | 1b80996597fc1800c28e17f77b7cb09f9783d290 (patch) | |
| tree | 33b1938eedc12b15040acafd2d0171b0123523dd /volk/include | |
| parent | d94c47d652d170760ffca728dc61e45d629fcc04 (diff) | |
| parent | e337d7ce6b89403d68cfe75177811ec23571abe5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/volk_16i_max_star_16i_a.h | 4 | ||||
| -rw-r--r-- | volk/include/volk/volk_32f_s32f_stddev_32f_a.h | 6 | ||||
| -rw-r--r-- | volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/volk/include/volk/volk_16i_max_star_16i_a.h b/volk/include/volk/volk_16i_max_star_16i_a.h index 6a4f637086..28197ddef7 100644 --- a/volk/include/volk/volk_16i_max_star_16i_a.h +++ b/volk/include/volk/volk_16i_max_star_16i_a.h @@ -18,7 +18,7 @@ static inline void volk_16i_max_star_16i_a_ssse3(short* target, short* src0, un short candidate = src0[0]; short cands[8]; - __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6; + __m128i xmm0, xmm1, xmm3, xmm4, xmm5, xmm6; __m128i *p_src0; @@ -41,7 +41,7 @@ static inline void volk_16i_max_star_16i_a_ssse3(short* target, short* src0, un for(i = 0; i < bound; ++i) { xmm1 = _mm_load_si128(p_src0); p_src0 += 1; - xmm2 = _mm_sub_epi16(xmm1, xmm0); + //xmm2 = _mm_sub_epi16(xmm1, xmm0); diff --git a/volk/include/volk/volk_32f_s32f_stddev_32f_a.h b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h index 881067bdc0..75fe0cb2ed 100644 --- a/volk/include/volk/volk_32f_s32f_stddev_32f_a.h +++ b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h @@ -60,7 +60,7 @@ static inline void volk_32f_s32f_stddev_32f_a_sse4_1(float* stddev, const float* } returnValue /= num_points; returnValue -= (mean * mean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; } @@ -106,7 +106,7 @@ static inline void volk_32f_s32f_stddev_32f_a_sse(float* stddev, const float* in } returnValue /= num_points; returnValue -= (mean * mean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; } @@ -133,7 +133,7 @@ static inline void volk_32f_s32f_stddev_32f_a_generic(float* stddev, const float returnValue /= num_points; returnValue -= (mean * mean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; } diff --git a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h index 3a82e3d2f1..20ff676d89 100644 --- a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h +++ b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h @@ -72,7 +72,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_sse4_1(float* stddev, float newMean /= num_points; returnValue /= num_points; returnValue -= (newMean * newMean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; *mean = newMean; @@ -128,7 +128,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_sse(float* stddev, float* m newMean /= num_points; returnValue /= num_points; returnValue -= (newMean * newMean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; *mean = newMean; @@ -157,7 +157,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_generic(float* stddev, floa newMean /= num_points; returnValue /= num_points; returnValue -= (newMean * newMean); - returnValue = sqrt(returnValue); + returnValue = sqrtf(returnValue); } *stddev = returnValue; *mean = newMean; |