Skip to content

Commit d364cb1

Browse files
committed
[SYCL] Removed deprecated kernel::get_work_group_info
1 parent 8be9589 commit d364cb1

File tree

6 files changed

+3
-65
lines changed

6 files changed

+3
-65
lines changed

sycl/doc/extensions/deprecated/sycl_ext_oneapi_group_algorithms.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Group algorithms are performed collaboratively by the work-items in a group. All
146146

147147
Many functions provide at least two overloads: one operating directly on data produced by the work-items in the group, and another operating on a range of data in memory specified by a pair of pointers. If the pointers passed to such a group function are not the same for all work-items in the group, their behavior is undefined. How the elements of a range are processed by the work-items in a group is undefined.
148148

149-
Using functions from the group algorithms library inside of a kernel may introduce additional limits on the resources available to user code inside the same kernel (e.g. private memory, work-group local memory). The behavior of these limits is implementation-defined, but must be reflected by calls to kernel querying functions such as +kernel::get_work_group_info+.
149+
Using functions from the group algorithms library inside of a kernel may introduce additional limits on the resources available to user code inside the same kernel (e.g. private memory, work-group local memory). The behavior of these limits is implementation-defined, but must be reflected by calls to kernel querying functions such as +kernel::get_info+.
150150

151151
It is undefined behavior for any of these functions to be invoked within a +parallel_for_work_group+ or +parallel_for_work_item+ context, but this restriction may be lifted in a future version of the proposal.
152152

sycl/include/CL/sycl/kernel.hpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,6 @@ class __SYCL_EXPORT kernel {
163163
typename info::param_traits<info::kernel_device_specific,
164164
param>::input_type Value) const;
165165

166-
/// Query work-group information from a kernel using the
167-
/// info::kernel_work_group descriptor for a specific device.
168-
///
169-
/// \param Device is a valid SYCL device.
170-
/// \return depends on information being queried.
171-
template <info::kernel_work_group param>
172-
__SYCL2020_DEPRECATED("get_work_group_info() is deprecated, use SYCL 2020 "
173-
"kernel_device_specific queries instead")
174-
typename info::param_traits<info::kernel_work_group, param>::return_type
175-
get_work_group_info(const device &Device) const;
176-
177166
/// Query sub-group information from a kernel using the
178167
/// info::kernel_sub_group descriptor for a specific device.
179168
///

sycl/source/kernel.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,6 @@ kernel::get_info(const device &Device,
8383
#undef __SYCL_PARAM_TRAITS_SPEC
8484
#undef __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT
8585

86-
template <info::kernel_work_group param>
87-
typename info::param_traits<info::kernel_work_group, param>::return_type
88-
kernel::get_work_group_info(const device &dev) const {
89-
return impl->get_work_group_info<param>(dev);
90-
}
91-
92-
#define __SYCL_PARAM_TRAITS_SPEC(param_type, param, ret_type) \
93-
template __SYCL_EXPORT ret_type \
94-
kernel::get_work_group_info<info::param_type::param>(const device &) const;
95-
96-
#include <CL/sycl/info/kernel_work_group_traits.def>
97-
98-
#undef __SYCL_PARAM_TRAITS_SPEC
99-
10086
template <info::kernel_sub_group param>
10187
typename info::param_traits<info::kernel_sub_group, param>::return_type
10288
kernel::get_sub_group_info(const device &dev) const {

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3931,8 +3931,8 @@ _ZN2cl4sycl6detail2pi3dieEPKc
39313931
_ZN2cl4sycl6detail2pi9assertionEbPKc
39323932
_ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE1EEERKNS1_6pluginEv
39333933
_ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE2EEERKNS1_6pluginEv
3934-
_ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE5EEERKNS1_6pluginEv
39353934
_ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE3EEERKNS1_6pluginEv
3935+
_ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE5EEERKNS1_6pluginEv
39363936
_ZN2cl4sycl6detail36get_empty_interop_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EE
39373937
_ZN2cl4sycl6detail3usm12alignedAllocEmmRKNS0_7contextERKNS0_6deviceENS0_3usm5allocE
39383938
_ZN2cl4sycl6detail3usm16alignedAllocHostEmmRKNS0_7contextENS0_3usm5allocE
@@ -4197,6 +4197,7 @@ _ZNK2cl4sycl6device3hasENS0_6aspectE
41974197
_ZNK2cl4sycl6device6is_cpuEv
41984198
_ZNK2cl4sycl6device6is_gpuEv
41994199
_ZNK2cl4sycl6device7is_hostEv
4200+
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE131071EEENS3_12param_traitsIS4_XT_EE11return_typeEv
42004201
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE131072EEENS3_12param_traitsIS4_XT_EE11return_typeEv
42014202
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE131073EEENS3_12param_traitsIS4_XT_EE11return_typeEv
42024203
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE131074EEENS3_12param_traitsIS4_XT_EE11return_typeEv
@@ -4300,7 +4301,6 @@ _ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE65809EEENS3_12param_traitsIS4_XT_
43004301
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE65810EEENS3_12param_traitsIS4_XT_EE11return_typeEv
43014302
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE65811EEENS3_12param_traitsIS4_XT_EE11return_typeEv
43024303
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE69632EEENS3_12param_traitsIS4_XT_EE11return_typeEv
4303-
_ZNK2cl4sycl6device8get_infoILNS0_4info6deviceE131071EEENS3_12param_traitsIS4_XT_EE11return_typeEv
43044304
_ZNK2cl4sycl6device9getNativeEv
43054305
_ZNK2cl4sycl6kernel11get_backendEv
43064306
_ZNK2cl4sycl6kernel11get_contextEv
@@ -4311,11 +4311,6 @@ _ZNK2cl4sycl6kernel18get_sub_group_infoILNS0_4info16kernel_sub_groupE16650EEENS3
43114311
_ZNK2cl4sycl6kernel18get_sub_group_infoILNS0_4info16kernel_sub_groupE4537EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
43124312
_ZNK2cl4sycl6kernel18get_sub_group_infoILNS0_4info16kernel_sub_groupE4538EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
43134313
_ZNK2cl4sycl6kernel18get_sub_group_infoILNS0_4info16kernel_sub_groupE8243EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceENS6_10input_typeE
4314-
_ZNK2cl4sycl6kernel19get_work_group_infoILNS0_4info17kernel_work_groupE4528EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
4315-
_ZNK2cl4sycl6kernel19get_work_group_infoILNS0_4info17kernel_work_groupE4529EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
4316-
_ZNK2cl4sycl6kernel19get_work_group_infoILNS0_4info17kernel_work_groupE4531EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
4317-
_ZNK2cl4sycl6kernel19get_work_group_infoILNS0_4info17kernel_work_groupE4532EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
4318-
_ZNK2cl4sycl6kernel19get_work_group_infoILNS0_4info17kernel_work_groupE4533EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE
43194314
_ZNK2cl4sycl6kernel3getEv
43204315
_ZNK2cl4sycl6kernel7is_hostEv
43214316
_ZNK2cl4sycl6kernel8get_infoILNS0_4info22kernel_device_specificE16650EEENS3_12param_traitsIS4_XT_EE11return_typeERKNS0_6deviceE

sycl/test/warnings/kernel_wg_info_deprecation.cpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

sycl/unittests/kernel-and-program/KernelInfo.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,4 @@ TEST_F(KernelInfoTest, GetPrivateMemUsage) {
136136
EXPECT_EQ(TestContext->PrivateMemSizeCalled, true)
137137
<< "Expect piKernelGetGroupInfo to be "
138138
<< "called with PI_KERNEL_GROUP_INFO_PRIVATE_MEM_SIZE";
139-
140-
TestContext->PrivateMemSizeCalled = false;
141-
Ker.get_work_group_info<info::kernel_work_group::private_mem_size>(
142-
Ctx.get_devices()[0]);
143-
EXPECT_EQ(TestContext->PrivateMemSizeCalled, true)
144-
<< "Expect piKernelGetGroupInfo to be "
145-
<< "called with PI_KERNEL_GROUP_INFO_PRIVATE_MEM_SIZE";
146139
}

0 commit comments

Comments
 (0)