Skip to content

Support for AVX2 argsort/argselect/key-value sort #119

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 10 commits into from
Jan 16, 2024
Merged

Support for AVX2 argsort/argselect/key-value sort #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2971251
Support for AVX2 argsort/argselect
sterrettm2 Nov 8, 2023
0a4b740
Changed to work with new 32-bit index code
sterrettm2 Dec 2, 2023
33147b1
Minor cleanup changes
sterrettm2 Dec 5, 2023
e89a50a
Fixes builds for things that directly included avx512-64bit-argsort.hpp
sterrettm2 Dec 12, 2023
01bae64
Fixes needed when rebasing
sterrettm2 Jan 4, 2024
7a83e52
clang-format
sterrettm2 Jan 4, 2024
55b6077
Fixed problems on 32-bit systems
sterrettm2 Jan 5, 2024
7388ed7
Some fixes needed when rebasing
sterrettm2 Jan 9, 2024
1834edc
Code review fixes
sterrettm2 Jan 11, 2024
1cf135b
Re-write resize_mask and move constants to common file
Jan 16, 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
13 changes: 13 additions & 0 deletions lib/x86simdsort-avx2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// AVX2 specific routines:
#include "avx2-32bit-qsort.hpp"
#include "avx2-64bit-qsort.hpp"
#include "avx2-32bit-half.hpp"
#include "xss-common-argsort.h"
#include "x86simdsort-internal.h"

#define DEFINE_ALL_METHODS(type) \
Expand All @@ -18,6 +20,17 @@
void partial_qsort(type *arr, size_t k, size_t arrsize, bool hasnan) \
{ \
avx2_partial_qsort(arr, k, arrsize, hasnan); \
}\
template <> \
std::vector<size_t> argsort(type *arr, size_t arrsize, bool hasnan) \
{ \
return avx2_argsort(arr, arrsize, hasnan); \
} \
template <> \
std::vector<size_t> argselect( \
type *arr, size_t k, size_t arrsize, bool hasnan) \
{ \
return avx2_argselect(arr, k, arrsize, hasnan); \
}

namespace xss {
Expand Down
8 changes: 4 additions & 4 deletions lib/x86simdsort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ DISPATCH_ALL(partial_qsort,
(ISA_LIST("avx512_skx", "avx2")))
DISPATCH_ALL(argsort,
(ISA_LIST("none")),
(ISA_LIST("avx512_skx")),
(ISA_LIST("avx512_skx")))
(ISA_LIST("avx512_skx", "avx2")),
(ISA_LIST("avx512_skx", "avx2")))
DISPATCH_ALL(argselect,
(ISA_LIST("none")),
(ISA_LIST("avx512_skx")),
(ISA_LIST("avx512_skx")))
(ISA_LIST("avx512_skx", "avx2")),
(ISA_LIST("avx512_skx", "avx2")))

#define DISPATCH_KEYVALUE_SORT_FORTYPE(type) \
DISPATCH_KEYVALUE_SORT(type, uint64_t, (ISA_LIST("avx512_skx")))\
Expand Down
Loading