Skip to content

Commit dce0e70

Browse files
[SYCL][ABI-Break][NFC] Remove unusued members (#6731)
This commit removes the following: - The unused member function `kernel_bundle::join_impl` overload. - The unused member variable `Offset` from `stream`. - The unused member function `buffer_impl::constructorNotification` overload. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
1 parent c7289d0 commit dce0e70

File tree

7 files changed

+1
-22
lines changed

7 files changed

+1
-22
lines changed

sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set(SYCL_MINOR_VERSION 7)
3030
set(SYCL_PATCH_VERSION 0)
3131
# Don't forget to re-enable sycl_symbols_windows.dump once we leave ABI-breaking
3232
# window!
33-
set(SYCL_DEV_ABI_VERSION 15)
33+
set(SYCL_DEV_ABI_VERSION 16)
3434
if (SYCL_ADD_DEV_VERSION_POSTFIX)
3535
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
3636
endif()

sycl/include/sycl/kernel_bundle.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,6 @@ template <typename KernelName> bool is_compatible(const device &Dev) {
573573

574574
namespace detail {
575575

576-
// TODO: This is no longer in use. Remove when ABI break is allowed.
577-
__SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
578-
join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles);
579-
580576
__SYCL_EXPORT std::shared_ptr<detail::kernel_bundle_impl>
581577
join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles,
582578
bundle_state State);

sycl/include/sycl/stream.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -797,11 +797,6 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS stream {
797797
// Offset of the WI's flush buffer in the pool.
798798
mutable unsigned WIOffset = 0;
799799

800-
// Offset in the flush buffer
801-
// TODO: This field is not used anymore.
802-
// To be removed when API/ABI changes are allowed.
803-
mutable unsigned Offset = 0;
804-
805800
mutable size_t FlushBufferSize;
806801

807802
// Fields and methods to work with manipulators

sycl/source/detail/buffer_impl.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ class __SYCL_EXPORT buffer_impl final : public SYCLMemObjT {
151151
void *UserObj, const void *HostObj,
152152
const void *Type, uint32_t Dim,
153153
uint32_t ElemType, size_t Range[3]);
154-
// TODO: remove once ABI break is allowed
155-
void constructorNotification(const detail::code_location &CodeLoc,
156-
void *UserObj);
157154
void destructorNotification(void *UserObj);
158155

159156
MemObjType getType() const override { return MemObjType::Buffer; }

sycl/source/kernel_bundle.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,6 @@ get_empty_interop_kernel_bundle_impl(const context &Ctx,
157157
return std::make_shared<detail::kernel_bundle_impl>(Ctx, Devs);
158158
}
159159

160-
std::shared_ptr<detail::kernel_bundle_impl>
161-
join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles) {
162-
return std::make_shared<detail::kernel_bundle_impl>(Bundles,
163-
bundle_state::input);
164-
}
165-
166160
std::shared_ptr<detail::kernel_bundle_impl>
167161
join_impl(const std::vector<detail::KernelBundleImplPtr> &Bundles,
168162
bundle_state State) {

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3863,7 +3863,6 @@ _ZN4sycl3_V16detail6OSUtil12getOSMemSizeEv
38633863
_ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev
38643864
_ZN4sycl3_V16detail6OSUtil17getOSModuleHandleEPKv
38653865
_ZN4sycl3_V16detail6OSUtil7makeDirEPKc
3866-
_ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EE
38673866
_ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EENS0_12bundle_stateE
38683867
_ZN4sycl3_V16detail9link_implERKSt6vectorINS0_13kernel_bundleILNS0_12bundle_stateE1EEESaIS5_EERKS2_INS0_6deviceESaISA_EERKNS0_13property_listE
38693868
_ZN4sycl3_V16device11get_devicesENS0_4info11device_typeE

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,6 @@
15151515
?compile_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$kernel_bundle@$0A@@23@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@5@AEBVproperty_list@23@@Z
15161516
?compile_with_kernel_name@program@sycl@cl@@AEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0_J@Z
15171517
?compile_with_source@program@sycl@cl@@QEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z
1518-
?constructorNotification@buffer_impl@detail@sycl@cl@@QEAAXAEBUcode_location@234@PEAX@Z
15191518
?constructorNotification@buffer_impl@detail@sycl@cl@@QEAAXAEBUcode_location@234@PEAXPEBX2IIQEA_K@Z
15201519
?constructorNotification@detail@sycl@cl@@YAXPEAX0W4target@access@23@W4mode@523@AEBUcode_location@123@@Z
15211520
?contains_specialization_constants@kernel_bundle_plain@detail@sycl@cl@@QEBA_NXZ
@@ -2458,7 +2457,6 @@
24582457
?is_host@queue@sycl@cl@@QEBA_NXZ
24592458
?is_in_order@queue@sycl@cl@@QEBA_NXZ
24602459
?is_specialization_constant_set@kernel_bundle_plain@detail@sycl@cl@@IEBA_NPEBD@Z
2461-
?join_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$vector@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@V?$allocator@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@@2@@5@@Z
24622460
?join_impl@detail@sycl@cl@@YA?AV?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@AEBV?$vector@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@V?$allocator@V?$shared_ptr@Vkernel_bundle_impl@detail@sycl@cl@@@std@@@2@@5@W4bundle_state@23@@Z
24632461
?ldexp@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@V?$vec@H$00@42@@Z
24642462
?ldexp@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@V?$vec@H$01@42@@Z

0 commit comments

Comments
 (0)