Skip to content

Commit b2c192b

Browse files
raaiq1raaiq1
authored
[SYCL][ABI-break] Remove unused SYCLMemObjT constructor and getBufSizeForContext (#6554)
1 parent a29c74f commit b2c192b

File tree

5 files changed

+3
-25
lines changed

5 files changed

+3
-25
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 7)
33+
set(SYCL_DEV_ABI_VERSION 8)
3434
if (SYCL_ADD_DEV_VERSION_POSTFIX)
3535
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
3636
endif()

‎sycl/include/sycl/detail/sycl_mem_obj_t.hpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,15 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
6363
std::unique_ptr<SYCLMemObjAllocator> Allocator)
6464
: SYCLMemObjT(/*SizeInBytes*/ 0, Props, std::move(Allocator)) {}
6565

66-
// For ABI compatibility
67-
SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
68-
const size_t SizeInBytes, event AvailableEvent,
69-
std::unique_ptr<SYCLMemObjAllocator> Allocator);
70-
7166
SYCLMemObjT(pi_native_handle MemObject, const context &SyclContext,
7267
const size_t SizeInBytes, event AvailableEvent,
7368
std::unique_ptr<SYCLMemObjAllocator> Allocator);
7469

7570
SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
7671
event AvailableEvent,
7772
std::unique_ptr<SYCLMemObjAllocator> Allocator)
78-
: SYCLMemObjT(MemObject, SyclContext, /*SizeInBytes*/ 0, AvailableEvent,
73+
: SYCLMemObjT(pi::cast<pi_native_handle>(MemObject), SyclContext,
74+
/*SizeInBytes*/ (size_t)0, AvailableEvent,
7975
std::move(Allocator)) {}
8076

8177
SYCLMemObjT(pi_native_handle MemObject, const context &SyclContext,
@@ -286,10 +282,6 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
286282
MAllocator->setAlignment(RequiredAlign);
287283
}
288284

289-
// For ABI compatibility
290-
static size_t getBufSizeForContext(const ContextImplPtr &Context,
291-
cl_mem MemObject);
292-
293285
static size_t getBufSizeForContext(const ContextImplPtr &Context,
294286
pi_native_handle MemObject);
295287

‎sycl/source/detail/sycl_mem_obj_t.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
namespace sycl {
1717
__SYCL_INLINE_VER_NAMESPACE(_V1) {
1818
namespace detail {
19-
SYCLMemObjT::SYCLMemObjT(cl_mem MemObject, const context &SyclContext,
20-
const size_t SizeInBytes, event AvailableEvent,
21-
std::unique_ptr<SYCLMemObjAllocator> Allocator)
22-
: SYCLMemObjT(pi::cast<pi_native_handle>(MemObject), SyclContext,
23-
SizeInBytes, AvailableEvent, std::move(Allocator)) {}
2419

2520
SYCLMemObjT::SYCLMemObjT(pi_native_handle MemObject, const context &SyclContext,
2621
const size_t, event AvailableEvent,
@@ -111,10 +106,6 @@ const plugin &SYCLMemObjT::getPlugin() const {
111106
return (MInteropContext->getPlugin());
112107
}
113108

114-
size_t SYCLMemObjT::getBufSizeForContext(const ContextImplPtr &Context,
115-
cl_mem MemObject) {
116-
return getBufSizeForContext(Context, pi::cast<pi_native_handle>(MemObject));
117-
}
118109
size_t SYCLMemObjT::getBufSizeForContext(const ContextImplPtr &Context,
119110
pi_native_handle MemObject) {
120111
size_t BufSize = 0;

‎sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,12 +3785,9 @@ _ZN4sycl3_V16detail11SYCLMemObjT10releaseMemESt10shared_ptrINS1_12context_implEE
37853785
_ZN4sycl3_V16detail11SYCLMemObjT16determineHostPtrERKSt10shared_ptrINS1_12context_implEEbRPvRb
37863786
_ZN4sycl3_V16detail11SYCLMemObjT16updateHostMemoryEPv
37873787
_ZN4sycl3_V16detail11SYCLMemObjT16updateHostMemoryEv
3788-
_ZN4sycl3_V16detail11SYCLMemObjT20getBufSizeForContextERKSt10shared_ptrINS1_12context_implEEP7_cl_mem
37893788
_ZN4sycl3_V16detail11SYCLMemObjT20getBufSizeForContextERKSt10shared_ptrINS1_12context_implEEm
3790-
_ZN4sycl3_V16detail11SYCLMemObjTC1EP7_cl_memRKNS0_7contextEmNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteISA_EE
37913789
_ZN4sycl3_V16detail11SYCLMemObjTC1EmRKNS0_7contextEbNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS8_EE
37923790
_ZN4sycl3_V16detail11SYCLMemObjTC1EmRKNS0_7contextEmNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS8_EE
3793-
_ZN4sycl3_V16detail11SYCLMemObjTC2EP7_cl_memRKNS0_7contextEmNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteISA_EE
37943791
_ZN4sycl3_V16detail11SYCLMemObjTC2EmRKNS0_7contextEbNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS8_EE
37953792
_ZN4sycl3_V16detail11SYCLMemObjTC2EmRKNS0_7contextEmNS0_5eventESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS8_EE
37963793
_ZN4sycl3_V16detail11buffer_impl11allocateMemESt10shared_ptrINS1_12context_implEEbPvRP9_pi_event

‎sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@
301301
??0SYCLCategory@detail@sycl@cl@@QEAA@XZ
302302
??0SYCLMemObjT@detail@sycl@cl@@QEAA@AEBVproperty_list@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
303303
??0SYCLMemObjT@detail@sycl@cl@@QEAA@PEAU_cl_mem@@AEBVcontext@23@Vevent@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
304-
??0SYCLMemObjT@detail@sycl@cl@@QEAA@PEAU_cl_mem@@AEBVcontext@23@_KVevent@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
305304
??0SYCLMemObjT@detail@sycl@cl@@QEAA@_KAEBVcontext@23@_KVevent@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
306305
??0SYCLMemObjT@detail@sycl@cl@@QEAA@_KAEBVcontext@23@_NVevent@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
307306
??0SYCLMemObjT@detail@sycl@cl@@QEAA@_KAEBVproperty_list@23@V?$unique_ptr@VSYCLMemObjAllocator@detail@sycl@cl@@U?$default_delete@VSYCLMemObjAllocator@detail@sycl@cl@@@std@@@std@@@Z
@@ -2119,7 +2118,6 @@
21192118
?get@queue@sycl@cl@@QEBAPEAU_cl_command_queue@@XZ
21202119
?getAssertHappenedBuffer@queue@sycl@cl@@AEAAAEAV?$buffer@UAssertHappened@detail@sycl@cl@@$00V?$aligned_allocator@D@234@X@23@XZ
21212120
?getBorderColor@detail@sycl@cl@@YA?AV?$vec@M$03@23@W4image_channel_order@23@@Z
2122-
?getBufSizeForContext@SYCLMemObjT@detail@sycl@cl@@SA_KAEBV?$shared_ptr@Vcontext_impl@detail@sycl@cl@@@std@@PEAU_cl_mem@@@Z
21232121
?getBufSizeForContext@SYCLMemObjT@detail@sycl@cl@@SA_KAEBV?$shared_ptr@Vcontext_impl@detail@sycl@cl@@@std@@_K@Z
21242122
?getChannelOrder@?$image_impl@$00@detail@sycl@cl@@QEBA?AW4image_channel_order@34@XZ
21252123
?getChannelOrder@?$image_impl@$01@detail@sycl@cl@@QEBA?AW4image_channel_order@34@XZ

0 commit comments

Comments
 (0)