Skip to content

Build fix on macOS 64-bit #122

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

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Build fix on macOS 64-bit #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f390fb
Build fix on macOS 64-bit
Jan 22, 2024
f979190
Disable GCC pragma unroll loop when building with sanitizer
Jan 22, 2024
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
14 changes: 14 additions & 0 deletions src/xss-common-argsort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,17 @@ avx2_argsort(T *arr, arrsize_t *arg, arrsize_t arrsize, bool hasnan = false)
avx2_half_vector<T>,
avx2_vector<T>>::type;

#ifdef __APPLE__
using argtype =
typename std::conditional<sizeof(arrsize_t) == sizeof(int32_t),
avx2_half_vector<uint32_t>,
avx2_vector<uint64_t>>::type;
#else
using argtype =
typename std::conditional<sizeof(arrsize_t) == sizeof(int32_t),
avx2_half_vector<arrsize_t>,
avx2_vector<arrsize_t>>::type;
#endif

if (arrsize > 1) {
if constexpr (std::is_floating_point_v<T>) {
Expand Down Expand Up @@ -685,10 +692,17 @@ X86_SIMD_SORT_INLINE void avx2_argselect(T *arr,
avx2_half_vector<T>,
avx2_vector<T>>::type;

#ifdef __APPLE__
using argtype =
typename std::conditional<sizeof(arrsize_t) == sizeof(int32_t),
avx2_half_vector<uint32_t>,
avx2_vector<uint64_t>>::type;
#else
using argtype =
typename std::conditional<sizeof(arrsize_t) == sizeof(int32_t),
avx2_half_vector<arrsize_t>,
avx2_vector<arrsize_t>>::type;
#endif

if (arrsize > 1) {
if constexpr (std::is_floating_point_v<T>) {
Expand Down
2 changes: 1 addition & 1 deletion src/xss-common-includes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#define UNLIKELY(x) (x)
#endif

#if __GNUC__ >= 8
#if __GNUC__ >= 8 and !defined(__SANITIZE_ADDRESS__)
#define X86_SIMD_SORT_UNROLL_LOOP(num) PRAGMA(GCC unroll num)
#else
#define X86_SIMD_SORT_UNROLL_LOOP(num)
Expand Down
11 changes: 7 additions & 4 deletions src/xss-network-keyvaluesort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ bitonic_merge_dispatch(typename keyType::reg_t &key,
key = bitonic_merge_ymm_64bit<keyType, valueType>(key, value);
}
else {
static_assert(always_false<keyType>, "bitonic_merge_dispatch: No implementation");
static_assert(always_false<keyType>,
"bitonic_merge_dispatch: No implementation");
UNUSED(key);
UNUSED(value);
}
Expand All @@ -349,7 +350,8 @@ X86_SIMD_SORT_INLINE void sort_vec_dispatch(typename keyType::reg_t &key,
key = sort_ymm_64bit<keyType, valueType>(key, value);
}
else {
static_assert(always_false<keyType>, "sort_vec_dispatch: No implementation");
static_assert(always_false<keyType>,
"sort_vec_dispatch: No implementation");
UNUSED(key);
UNUSED(value);
}
Expand Down Expand Up @@ -584,8 +586,9 @@ X86_SIMD_SORT_INLINE void kvsort_n_vec(typename keyType::type_t *keys,
}

template <typename keyType, typename indexType, int maxN>
X86_SIMD_SORT_INLINE void
argsort_n(typename keyType::type_t *keys, arrsize_t *indices, int N)
X86_SIMD_SORT_INLINE void argsort_n(typename keyType::type_t *keys,
typename indexType::type_t *indices,
int N)
{
static_assert(keyType::numlanes == indexType::numlanes,
"invalid pairing of value/index types");
Expand Down