Skip to content

[SYCL] Enable algorithm support for sub_group #1392

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 17 commits into from
Mar 27, 2020
Merged

[SYCL] Enable algorithm support for sub_group #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e17525a
[SYCL] Add static members to sub_group class
Pennycook Feb 13, 2020
efeb49a
[SYCL] Enable algorithm support for sub_group
Pennycook Feb 13, 2020
3cd7c84
[SYCL] Use algorithms interface in sub_group tests
Pennycook Feb 13, 2020
56cb923
[SYCL] Convert typedef to using syntax
Pennycook Mar 17, 2020
97cb465
[SYCL] Apply clang-format to sub-group tests
Pennycook Mar 17, 2020
ef8e191
[SYCL] Apply clang-format to group_algorithm.hpp
Pennycook Mar 17, 2020
3e05d75
[SYCL] Fix leader algorithm for sub_group
Pennycook Mar 17, 2020
0dde537
[SYCL] Mark specialization inline
Pennycook Mar 18, 2020
163fa5a
[SYCL] Avoid inline namespace
Pennycook Mar 18, 2020
d0200b0
[SYCL] Simplify is_group and is_sub_group check
Pennycook Mar 18, 2020
aa2fb08
[SYCL] Move #ifdef SYCL_DEVICE_ONLY
Pennycook Mar 18, 2020
e86d27b
[SYCL] Add workaround for half types
Pennycook Mar 23, 2020
1378729
[SYCL] Re-run clang-format on sub_group.hpp
Pennycook Mar 25, 2020
4723889
[SYCL] Refactor __SYCL_DEPRECATED__ attribute
Pennycook Mar 27, 2020
38f2906
[SYCL] Adopt __SYCL_DEPRECATED__ in sub_group.hpp
Pennycook Mar 27, 2020
d6efc01
[SYCL] Fix __SYCL_DEPRECATED__ for MSVC
Pennycook Mar 27, 2020
f65db72
[SYCL] Remove unnecessary C++14 guards
Pennycook Mar 27, 2020
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
8 changes: 3 additions & 5 deletions sycl/include/CL/sycl/detail/defines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@
#endif

#if __cplusplus >= 201402
#define __SYCL_DEPRECATED__ \
[[deprecated("Replaced by in_order queue property")]]
#define __SYCL_DEPRECATED__(message) [[deprecated(message)]]
#elif !defined _MSC_VER
#define __SYCL_DEPRECATED__ \
__attribute__((deprecated("Replaced by in_order queue property")))
#define __SYCL_DEPRECATED__(message) __attribute__((deprecated(message)))
#else
#define __SYCL_DEPRECATED__
#define __SYCL_DEPRECATED__(message)
#endif
31 changes: 26 additions & 5 deletions sycl/include/CL/sycl/detail/spirv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,46 @@
#ifdef __SYCL_DEVICE_ONLY__
__SYCL_INLINE_NAMESPACE(cl) {
namespace sycl {
namespace intel {
struct sub_group;
} // namespace intel
namespace detail {
namespace spirv {

template <typename Group> struct group_scope {};

template <int Dimensions> struct group_scope<group<Dimensions>> {
static constexpr __spv::Scope::Flag value = __spv::Scope::Flag::Workgroup;
};

template <> struct group_scope<intel::sub_group> {
static constexpr __spv::Scope::Flag value = __spv::Scope::Flag::Subgroup;
};

template <typename Group> bool GroupAll(bool pred) {
return __spirv_GroupAll(group_scope<Group>::value, pred);
}

template <typename Group> bool GroupAny(bool pred) {
return __spirv_GroupAny(group_scope<Group>::value, pred);
}

// Broadcast with scalar local index
template <__spv::Scope::Flag S, typename T, typename IdT>
template <typename Group, typename T, typename IdT>
detail::enable_if_t<std::is_integral<IdT>::value, T>
GroupBroadcast(T x, IdT local_id) {
using OCLT = detail::ConvertToOpenCLType_t<T>;
using OCLIdT = detail::ConvertToOpenCLType_t<IdT>;
OCLT ocl_x = detail::convertDataToType<T, OCLT>(x);
OCLIdT ocl_id = detail::convertDataToType<IdT, OCLIdT>(local_id);
return __spirv_GroupBroadcast(S, ocl_x, ocl_id);
return __spirv_GroupBroadcast(group_scope<Group>::value, ocl_x, ocl_id);
}

// Broadcast with vector local index
template <__spv::Scope::Flag S, typename T, int Dimensions>
template <typename Group, typename T, int Dimensions>
T GroupBroadcast(T x, id<Dimensions> local_id) {
if (Dimensions == 1) {
return GroupBroadcast<S>(x, local_id[0]);
return GroupBroadcast<Group>(x, local_id[0]);
}
using IdT = vec<size_t, Dimensions>;
using OCLT = detail::ConvertToOpenCLType_t<T>;
Expand All @@ -45,7 +66,7 @@ T GroupBroadcast(T x, id<Dimensions> local_id) {
}
OCLT ocl_x = detail::convertDataToType<T, OCLT>(x);
OCLIdT ocl_id = detail::convertDataToType<IdT, OCLIdT>(vec_id);
return __spirv_GroupBroadcast(S, ocl_x, ocl_id);
return __spirv_GroupBroadcast(group_scope<Group>::value, ocl_x, ocl_id);
}

} // namespace spirv
Expand Down
Loading