WIP

Author: DiamonDinoia

include/xsimd/types/xsimd_batch_constant.hpp

@@ -44,7 +44,10 @@ namespace xsimd
         /**
          * @brief Generate a batch of @p integers from this @p batch_bool_constant
          */
-        constexpr batch<as_integer_t<T>, A> as_batch() const noexcept { return { static_cast<as_integer_t<T>>(Values)... }; }
+        constexpr batch<as_integer_t<T>, A> as_batch() const noexcept
+        {
+            return { (Values ? as_integer_t<T>(-1) : as_integer_t<T>(0))... };
+        }
         /**
          * @brief Generate a batch of @p batch_type from this @p batch_bool_constant
          */

test/test_load_store.cpp

@@ -356,39 +356,10 @@ struct load_store_test
         auto mask = xsimd::make_batch_bool_constant<value_type, Generator, typename batch_type::arch_type>();
         array_type expected_masked{0};
 
-        std::size_t expected_pop = 0;
-        std::size_t expected_countr_one = 0;
-        std::size_t expected_countl_one = 0;
-        std::size_t expected_countr_zero = 0;
-        std::size_t expected_countl_zero = 0;
-        uint64_t expected_bits = 0;
-
         for (std::size_t i = 0; i < size; ++i)
         {
             const bool active = Generator::get(i, size);
-            if (active)
-            {
-                expected_masked[i] = expected[i];
-                expected_bits |= (uint64_t(1) << i);
-                ++expected_pop;
-            }
-        }
-
-        while (expected_countr_zero < size && !Generator::get(expected_countr_zero, size))
-        {
-            ++expected_countr_zero;
-        }
-        while (expected_countl_zero < size && !Generator::get(size - 1 - expected_countl_zero, size))
-        {
-            ++expected_countl_zero;
-        }
-        while (expected_countr_one < size && Generator::get(expected_countr_one, size))
-        {
-            ++expected_countr_one;
-        }
-        while (expected_countl_one < size && Generator::get(size - 1 - expected_countl_one, size))
-        {
-            ++expected_countl_one;
+            expected_masked[i] = active ? expected[i] : value_type();
         }
 
         b = xsimd::load(v.data(), mask, xsimd::aligned_mode());
@@ -397,34 +368,6 @@ struct load_store_test
         b = xsimd::load(v.data(), mask, xsimd::unaligned_mode());
         INFO(name, label + " unaligned");
         CHECK_BATCH_EQ(b, expected_masked);
-
-        CHECK_EQ(mask.truncated_mask(), expected_bits);
-        CHECK_EQ(mask.popcount(), expected_pop);
-        CHECK_EQ(mask.none(), expected_pop == 0);
-        CHECK_EQ(mask.any(), expected_pop != 0);
-        CHECK_EQ(mask.all(), expected_pop == size);
-        CHECK_EQ(mask.countr_one(), expected_countr_one);
-        CHECK_EQ(mask.countl_one(), expected_countl_one);
-        CHECK_EQ(mask.countr_zero(), expected_countr_zero);
-        CHECK_EQ(mask.countl_zero(), expected_countl_zero);
-
-        std::vector<std::size_t> indices;
-        for (std::size_t idx = 0; idx < size; ++idx)
-        {
-            if (mask.get(idx))
-            {
-                indices.push_back(idx);
-            }
-        }
-        std::vector<std::size_t> expected_indices;
-        for (std::size_t idx = 0; idx < size; ++idx)
-        {
-            if (Generator::get(idx, size))
-            {
-                expected_indices.push_back(idx);
-            }
-        }
-        CHECK_EQ(indices, expected_indices);
     }
 
     template <class Generator, class V>