Remove cardinal limits

jfalcou · Oct 29, 2024 · d6a888c · d6a888c
1 parent c33662d
commit d6a888c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 17 deletions.
diff --git a/test/unit/api/compress/compress_copy_scalar_tuple.large.cpp b/test/unit/api/compress/compress_copy_scalar_tuple.large.cpp
@@ -14,6 +14,6 @@ using test_types = eve::test::wides<tts::types<double, std::int64_t, std::uint64
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<test_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {},
                     eve::compress_copy_scalar);
 };
diff --git a/test/unit/api/compress/compress_copy_scalar_tuple.small.cpp b/test/unit/api/compress/compress_copy_scalar_tuple.small.cpp
@@ -14,6 +14,6 @@ using test_types = eve::test::wides<tts::types<std::int16_t, std::uint16_t, std:
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<test_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {},
                     eve::compress_copy_scalar);
 };
diff --git a/test/unit/api/compress/compress_copy_simd_tuple.large.cpp b/test/unit/api/compress/compress_copy_simd_tuple.large.cpp
@@ -14,6 +14,5 @@ using test_types = eve::test::wides<tts::types<double, std::int64_t, std::uint64
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<test_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
-                    eve::compress_copy_simd);
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {}, eve::compress_copy_simd);
 };
diff --git a/test/unit/api/compress/compress_copy_simd_tuple.small.cpp b/test/unit/api/compress/compress_copy_simd_tuple.small.cpp
@@ -12,6 +12,5 @@
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<eve::test::simd::all_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
-                    eve::compress_copy_simd);
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {}, eve::compress_copy_simd);
 };
diff --git a/test/unit/api/compress/compress_copy_tuple.large.cpp b/test/unit/api/compress/compress_copy_tuple.large.cpp
@@ -14,6 +14,5 @@ using test_types = eve::test::wides<tts::types<double, std::int64_t, std::uint64
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<test_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
-                    eve::compress_copy);
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {}, eve::compress_copy);
 };
diff --git a/test/unit/api/compress/compress_copy_tuple.small.cpp b/test/unit/api/compress/compress_copy_tuple.small.cpp
@@ -14,6 +14,5 @@ using test_types = eve::test::wides<tts::types<std::int16_t, std::uint16_t, std:
 TTS_CASE_TPL("Check compress copy behavior", simd_types_for_compress<test_types>)
 <typename T>(tts::type<T>) {
   using e_t = kumi::tuple<std::int8_t, eve::element_type_t<T>, double>;
-  compress_copy_tst(eve::as<eve::wide<e_t, simd_type_cardinal_for_compress_tuple<T>>> {},
-                    eve::compress_copy);
+  compress_copy_tst(eve::as<eve::wide<e_t, typename T::cardinal_type>> {}, eve::compress_copy);
 };
diff --git a/test/unit/api/compress/compress_test_filter.hpp b/test/unit/api/compress/compress_test_filter.hpp
@@ -22,13 +22,6 @@ template<typename Type> struct rvv_compress_filter
 #ifdef SPY_SIMD_IS_RISCV_FIXED_RVV
 template<typename types_to_filter>
 using simd_types_for_compress = tts::filter<rvv_compress_filter, types_to_filter>::type;
-
-template<typename T>
-using simd_type_cardinal_for_compress_tuple =
-    std::conditional_t<T::cardinal_type::value <= eve::expected_cardinal_v<double> * 2,
-                       typename T::cardinal_type,
-                       typename eve::expected_cardinal_t<double>>;
 #else
 template<typename types_to_filter> using simd_types_for_compress = types_to_filter;
-template<typename T> using simd_type_cardinal_for_compress_tuple = typename T::cardinal_type;
 #endif