kfr

commit 231594a875537a2140a9c4383158e9cf1a930d46
parent 969aee6c30842a4486facc57e088cd177fcc07cb
Author: [email protected] <[email protected]>
Date:   Fri, 22 Jul 2016 10:31:28 +0300

Fix x87 compilation

Diffstat:
M
include/kfr/base/abs.hpp
 | 
6
+++---
M
include/kfr/base/min_max.hpp
 | 
4
++++
M
tests/vec_test.cpp
 | 
2
++

3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/include/kfr/base/abs.hpp b/include/kfr/base/abs.hpp
@@ -70,7 +70,7 @@ public:
 };
 
 template <cpu_t cc>
-struct in_abs<cpu_t::ssse3, cc> : in_abs<cpu_t::common>, in_select<cc>
+struct in_abs<cpu_t::ssse3, cc> : in_select<cc>
 {
     constexpr static cpu_t cpu = cpu_t::ssse3;
 
@@ -100,10 +100,10 @@ public:
 };
 
 template <cpu_t cc>
-struct in_abs<cpu_t::avx2, cc> : in_abs<cc>
+struct in_abs<cpu_t::avx2, cc> : in_abs<cpu_t::ssse3, cc>
 {
     constexpr static cpu_t cpu = cpu_t::avx2;
-    using in_abs<cc>::abs;
+    using in_abs<cpu_t::ssse3, cc>::abs;
 
     KFR_CPU_INTRIN(avx2) i32avx abs(i32avx value) { return _mm256_abs_epi32(*value); }
     KFR_CPU_INTRIN(avx2) i16avx abs(i16avx value) { return _mm256_abs_epi16(*value); }
diff --git a/include/kfr/base/min_max.hpp b/include/kfr/base/min_max.hpp
@@ -54,6 +54,10 @@ struct in_min_max<cpu_t::common, cc> : in_select<cc>
 {
     constexpr static cpu_t cpu = cpu_t::common;
 
+private:
+    using in_select<cc>::select;
+public:
+
     template <typename T>
     KFR_SINTRIN T min(initialvalue<T>)
     {
diff --git a/tests/vec_test.cpp b/tests/vec_test.cpp
@@ -65,6 +65,7 @@ TEST(vec_apply)
     CHECK(apply(fn_sqr(), make_vector(1, 2, 3, 4, 5)) == make_vector(1, 4, 9, 16, 25));
 }
 
+#ifdef CID_ARCH_SSE
 TEST(vec_tovec)
 {
     const __m128 x = _mm_set_ps(4.f, 3.f, 2.f, 1.f);
@@ -74,6 +75,7 @@ TEST(vec_tovec)
     const simd<f64, 7> z{ 1, 2, 3, 4, 5, 6, 7 };
     CHECK(tovec(z) == vec<f64, 7>(1, 2, 3, 4, 5, 6, 7));
 }
+#endif
 
 TEST(vec_zerovector)
 {