Skip to content

Commit 10b2438

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][ABI-Break] Remove obsolete methods from memory_manager (#6522)
1 parent 62c36e9 commit 10b2438

File tree

5 files changed

+4712
-4808
lines changed

5 files changed

+4712
-4808
lines changed

‎sycl/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ include(SYCLUtils)
2828
set(SYCL_MAJOR_VERSION 5)
2929
set(SYCL_MINOR_VERSION 7)
3030
set(SYCL_PATCH_VERSION 0)
31-
set(SYCL_DEV_ABI_VERSION 2)
31+
set(SYCL_DEV_ABI_VERSION 3)
3232
if (SYCL_ADD_DEV_VERSION_POSTFIX)
3333
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
3434
endif()

‎sycl/include/sycl/detail/memory_manager.hpp‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,6 @@ class __SYCL_EXPORT MemoryManager {
4848
std::vector<EventImplPtr> DepEvents,
4949
RT::PiEvent &OutEvent);
5050

51-
// Allocates memory buffer wrapped into an image. MemObj must be a buffer,
52-
// not an image.
53-
// TODO not used - remove.
54-
static void *wrapIntoImageBuffer(ContextImplPtr TargetContext, void *MemBuf,
55-
SYCLMemObjI *MemObj);
56-
57-
// Releases the image buffer created by wrapIntoImageBuffer.
58-
// TODO not used - remove.
59-
static void releaseImageBuffer(ContextImplPtr TargetContext, void *ImageBuf);
60-
6151
// The following method creates OpenCL sub buffer for specified
6252
// offset, range, and memory object.
6353
static void *allocateMemSubBuffer(ContextImplPtr TargetContext,
@@ -144,43 +134,18 @@ class __SYCL_EXPORT MemoryManager {
144134
void *DstMem, std::vector<RT::PiEvent> DepEvents,
145135
RT::PiEvent *OutEvent);
146136

147-
__SYCL_DEPRECATED("copy_usm() accepting PiEvent& is deprecated, use "
148-
"copy_usm() accepting PiEvent* instead")
149-
static void copy_usm(const void *SrcMem, QueueImplPtr Queue, size_t Len,
150-
void *DstMem, std::vector<RT::PiEvent> DepEvents,
151-
RT::PiEvent &OutEvent);
152-
153137
static void fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
154138
int Pattern, std::vector<RT::PiEvent> DepEvents,
155139
RT::PiEvent *OutEvent);
156140

157-
__SYCL_DEPRECATED("fill_usm() accepting PiEvent& is deprecated, use "
158-
"fill_usm() accepting PiEvent* instead")
159-
static void fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
160-
int Pattern, std::vector<RT::PiEvent> DepEvents,
161-
RT::PiEvent &OutEvent);
162-
163141
static void prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
164142
std::vector<RT::PiEvent> DepEvents,
165143
RT::PiEvent *OutEvent);
166144

167-
__SYCL_DEPRECATED("prefetch_usm() accepting PiEvent& is deprecated, use "
168-
"prefetch_usm() accepting PiEvent* instead")
169-
static void prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
170-
std::vector<RT::PiEvent> DepEvents,
171-
RT::PiEvent &OutEvent);
172-
173145
static void advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
174146
pi_mem_advice Advice,
175147
std::vector<RT::PiEvent> DepEvents,
176148
RT::PiEvent *OutEvent);
177-
178-
__SYCL_DEPRECATED("advise_usm() accepting PiEvent& is deprecated, use "
179-
"advise_usm() accepting PiEvent* instead")
180-
static void advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
181-
pi_mem_advice Advice,
182-
std::vector<RT::PiEvent> DepEvents,
183-
RT::PiEvent &OutEvent);
184149
};
185150
} // namespace detail
186151
} // namespace sycl

‎sycl/source/detail/memory_manager.cpp‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,6 @@ void MemoryManager::release(ContextImplPtr TargetContext, SYCLMemObjI *MemObj,
243243
MemObj->releaseMem(TargetContext, MemAllocation);
244244
}
245245

246-
void MemoryManager::releaseImageBuffer(ContextImplPtr TargetContext,
247-
void *ImageBuf) {
248-
(void)TargetContext;
249-
(void)ImageBuf;
250-
// TODO remove when ABI breaking changes are allowed.
251-
throw runtime_error("Deprecated release operation",
252-
PI_ERROR_INVALID_OPERATION);
253-
}
254-
255246
void MemoryManager::releaseMemObj(ContextImplPtr TargetContext,
256247
SYCLMemObjI *MemObj, void *MemAllocation,
257248
void *UserPtr) {
@@ -282,16 +273,6 @@ void *MemoryManager::allocate(ContextImplPtr TargetContext, SYCLMemObjI *MemObj,
282273
OutEvent);
283274
}
284275

285-
void *MemoryManager::wrapIntoImageBuffer(ContextImplPtr TargetContext,
286-
void *MemBuf, SYCLMemObjI *MemObj) {
287-
(void)TargetContext;
288-
(void)MemBuf;
289-
(void)MemObj;
290-
// TODO remove when ABI breaking changes are allowed.
291-
throw runtime_error("Deprecated allocation operation",
292-
PI_ERROR_INVALID_OPERATION);
293-
}
294-
295276
void *MemoryManager::allocateHostMemory(SYCLMemObjI *MemObj, void *UserPtr,
296277
bool HostPtrReadOnly, size_t Size,
297278
const sycl::property_list &) {
@@ -941,36 +922,6 @@ void MemoryManager::advise_usm(const void *Mem, QueueImplPtr Queue,
941922
Length, Advice, OutEvent);
942923
}
943924
}
944-
945-
// TODO: Delete this function when ABI breaking changes are allowed.
946-
void MemoryManager::copy_usm(const void *SrcMem, QueueImplPtr Queue, size_t Len,
947-
void *DstMem, std::vector<RT::PiEvent> DepEvents,
948-
RT::PiEvent &OutEvent) {
949-
copy_usm(SrcMem, Queue, Len, DstMem, DepEvents, &OutEvent);
950-
}
951-
952-
// TODO: Delete this function when ABI breaking changes are allowed.
953-
void MemoryManager::fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
954-
int Pattern, std::vector<RT::PiEvent> DepEvents,
955-
RT::PiEvent &OutEvent) {
956-
fill_usm(DstMem, Queue, Len, Pattern, DepEvents, &OutEvent);
957-
}
958-
959-
// TODO: Delete this function when ABI breaking changes are allowed.
960-
void MemoryManager::prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
961-
std::vector<RT::PiEvent> DepEvents,
962-
RT::PiEvent &OutEvent) {
963-
prefetch_usm(Ptr, Queue, Len, DepEvents, &OutEvent);
964-
}
965-
966-
// TODO: Delete this function when ABI breaking changes are allowed.
967-
void MemoryManager::advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
968-
pi_mem_advice Advice,
969-
std::vector<RT::PiEvent> DepEvents,
970-
RT::PiEvent &OutEvent) {
971-
advise_usm(Ptr, Queue, Len, Advice, DepEvents, &OutEvent);
972-
}
973-
974925
} // namespace detail
975926
} // namespace sycl
976927
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/test/abi/sycl_symbols_linux.dump‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3862,16 +3862,12 @@ _ZN2cl4sycl6detail12sampler_implD1Ev
38623862
_ZN2cl4sycl6detail12sampler_implD2Ev
38633863
_ZN2cl4sycl6detail12split_stringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEc
38643864
_ZN2cl4sycl6detail13MemoryManager10advise_usmEPKvSt10shared_ptrINS1_10queue_implEEm14_pi_mem_adviceSt6vectorIP9_pi_eventSaISB_EEPSB_
3865-
_ZN2cl4sycl6detail13MemoryManager10advise_usmEPKvSt10shared_ptrINS1_10queue_implEEm14_pi_mem_adviceSt6vectorIP9_pi_eventSaISB_EERSB_
38663865
_ZN2cl4sycl6detail13MemoryManager12prefetch_usmEPvSt10shared_ptrINS1_10queue_implEEmSt6vectorIP9_pi_eventSaIS9_EEPS9_
3867-
_ZN2cl4sycl6detail13MemoryManager12prefetch_usmEPvSt10shared_ptrINS1_10queue_implEEmSt6vectorIP9_pi_eventSaIS9_EERS9_
38683866
_ZN2cl4sycl6detail13MemoryManager13releaseMemObjESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvS8_
38693867
_ZN2cl4sycl6detail13MemoryManager16allocateMemImageESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvbmRK14_pi_image_descRK16_pi_image_formatRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
38703868
_ZN2cl4sycl6detail13MemoryManager17allocateMemBufferESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvbmRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
38713869
_ZN2cl4sycl6detail13MemoryManager18allocateHostMemoryEPNS1_11SYCLMemObjIEPvbmRKNS0_13property_listE
3872-
_ZN2cl4sycl6detail13MemoryManager18releaseImageBufferESt10shared_ptrINS1_12context_implEEPv
38733870
_ZN2cl4sycl6detail13MemoryManager19allocateImageObjectESt10shared_ptrINS1_12context_implEEPvbRK14_pi_image_descRK16_pi_image_formatRKNS0_13property_listE
3874-
_ZN2cl4sycl6detail13MemoryManager19wrapIntoImageBufferESt10shared_ptrINS1_12context_implEEPvPNS1_11SYCLMemObjIE
38753871
_ZN2cl4sycl6detail13MemoryManager20allocateBufferObjectESt10shared_ptrINS1_12context_implEEPvbmRKNS0_13property_listE
38763872
_ZN2cl4sycl6detail13MemoryManager20allocateMemSubBufferESt10shared_ptrINS1_12context_implEEPvmmNS0_5rangeILi3EEESt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
38773873
_ZN2cl4sycl6detail13MemoryManager24allocateInteropMemObjectESt10shared_ptrINS1_12context_implEEPvRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
@@ -3882,9 +3878,7 @@ _ZN2cl4sycl6detail13MemoryManager5unmapEPNS1_11SYCLMemObjIEPvSt10shared_ptrINS1_
38823878
_ZN2cl4sycl6detail13MemoryManager7releaseESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvSt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
38833879
_ZN2cl4sycl6detail13MemoryManager8allocateESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEbPvSt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
38843880
_ZN2cl4sycl6detail13MemoryManager8copy_usmEPKvSt10shared_ptrINS1_10queue_implEEmPvSt6vectorIP9_pi_eventSaISB_EEPSB_
3885-
_ZN2cl4sycl6detail13MemoryManager8copy_usmEPKvSt10shared_ptrINS1_10queue_implEEmPvSt6vectorIP9_pi_eventSaISB_EERSB_
38863881
_ZN2cl4sycl6detail13MemoryManager8fill_usmEPvSt10shared_ptrINS1_10queue_implEEmiSt6vectorIP9_pi_eventSaIS9_EEPS9_
3887-
_ZN2cl4sycl6detail13MemoryManager8fill_usmEPvSt10shared_ptrINS1_10queue_implEEmiSt6vectorIP9_pi_eventSaIS9_EERS9_
38883882
_ZN2cl4sycl6detail13make_platformEmNS0_7backendE
38893883
_ZN2cl4sycl6detail14getBorderColorENS0_19image_channel_orderE
38903884
_ZN2cl4sycl6detail14host_half_impl4halfC1ERKf

0 commit comments

Comments
 (0)