Skip to content

Enable argsort and argselect methods on 32-bit platforms #88

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 1 commit into from
Oct 18, 2023
Merged

Enable argsort and argselect methods on 32-bit platforms #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions src/avx512-64bit-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ struct ymm_vector<float> {
{
return _mm512_mask_i64gather_ps(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm256_mmask_i32gather_ps(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down Expand Up @@ -247,6 +253,12 @@ struct ymm_vector<uint32_t> {
{
return _mm512_mask_i64gather_epi32(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm256_mmask_i32gather_epi32(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down Expand Up @@ -393,6 +405,12 @@ struct ymm_vector<int32_t> {
{
return _mm512_mask_i64gather_epi32(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm256_mmask_i32gather_epi32(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down Expand Up @@ -548,6 +566,12 @@ struct zmm_vector<int64_t> {
{
return _mm512_mask_i64gather_epi64(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm512_mask_i32gather_epi64(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down Expand Up @@ -688,6 +712,12 @@ struct zmm_vector<uint64_t> {
{
return _mm512_mask_i64gather_epi64(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm512_mask_i32gather_epi64(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down Expand Up @@ -864,6 +894,12 @@ struct zmm_vector<double> {
{
return _mm512_mask_i64gather_pd(src, mask, index, base, scale);
}
template <int scale>
static reg_t
mask_i64gather(reg_t src, opmask_t mask, __m256i index, void const *base)
{
return _mm512_mask_i32gather_pd(src, mask, index, base, scale);
}
static reg_t i64gather(type_t *arr, arrsize_t *ind)
{
return set(arr[ind[7]],
Expand Down
4 changes: 3 additions & 1 deletion src/avx512-common-argsort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
#include <stdio.h>
#include <vector>

using argtype = zmm_vector<arrsize_t>;
using argtype = typename std::conditional<sizeof(arrsize_t) == sizeof(int32_t),
ymm_vector<arrsize_t>,
zmm_vector<arrsize_t>>::type;
using argreg_t = typename argtype::reg_t;

/*
Expand Down
2 changes: 1 addition & 1 deletion tests/test-qsort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ TYPED_TEST_P(simdsort, test_partial_qsort)
for (auto type : this->arrtype) {
for (auto size : this->arrsize) {
// k should be at least 1
size_t k = std::max(0x1ul, rand() % size);
size_t k = std::max((size_t)1, rand() % size);
std::vector<TypeParam> arr = get_array<TypeParam>(type, size);
std::vector<TypeParam> sortedarr = arr;
std::sort(sortedarr.begin(),
Expand Down