8000 ENH: Convert comparison from C universal intrinsics to C++ using Highway by ixgbe · Pull Request #28490 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: Convert comparison from C universal intrinsics to C++ using Highway #28490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

ENH: Convert comparison from C universal intrinsics to C++ using Highway #28490

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
98c0cc2
ENH: Convert comparison from C universal intrinsics to C++ using Highway
ixgbe Mar 13, 2025
1066b49
Replace OrderedTruncate2To with OrderedDemote2To
ixgbe Mar 13, 2025
faf1bdf
MAINT: Enable building loop_comparision on vector length agnostic arc…
ixgbe Mar 14, 2025
46792b4 8000
fix compile error[1]
ixgbe Mar 15, 2025
62cea2a
fix compile error[2]: cannot convert long unsigned int to unsigned int
ixgbe Mar 17, 2025
2f6aae9
fix test failed[1]: Non-bitwise-equal booleans test failed
ixgbe Mar 17, 2025
fb47971
fix test failed[2]: Non-bitwise-equal booleans test failed
ixgbe Mar 17, 2025
365ca32
fix test failed[3]: Non-bitwise-equal booleans test failed
ixgbe Mar 18, 2025
30dcc0a
fix internal compiler error: in sign_mask, at wide-int.h:855 on ARM S…
ixgbe Mar 18, 2025
e2a3cc6
fix compile error[3]:OrderedTruncate2To is not a member of hn
ixgbe Mar 19, 2025
8008e40
fix compile error[4]:OrderedTruncate2To is not a member of hn
ixgbe Mar 19, 2025
e1c3730
Add Highway tag wrapper to simplify template function development
ixgbe Mar 26, 2025
e07bd6e
Fix compile error for RISC-V architecture
ixgbe Mar 26, 2025
fb9cbd9
Optimize the code based on the Highway wrapper
ixgbe Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix compile error[3]:OrderedTruncate2To is not a member of hn
  • Loading branch information
@ixgbe
ixgbe committed Mar 19, 2025
commit e2a3cc609216d9c1a3e3ca20b766f29d9c2f6ac9
55 changes: 23 additions & 32 deletions numpy/_core/src/umath/loops_comparison.dispatch.cpp
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,6 @@ using vec_s64 = hn::Vec<decltype(s64)>;
using vec_f32 = hn::Vec<decltype(f32)>;
using vec_f64 = hn::Vec<decltype(f64)>;

HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b16(vec_u16 a, vec_u16 b) {
return hn::OrderedTruncate2To(u8, a, b);
}

HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b32(vec_u32 a, vec_u32 b, vec_u32 c, vec_u32 d) {
auto ab = hn::OrderedTruncate2To(u16, a, b);
auto cd = hn::OrderedTruncate2To(u16, c, d);
return simd_pack_b8_b16(ab, cd);
}

HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b64(vec_u64 a, vec_u64 b, vec_u64 c, vec_u64 d,
vec_u64 e, vec_u64 f, vec_u64 g, vec_u64 h) {
auto ab = hn::OrderedTruncate2To(u32, a, b);
auto cd = hn::OrderedTruncate2To(u32, c, d);
auto ef = hn::OrderedTruncate2To(u32, e, f);
auto gh = hn::OrderedTruncate2To(u32, g, h);
return simd_pack_b8_b32(ab, cd, ef, gh);
}

HWY_INLINE HWY_ATTR vec_u8 simd_xnor_b8(vec_u8 a, vec_u8 b) {
return hn::Not(hn::Xor(a, b));
}
Expand Down Expand Up @@ -79,7 +60,6 @@ struct TypeTraits<uint8_t> {
static constexpr int Len = 8;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -92,7 +72,6 @@ struct TypeTraits<int8_t> {
static constexpr int Len = 8;
static constexpr bool IsSigned = true;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -105,7 +84,6 @@ struct TypeTraits<uint16_t> {
static constexpr int Len = 16;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -118,7 +96,6 @@ struct TypeTraits<int16_t> {
static constexpr int Len = 16;
static constexpr bool IsSigned = true;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -131,7 +108,6 @@ struct TypeTraits<uint32_t> {
static constexpr int Len = 32;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -144,7 +120,6 @@ struct TypeTraits<int32_t> {
static constexpr int Len = 32;
static constexpr bool IsSigned = true;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -157,7 +132,6 @@ struct TypeTraits<uint64_t> {
static constexpr int Len = 64;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -170,7 +144,6 @@ struct TypeTraits<int64_t> {
static constexpr int Len = 64;
static constexpr bool IsSigned = true;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = false;
};

Expand All @@ -183,7 +156,6 @@ struct TypeTraits<float> {
static constexpr int Len = 32;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = true;
static constexpr int HasSIMD = NPY_SIMD_F32;
static constexpr bool IsBool = false;
};

Expand All @@ -196,7 +168,6 @@ struct TypeTraits<double> {
static constexpr int Len = 64;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = true;
static constexpr int HasSIMD = NPY_SIMD_F64;
static constexpr bool IsBool = false;
};

Expand All @@ -209,7 +180,6 @@ struct TypeTraits<bool> {
static constexpr int Len = 8;
static constexpr bool IsSigned = false;
static constexpr bool IsFloat = false;
static constexpr int HasSIMD = NPY_SIMD;
static constexpr bool IsBool = true;
};

Expand Down Expand Up @@ -291,6 +261,26 @@ struct CompareOpTraits<CompareOp::LessEqual> {
}
};

#if (NPY_SIMD || NPY_SIMD_F32 || NPY_SIMD_F64)
HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b16(vec_u16 a, vec_u16 b) {
return hn::OrderedTruncate2To(u8, a, b);
}

HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b32(vec_u32 a, vec_u32 b, vec_u32 c, vec_u32 d) {
auto ab = hn::OrderedTruncate2To(u16, a, b);
auto cd = hn::OrderedTruncate2To(u16, c, d);
return simd_pack_b8_b16(ab, cd);
}

HWY_INLINE HWY_ATTR vec_u8 simd_pack_b8_b64(vec_u64 a, vec_u64 b, vec_u64 c, vec_u64 d,
vec_u64 e, vec_u64 f, vec_u64 g, vec_u64 h) {
auto ab = hn::OrderedTruncate2To(u32, a, b);
auto cd = hn::OrderedTruncate2To(u32, c, d);
auto ef = hn::OrderedTruncate2To(u32, e, f);
auto gh = hn::OrderedTruncate2To(u32, g, h);
return simd_pack_b8_b32(ab, cd, ef, gh);
}

template<typename Traits, typename Op>
static auto process_simd_compare(const typename Traits::VecType& a,
const typename Traits::VecType& b,
Expand Down Expand Up @@ -537,13 +527,14 @@ static void simd_binary_scalar2_compare_b8(char **args, npy_intp len) {
*dst = Op_Traits::scalarCompare(a, scalar);
}
}
#endif

template<typename T, CompareOp Op>
static inline void run_binary_simd_compare(char **args, npy_intp const *dimensions, npy_intp const *steps) {
using Traits = TypeTraits<T>;
using Traits_Op = CompareOpTraits<Op>;

if constexpr (Traits::HasSIMD) {
#if (NPY_SIMD || NPY_SIMD_F32 || NPY_SIMD_F64)
if (!is_mem_overlap(args[0], steps[0], args[2], steps[2], dimensions[0]) &&
!is_mem_overlap(args[1], steps[1], args[2], steps[2], dimensions[0])) {
/* argument one scalar */
Expand Down Expand Up @@ -573,7 +564,7 @@ static inline void run_binary_simd_compare(char **args, npy_intp const *dimensio
return;
}
}
}
#endif

BINARY_LOOP {
if constexpr (Traits::IsBool) {
Expand Down
Loading
0