8000 ENH: Use Highway's VQSort on AArch64 by Mousius · Pull Request #24018 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: Use Highway's VQSort on AArch64 #24018

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 8 commits into from
Nov 24, 2023
Merged

ENH: Use Highway's VQSort on AArch64 #24018

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8082fe
ENH: Use Highway's VQSort on AArch64
Mousius Jun 20, 2023
edac5aa
Better gating of Highway
Mousius Jun 22, 2023
11ab024
Use VQSortStatic
Mousius Jun 26, 2023
003c3a4
Add argsort to meson
Mousius Sep 19, 2023
87f6d19
Fix up Highway gate in Meson
Mousius Sep 19, 2023
4d139b3
Re-align submodules with main
Mousius Oct 2, 2023
59443e8
Switch off simd_select for AArch64
Mousius Oct 2, 2023
278e1de
Minor text fixes
Mousius Oct 2, 2023
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
Use VQSortStatic
  • Loading branch information
@Mousius
Mousius committed Nov 20, 2023
commit 11ab024b71ab8b2d026d34e2df92a1a0e3e4b35a
14 changes: 7 additions & 7 deletions numpy/_core/src/npysort/simd_qsort.dispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "x86-simd-sort/src/avx512-32bit-qsort.hpp"
#include "x86-simd-sort/src/avx512-64bit-qsort.hpp"
#elif USE_HIGHWAY
#include "hwy/contrib/sort/vqsort.h"
#include "hwy/contrib/sort/vqsort-inl.h"
#endif

namespace np { namespace qsort_simd {
Expand Down Expand Up @@ -97,27 +97,27 @@ template<> void NPY_CPU_DISPATCH_CURFX(QSort)(double *arr, intptr_t size)
#elif USE_HIGHWAY
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#elif USE_HIGHWAY

Based on the proposed suggestion, the following functions in this modification should be defined within a separate new source highway_qsort.dispatch.cpp.

template<> void NPY_CPU_DISPATCH_CURFX(QSort)(int32_t *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
template<> void NPY_CPU_DISPATCH_CURFX(QSort)(uint32_t *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
template<> void NPY_CPU_DISPATCH_CURFX(QSort)(int64_t *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
template<> void NPY_CPU_DISPATCH_CURFX(QSort)(uint64_t *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
template<> void NPY_CPU_DISPATCH_CURFX(QSort)(float *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
template<> void NPY_CPU_DISPATCH_CURFX(QSort)(double *arr, intptr_t size)
{
hwy::VQSort(arr, size, hwy::SortAscending());
hwy::HWY_NAMESPACE::VQSortStatic(arr, size, hwy::SortAscending());
}
#endif

Expand Down
0