Skip to content

Commit 8104455

Browse files
committed
Feat: Load/Store masked API
1. Adds new masked API compile time masks (store_masked and load_masked) 2. General use case optimization 3. New tests 4. x86 kernels 5. Adds new APIs to batch_bool_constant for convenience resembling #include<bit> 6. Tests the new APIs
1 parent 9d41ad9 commit 8104455

14 files changed

+1739
-12
lines changed

docs/source/api/data_transfer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Data transfer
1010
From memory:
1111

1212
+---------------------------------------+----------------------------------------------------+
13-
| :cpp:func:`load` | load values from memory |
13+
| :cpp:func:`load` | load values from memory (optionally masked) |
1414
+---------------------------------------+----------------------------------------------------+
1515
| :cpp:func:`load_aligned` | load values from aligned memory |
1616
+---------------------------------------+----------------------------------------------------+
@@ -30,7 +30,7 @@ From a scalar:
3030
To memory:
3131

3232
+---------------------------------------+----------------------------------------------------+
33-
| :cpp:func:`store` | store values to memory |
33+
| :cpp:func:`store` | store values to memory (optionally masked) |
3434
+---------------------------------------+----------------------------------------------------+
3535
| :cpp:func:`store_aligned` | store values to aligned memory |
3636
+---------------------------------------+----------------------------------------------------+

include/xsimd/arch/common/xsimd_common_arithmetic.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <limits>
1717
#include <type_traits>
1818

19+
#include "../../types/xsimd_batch_constant.hpp"
1920
#include "./xsimd_common_details.hpp"
2021

2122
namespace xsimd

include/xsimd/arch/common/xsimd_common_memory.hpp

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#define XSIMD_COMMON_MEMORY_HPP
1414

1515
#include <algorithm>
16+
#include <array>
1617
#include <complex>
1718
#include <stdexcept>
1819

@@ -348,6 +349,102 @@ namespace xsimd
348349
return detail::load_unaligned<A>(mem, cvt, common {}, detail::conversion_type<A, T_in, T_out> {});
349350
}
350351

352+
template <class A, class T>
353+
XSIMD_INLINE batch<T, A> load(T const* mem, aligned_mode, requires_arch<A>) noexcept
354+
{
355+
return load_aligned<A>(mem, convert<T> {}, A {});
356+
}
357+
358+
template <class A, class T>
359+
XSIMD_INLINE batch<T, A> load(T const* mem, unaligned_mode, requires_arch<A>) noexcept
360+
{
361+
return load_unaligned<A>(mem, convert<T> {}, A {});
362+
}
363+
364+
template <class A, class T_in, class T_out, bool... Values, class alignment>
365+
XSIMD_INLINE batch<T_out, A>
366+
load_masked(T_in const* mem, batch_bool_constant<T_out, A, Values...>, convert<T_out>, alignment, requires_arch<common>) noexcept
367+
{
368+
constexpr std::size_t size = batch<T_out, A>::size;
369+
alignas(A::alignment()) std::array<T_out, size> buffer {};
370+
constexpr bool mask[size] = { Values... };
371+
372+
for (std::size_t i = 0; i < size; ++i)
373+
buffer[i] = mask[i] ? static_cast<T_out>(mem[i]) : T_out(0);
374+
375+
return batch<T_out, A>::load(buffer.data(), aligned_mode {});
376+
}
377+
378+
template <class A, class T_in, class T_out, bool... Values, class alignment>
379+
XSIMD_INLINE void
380+
store_masked(T_out* mem, batch<T_in, A> const& src, batch_bool_constant<T_in, A, Values...>, alignment, requires_arch<common>) noexcept
381+
{
382+
constexpr std::size_t size = batch<T_in, A>::size;
383+
constexpr bool mask[size] = { Values... };
384+
385+
for (std::size_t i = 0; i < size; ++i)
386+
if (mask[i])
387+
{
388+
mem[i] = static_cast<T_out>(src.get(i));
389+
}
390+
}
391+
392+
template <class A, bool... Values, class Mode>
393+
XSIMD_INLINE batch<int32_t, A> load_masked(int32_t const* mem, batch_bool_constant<int32_t, A, Values...>, convert<int32_t>, Mode, requires_arch<A>) noexcept
394+
{
395+
const auto f = load_masked<A>(reinterpret_cast<const float*>(mem), batch_bool_constant<float, A, Values...> {}, convert<float> {}, Mode {}, A {});
396+
return bitwise_cast<int32_t>(f);
397+
}
398+
399+
template <class A, bool... Values, class Mode>
400+
XSIMD_INLINE batch<uint32_t, A> load_masked(uint32_t const* mem, batch_bool_constant<uint32_t, A, Values...>, convert<uint32_t>, Mode, requires_arch<A>) noexcept
401+
{
402+
const auto f = load_masked<A>(reinterpret_cast<const float*>(mem), batch_bool_constant<float, A, Values...> {}, convert<float> {}, Mode {}, A {});
403+
return bitwise_cast<uint32_t>(f);
404+
}
405+
406+
template <class A, bool... Values, class Mode>
407+
XSIMD_INLINE typename std::enable_if<types::has_simd_register<double, A>::value, batch<int64_t, A>>::type
408+
load_masked(int64_t const* mem, batch_bool_constant<int64_t, A, Values...>, convert<int64_t>, Mode, requires_arch<A>) noexcept
409+
{
410+
const auto d = load_masked<A>(reinterpret_cast<const double*>(mem), batch_bool_constant<double, A, Values...> {}, convert<double> {}, Mode {}, A {});
411+
return bitwise_cast<int64_t>(d);
412+
}
413+
414+
template <class A, bool... Values, class Mode>
415+
XSIMD_INLINE typename std::enable_if<types::has_simd_register<double, A>::value, batch<uint64_t, A>>::type
416+
load_masked(uint64_t const* mem, batch_bool_constant<uint64_t, A, Values...>, convert<uint64_t>, Mode, requires_arch<A>) noexcept
417+
{
418+
const auto d = load_masked<A>(reinterpret_cast<const double*>(mem), batch_bool_constant<double, A, Values...> {}, convert<double> {}, Mode {}, A {});
419+
return bitwise_cast<uint64_t>(d);
420+
}
421+
422+
template <class A, bool... Values, class Mode>
423+
XSIMD_INLINE void store_masked(int32_t* mem, batch<int32_t, A> const& src, batch_bool_constant<int32_t, A, Values...>, Mode, requires_arch<A>) noexcept
424+
{
425+
store_masked<A>(reinterpret_cast<float*>(mem), bitwise_cast<float>(src), batch_bool_constant<float, A, Values...> {}, Mode {}, A {});
426+
}
427+
428+
template <class A, bool... Values, class Mode>
429+
XSIMD_INLINE void store_masked(uint32_t* mem, batch<uint32_t, A> const& src, batch_bool_constant<uint32_t, A, Values...>, Mode, requires_arch<A>) noexcept
430+
{
431+
store_masked<A>(reinterpret_cast<float*>(mem), bitwise_cast<float>(src), batch_bool_constant<float, A, Values...> {}, Mode {}, A {});
432+
}
433+
434+
template <class A, bool... Values, class Mode>
435+
XSIMD_INLINE typename std::enable_if<types::has_simd_register<double, A>::value, void>::type
436+
store_masked(int64_t* mem, batch<int64_t, A> const& src, batch_bool_constant<int64_t, A, Values...>, Mode, requires_arch<A>) noexcept
437+
{
438+
store_masked<A>(reinterpret_cast<double*>(mem), bitwise_cast<double>(src), batch_bool_constant<double, A, Values...> {}, Mode {}, A {});
439+
}
440+
441+
template <class A, bool... Values, class Mode>
442+
XSIMD_INLINE typename std::enable_if<types::has_simd_register<double, A>::value, void>::type
443+
store_masked(uint64_t* mem, batch<uint64_t, A> const& src, batch_bool_constant<uint64_t, A, Values...>, Mode, requires_arch<A>) noexcept
444+
{
445+
store_masked<A>(reinterpret_cast<double*>(mem), bitwise_cast<double>(src), batch_bool_constant<double, A, Values...> {}, Mode {}, A {});
446+
}
447+
351448
// rotate_right
352449
template <size_t N, class A, class T>
353450
XSIMD_INLINE batch<T, A> rotate_right(batch<T, A> const& self, requires_arch<common>) noexcept

include/xsimd/arch/xsimd_avx.hpp

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <type_traits>
1919

2020
#include "../types/xsimd_avx_register.hpp"
21+
#include "../types/xsimd_batch_constant.hpp"
2122

2223
namespace xsimd
2324
{
@@ -871,6 +872,134 @@ namespace xsimd
871872
return _mm256_loadu_pd(mem);
872873
}
873874

875+
// load_masked
876+
template <class A, bool... Values, class Mode>
877+
XSIMD_INLINE batch<float, A> load_masked(float const* mem, batch_bool_constant<float, A, Values...> mask, convert<float>, Mode, requires_arch<avx>) noexcept
878+
{
879+
XSIMD_IF_CONSTEXPR(mask.none())
880+
{
881+
return _mm256_setzero_ps();
882+
}
883+
else XSIMD_IF_CONSTEXPR(mask.all())
884+
{
885+
return load<A>(mem, Mode {});
886+
}
887+
// confined to lower 128-bit half (4 lanes) → forward to SSE2
888+
else XSIMD_IF_CONSTEXPR(mask.countl_zero() >= 4)
889+
{
890+
constexpr auto mlo = ::xsimd::detail::lower_half<sse4_2>(mask);
891+
const auto lo = load_masked(mem, mlo, convert<float> {}, Mode {}, sse4_2 {});
892+
return batch<float, A>(detail::merge_sse(lo, batch<float, sse4_2>(0.f)));
893+
}
894+
// confined to upper 128-bit half (4 lanes) → forward to SSE2
895+
else XSIMD_IF_CONSTEXPR(mask.countr_zero() >= 4)
896+
{
897+
constexpr auto mhi = ::xsimd::detail::upper_half<sse4_2>(mask);
898+
const auto hi = load_masked(mem + 4, mhi, convert<float> {}, Mode {}, sse4_2 {});
899+
return batch<float, A>(detail::merge_sse(batch<float, sse4_2>(0.f), hi));
900+
}
901+
else
902+
{
903+
// crossing 128-bit boundary → use 256-bit masked load
904+
return _mm256_maskload_ps(mem, mask.as_batch());
905+
}
906+
}
907+
908+
template <class A, bool... Values, class Mode>
909+
XSIMD_INLINE batch<double, A> load_masked(double const* mem, batch_bool_constant<double, A, Values...> mask, convert<double>, Mode, requires_arch<avx>) noexcept
910+
{
911+
XSIMD_IF_CONSTEXPR(mask.none())
912+
{
913+
return _mm256_setzero_pd();
914+
}
915+
else XSIMD_IF_CONSTEXPR(mask.all())
916+
{
917+
return load<A>(mem, Mode {});
918+
}
919+
// confined to lower 128-bit half (2 lanes) → forward to SSE2
920+
else XSIMD_IF_CONSTEXPR(mask.countl_zero() >= 2)
921+
{
922+
constexpr auto mlo = ::xsimd::detail::lower_half<sse4_2>(mask);
923+
const auto lo = load_masked(mem, mlo, convert<double> {}, Mode {}, sse4_2 {});
924+
return batch<double, A>(detail::merge_sse(lo, batch<double, sse4_2>(0.0)));
925+
}
926+
// confined to upper 128-bit half (2 lanes) → forward to SSE2
927+
else XSIMD_IF_CONSTEXPR(mask.countr_zero() >= 2)
928+
{
929+
constexpr auto mhi = ::xsimd::detail::upper_half<sse4_2>(mask);
930+
const auto hi = load_masked(mem + 2, mhi, convert<double> {}, Mode {}, sse4_2 {});
931+
return batch<double, A>(detail::merge_sse(batch<double, sse4_2>(0.0), hi));
932+
}
933+
else
934+
{
935+
// crossing 128-bit boundary → use 256-bit masked load
936+
return _mm256_maskload_pd(mem, mask.as_batch());
937+
}
938+
}
939+
940+
// store_masked
941+
template <class A, bool... Values, class Mode>
942+
XSIMD_INLINE void store_masked(float* mem, batch<float, A> const& src, batch_bool_constant<float, A, Values...> mask, Mode, requires_arch<avx>) noexcept
943+
{
944+
XSIMD_IF_CONSTEXPR(mask.none())
945+
{
946+
return;
947+
}
948+
else XSIMD_IF_CONSTEXPR(mask.all())
949+
{
950+
src.store(mem, Mode {});
951+
}
952+
// confined to lower 128-bit half (4 lanes) → forward to SSE2
953+
else XSIMD_IF_CONSTEXPR(mask.countl_zero() >= 4)
954+
{
955+
constexpr auto mlo = ::xsimd::detail::lower_half<sse4_2>(mask);
956+
const batch<float, sse4_2> lo(_mm256_castps256_ps128(src));
957+
store_masked<sse4_2>(mem, lo, mlo, Mode {}, sse4_2 {});
958+
}
959+
// confined to upper 128-bit half (4 lanes) → forward to SSE2
960+
else XSIMD_IF_CONSTEXPR(mask.countr_zero() >= 4)
961+
{
962+
constexpr auto mhi = ::xsimd::detail::upper_half<sse4_2>(mask);
963+
const batch<float, sse4_2> hi(_mm256_extractf128_ps(src, 1));
964+
store_masked<sse4_2>(mem + 4, hi, mhi, Mode {}, sse4_2 {});
965+
}
966+
else
967+
{
968+
_mm256_maskstore_ps(mem, mask.as_batch(), src);
969+
}
970+
}
971+
972+
template <class A, bool... Values, class Mode>
973+
XSIMD_INLINE void store_masked(double* mem, batch<double, A> const& src, batch_bool_constant<double, A, Values...> mask, Mode, requires_arch<avx>) noexcept
974+
{
975+
XSIMD_IF_CONSTEXPR(mask.none())
976+
{
977+
return;
978+
}
979+
else XSIMD_IF_CONSTEXPR(mask.all())
980+
{
981+
src.store(mem, Mode {});
982+
}
983+
// confined to lower 128-bit half (2 lanes) → forward to SSE2
984+
else XSIMD_IF_CONSTEXPR(mask.countl_zero() >= 2)
985+
{
986+
constexpr auto mlo = ::xsimd::detail::lower_half<sse2>(mask);
987+
const batch<double, sse2> lo(_mm256_castpd256_pd128(src));
988+
store_masked<sse2>(mem, lo, mlo, Mode {}, sse4_2 {});
989+
}
990+
// confined to upper 128-bit half (2 lanes) → forward to SSE2
991+
else XSIMD_IF_CONSTEXPR(mask.countr_zero() >= 2)
992+
{
993+
constexpr auto mhi = ::xsimd::detail::upper_half<sse2>(mask);
994+
const batch<double, sse2> hi(_mm256_extractf128_pd(src, 1));
995+
store_masked<sse2>(mem + 2, hi, mhi, Mode {}, sse4_2 {});
996+
}
997+
else
998+
{
999+
_mm256_maskstore_pd(mem, mask.as_batch(), src);
1000+
}
1001+
}
1002+
8741003
// lt
8751004
template <class A>
8761005
XSIMD_INLINE batch_bool<float, A> lt(batch<float, A> const& self, batch<float, A> const& other, requires_arch<avx>) noexcept

0 commit comments

Comments
 (0)