diff --git a/sycl/include/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp index 3195e72468842..b11908fce90f0 100644 --- a/sycl/include/sycl/detail/spirv.hpp +++ b/sycl/include/sycl/detail/spirv.hpp @@ -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 class fragment; @@ -77,12 +75,9 @@ template struct group_scope> { 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; }; @@ -277,13 +272,9 @@ using WidenOpenCLTypeTo32_t = std::conditional_t< template 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; }; diff --git a/sycl/include/sycl/detail/type_traits.hpp b/sycl/include/sycl/detail/type_traits.hpp index 461a350e420f5..69c30260f21de 100644 --- a/sycl/include/sycl/detail/type_traits.hpp +++ b/sycl/include/sycl/detail/type_traits.hpp @@ -22,9 +22,7 @@ inline namespace _V1 { template class group; struct sub_group; namespace ext::oneapi { -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES struct sub_group; -#endif namespace experimental { template class group_with_scratchpad; @@ -42,12 +40,9 @@ struct is_fixed_topology_group> : std::true_type {}; template struct is_fixed_topology_group> : std::true_type {}; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES template <> struct is_fixed_topology_group : std::true_type { }; -#endif - template <> struct is_fixed_topology_group : std::true_type {}; template struct is_user_constructed_group : std::false_type {}; @@ -79,10 +74,7 @@ struct is_group> : std::true_type {}; template struct is_sub_group : std::false_type {}; -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES template <> struct is_sub_group : std::true_type {}; -#endif - template <> struct is_sub_group : std::true_type {}; template diff --git a/sycl/include/sycl/ext/oneapi/sub_group.hpp b/sycl/include/sycl/ext/oneapi/sub_group.hpp index 6d219c64c656b..54109c712abbf 100644 --- a/sycl/include/sycl/ext/oneapi/sub_group.hpp +++ b/sycl/include/sycl/ext/oneapi/sub_group.hpp @@ -13,7 +13,6 @@ #include // for _Swallow_assign, ignore -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES namespace sycl { inline namespace _V1 { namespace ext::oneapi { @@ -35,4 +34,3 @@ struct __SYCL_DEPRECATED("use sycl::sub_group() instead") sub_group } // namespace ext::oneapi } // namespace _V1 } // namespace sycl -#endif diff --git a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp index a8b0ea9e1f145..48694b0051295 100644 --- a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp +++ b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp @@ -38,10 +38,8 @@ template 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 @@ -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, ext::oneapi::sub_group> && -#endif - !std::is_same_v, sycl::sub_group>) + if constexpr (!std::is_same_v, ext::oneapi::sub_group> && + !std::is_same_v, sycl::sub_group>) Mask &= sycl::detail::GetMask(G); return Mask; }