Skip to content

Revert "[SYCL] Remove oneapi::sub_group under preview" #19794

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
Aug 14, 2025
Merged

Revert "[SYCL] Remove oneapi::sub_group under preview" #19794

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
9 changes: 0 additions & 9 deletions sycl/include/sycl/detail/spirv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ inline namespace _V1 {
struct sub_group;
namespace ext {
namespace oneapi {
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
struct sub_group;
#endif
namespace experimental {
template <typename ParentGroup> class fragment;

Expand Down Expand Up @@ -77,12 +75,9 @@ template <int Dimensions> struct group_scope<group<Dimensions>> {
static constexpr __spv::Scope::Flag value = __spv::Scope::Flag::Workgroup;
};

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
template <> struct group_scope<::sycl::ext::oneapi::sub_group> {
static constexpr __spv::Scope::Flag value = __spv::Scope::Flag::Subgroup;
};
#endif

template <> struct group_scope<::sycl::sub_group> {
static constexpr __spv::Scope::Flag value = __spv::Scope::Flag::Subgroup;
};
Expand Down Expand Up @@ -277,13 +272,9 @@ using WidenOpenCLTypeTo32_t = std::conditional_t<
template <typename Group> struct GroupId {
using type = size_t;
};

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
template <> struct GroupId<::sycl::ext::oneapi::sub_group> {
using type = uint32_t;
};
#endif

template <> struct GroupId<::sycl::sub_group> {
using type = uint32_t;
};
Expand Down
8 changes: 0 additions & 8 deletions sycl/include/sycl/detail/type_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ inline namespace _V1 {
template <int Dimensions> class group;
struct sub_group;
namespace ext::oneapi {
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
struct sub_group;
#endif

namespace experimental {
template <typename Group, std::size_t Extent> class group_with_scratchpad;
Expand All @@ -42,12 +40,9 @@ struct is_fixed_topology_group<root_group<Dimensions>> : std::true_type {};
template <int Dimensions>
struct is_fixed_topology_group<sycl::group<Dimensions>> : std::true_type {};

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
template <>
struct is_fixed_topology_group<sycl::ext::oneapi::sub_group> : std::true_type {
};
#endif

template <> struct is_fixed_topology_group<sycl::sub_group> : std::true_type {};

template <class T> struct is_user_constructed_group : std::false_type {};
Expand Down Expand Up @@ -79,10 +74,7 @@ struct is_group<group<Dimensions>> : std::true_type {};

template <typename T> struct is_sub_group : std::false_type {};

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
template <> struct is_sub_group<ext::oneapi::sub_group> : std::true_type {};
#endif

template <> struct is_sub_group<sycl::sub_group> : std::true_type {};

template <typename T>
Expand Down
2 changes: 0 additions & 2 deletions sycl/include/sycl/ext/oneapi/sub_group.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#include <tuple> // for _Swallow_assign, ignore

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
namespace sycl {
inline namespace _V1 {
namespace ext::oneapi {
Expand All @@ -35,4 +34,3 @@ struct __SYCL_DEPRECATED("use sycl::sub_group() instead") sub_group
} // namespace ext::oneapi
} // namespace _V1
} // namespace sycl
#endif
9 changes: 2 additions & 7 deletions sycl/include/sycl/ext/oneapi/sub_group_mask.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ template <typename Group> struct group_scope;

namespace ext::oneapi {

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// forward decalre sycl::ext::oneapi::sub_group
struct sub_group;
#endif

// defining `group_ballot` here to make predicate default `true`
// need to forward declare sub_group_mask first
Expand Down Expand Up @@ -362,11 +360,8 @@ ext::oneapi::sub_group_mask commonGroupBallotImpl(Group G, bool Predicate) {
Val, __spirv_BuiltInSubgroupMaxSize());
// For sub-groups we do not need to apply the mask, but for others it will
// split converging groups accordingly.
if constexpr (
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
!std::is_same_v<std::decay_t<Group>, ext::oneapi::sub_group> &&
#endif
!std::is_same_v<std::decay_t<Group>, sycl::sub_group>)
if constexpr (!std::is_same_v<std::decay_t<Group>, ext::oneapi::sub_group> &&
!std::is_same_v<std::decay_t<Group>, sycl::sub_group>)
Mask &= sycl::detail::GetMask(G);
return Mask;
}
Expand Down
Loading