-
Notifications
You must be signed in to change notification settings - Fork 769
[SYCL] Add support for key/value sorting APIs #13942
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.
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
+509
−50
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6aa7995
[SYCL] Add support for key/value sorting APIs
againull 64b7590
Unused var warning
againull bbaf36d
Address review
againull 727640b
Split key_value sort into a separate test
againull 46eacc1
Simplify type trait for key value sorter
againull 5315a7c
remove contexpr according to spec
againull c885597
Fix typo
againull 0bad815
Remove unnecessary param name
againull File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/common.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
|
||
#include <sycl/detail/core.hpp> | ||
#include <sycl/ext/oneapi/experimental/group_sort.hpp> | ||
|
||
#pragma once | ||
|
||
namespace oneapi_exp = sycl::ext::oneapi::experimental; | ||
|
||
enum class UseGroupT { SubGroup = true, WorkGroup = false }; | ||
|
||
// these classes are needed to pass non-type template parameters to KernelName | ||
template <int> class IntWrapper; | ||
template <UseGroupT> class UseGroupWrapper; | ||
|
||
class CustomType { | ||
public: | ||
CustomType(size_t Val) : MVal(Val) {} | ||
CustomType() : MVal(0) {} | ||
|
||
bool operator<(const CustomType &RHS) const { return MVal < RHS.MVal; } | ||
bool operator>(const CustomType &RHS) const { return MVal > RHS.MVal; } | ||
bool operator==(const CustomType &RHS) const { return MVal == RHS.MVal; } | ||
|
||
private: | ||
size_t MVal = 0; | ||
}; | ||
|
||
template <class T> struct ConvertToSimpleType { | ||
using Type = T; | ||
}; | ||
|
||
// Dummy overloads for CustomType which is not supported by radix sorter | ||
template <> struct ConvertToSimpleType<CustomType> { | ||
using Type = int; | ||
}; | ||
|
||
template <class SorterT> struct ConvertToSortingOrder; | ||
|
||
template <class T> struct ConvertToSortingOrder<std::greater<T>> { | ||
static const auto Type = oneapi_exp::sorting_order::descending; | ||
}; | ||
|
||
template <class T> struct ConvertToSortingOrder<std::less<T>> { | ||
static const auto Type = oneapi_exp::sorting_order::ascending; | ||
}; | ||
|
||
constexpr size_t ReqSubGroupSize = 8; | ||
|
||
template <typename...> class KernelNameOverGroup; | ||
template <typename...> class KernelNameJoint; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment is regarding https://github.com/intel/llvm/blob/sycl/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp#L252
It's expected for
joint_sorter
(default and radix sorters both) to support oneDPLzip_iterator
(https://github.com/intel/llvm/blob/sycl/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp#L252 : Example 3).Do you plan to add this support (no matter in this PR or a separate one)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will look into this but not as part of this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok. Thanks