WIP avxOK

Author: serge-sans-paille

include/xsimd/arch/xsimd_avx.hpp

@@ -1225,8 +1225,8 @@ namespace xsimd
 
             auto src_lo = detail::complex_low(src, A{});
             auto src_hi = detail::complex_high(src, A{});
-            store_masked(reinterpret_cast<T*>(mem), src_lo, lo_mask, mode, A{});
-            store_masked(reinterpret_cast<T*>(mem) + src.size, src_hi, hi_mask, mode, A{});
+            store_masked(reinterpret_cast<T*>(mem), src_lo, lo_mask, mode, A { });
+            store_masked(reinterpret_cast<T*>(mem) + src.size, src_hi, hi_mask, mode, A { });
         }
 
         namespace detail

include/xsimd/arch/xsimd_avx512f.hpp

@@ -372,36 +372,39 @@ namespace xsimd
             detail::store_masked(mem, src, mask.mask(), Mode {});
         }
 
-        // namespace detail
-        // {
-        //     template <class A, class T>
-        //     std::array<batch_bool<T, A>, 2> zip_complex_mask(batch_bool<T, A> mask)
-        //     {
-        //         using mask_register_type = typename batch_bool<T, A>::register_type;
-        //         mask_register_type nmask = mask.to_native();
-
-        //         constexpr mask_register_type lo_bitmask = xsimd::utils::make_low_mask<mask_register_type>(mask.size / 2);
-        //         mask_register_type lo_mask = nmask & lo_bitmask;
-        //         lo_mask |= lo_mask << (mask.size / 2);
-
-        //         constexpr mask_register_type hi_bitmask = lo_bitmask << (mask.size / 2);
-        //         mask_register_type hi_mask = nmask & hi_bitmask;
-        //         hi_mask |= hi_mask >> (mask.size / 2);
-
-        //         return { batch_bool<T, A>{ lo_mask }, batch_bool<T, A>{ hi_mask } };
-        //     }
-        // }
+        namespace detail
+        {
+            template <class A, class T>
+            std::array<batch_bool<T, A>, 2> zip_complex_mask(batch_bool<T, A> mask)
+            {
+                using mask_register_type = typename batch_bool<T, A>::register_type;
+                mask_register_type nmask = mask.to_native();
+
+                constexpr mask_register_type lo_bitmask = xsimd::utils::make_low_mask<mask_register_type>(mask.size / 2);
+                mask_register_type lo_mask = nmask & lo_bitmask;
+                lo_mask |= lo_mask << (mask.size / 2);
+
+                constexpr mask_register_type hi_bitmask = lo_bitmask << (mask.size / 2);
+                mask_register_type hi_mask = nmask & hi_bitmask;
+                hi_mask |= hi_mask >> (mask.size / 2);
 
-        //template <class A, class T, class Mode>
-        //XSIMD_INLINE void
-        //store_complex_masked(std::complex<T>* mem, batch<std::complex<T>, A> const& src, batch_bool<T, A> mask, Mode mode, requires_arch<avx512f>) noexcept
-        //{
-        //    auto [lo_mask, hi_mask] = detail::zip_complex_mask(mask);
-        //    batch<T, A> src_lo = zip_lo(src.real(), src.imag());
-        //    batch<T, A> src_hi = zip_hi(src.real(), src.imag());
-        //    detail::store_masked(reinterpret_cast<T*>(mem), src_lo, lo_mask, mode);
-        //    detail::store_masked(reinterpret_cast<T*>(mem) + src.size, src_hi, hi_mask, mode);
-        //}
+                return { batch_bool<T, A> { lo_mask }, batch_bool<T, A> { hi_mask } };
+            }
+        }
+
+        template <class A, class T, class Mode>
+        XSIMD_INLINE void
+        store_complex_masked(std::complex<T>* mem, batch<std::complex<T>, A> const& src, batch_bool<T, A> mask, Mode mode, requires_arch<avx512f>) noexcept
+        {
+            auto [lo_mask, hi_mask] = detail::zip_complex_mask(mask);
+            batch<T, A> src_lo = zip_lo(src.real(), src.imag());
+            batch<T, A> src_hi = zip_hi(src.real(), src.imag());
+
+            auto src_lo = detail::complex_low(src, A { });
+            auto src_hi = detail::complex_high(src, A { });
+            detail::store_masked(reinterpret_cast<T*>(mem), src_lo, lo_mask, mode, A { });
+            detail::store_masked(reinterpret_cast<T*>(mem) + src.size, src_hi, hi_mask, mode, A { });
+        }
 
         // abs
         template <class A>