Skip to content

[SYCL][ABI-Break] Remove obsolete methods from memory_manager #6522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
againull merged 1 commit into from
Aug 3, 2022
Merged

[SYCL][ABI-Break] Remove obsolete methods from memory_manager #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include(SYCLUtils)
set(SYCL_MAJOR_VERSION 5)
set(SYCL_MINOR_VERSION 7)
set(SYCL_PATCH_VERSION 0)
set(SYCL_DEV_ABI_VERSION 2)
set(SYCL_DEV_ABI_VERSION 3)
if (SYCL_ADD_DEV_VERSION_POSTFIX)
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
endif()
Expand Down
35 changes: 0 additions & 35 deletions sycl/include/sycl/detail/memory_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ class __SYCL_EXPORT MemoryManager {
std::vector<EventImplPtr> DepEvents,
RT::PiEvent &OutEvent);

// Allocates memory buffer wrapped into an image. MemObj must be a buffer,
// not an image.
// TODO not used - remove.
static void *wrapIntoImageBuffer(ContextImplPtr TargetContext, void *MemBuf,
SYCLMemObjI *MemObj);

// Releases the image buffer created by wrapIntoImageBuffer.
// TODO not used - remove.
static void releaseImageBuffer(ContextImplPtr TargetContext, void *ImageBuf);

// The following method creates OpenCL sub buffer for specified
// offset, range, and memory object.
static void *allocateMemSubBuffer(ContextImplPtr TargetContext,
Expand Down Expand Up @@ -144,43 +134,18 @@ class __SYCL_EXPORT MemoryManager {
void *DstMem, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent *OutEvent);

__SYCL_DEPRECATED("copy_usm() accepting PiEvent& is deprecated, use "
"copy_usm() accepting PiEvent* instead")
static void copy_usm(const void *SrcMem, QueueImplPtr Queue, size_t Len,
void *DstMem, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent);

static void fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
int Pattern, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent *OutEvent);

__SYCL_DEPRECATED("fill_usm() accepting PiEvent& is deprecated, use "
"fill_usm() accepting PiEvent* instead")
static void fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
int Pattern, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent);

static void prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent *OutEvent);

__SYCL_DEPRECATED("prefetch_usm() accepting PiEvent& is deprecated, use "
"prefetch_usm() accepting PiEvent* instead")
static void prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent);

static void advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
pi_mem_advice Advice,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent *OutEvent);

__SYCL_DEPRECATED("advise_usm() accepting PiEvent& is deprecated, use "
"advise_usm() accepting PiEvent* instead")
static void advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
pi_mem_advice Advice,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent);
};
} // namespace detail
} // namespace sycl
Expand Down
49 changes: 0 additions & 49 deletions sycl/source/detail/memory_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,6 @@ void MemoryManager::release(ContextImplPtr TargetContext, SYCLMemObjI *MemObj,
MemObj->releaseMem(TargetContext, MemAllocation);
}

void MemoryManager::releaseImageBuffer(ContextImplPtr TargetContext,
void *ImageBuf) {
(void)TargetContext;
(void)ImageBuf;
// TODO remove when ABI breaking changes are allowed.
throw runtime_error("Deprecated release operation",
PI_ERROR_INVALID_OPERATION);
}

void MemoryManager::releaseMemObj(ContextImplPtr TargetContext,
SYCLMemObjI *MemObj, void *MemAllocation,
void *UserPtr) {
Expand Down Expand Up @@ -282,16 +273,6 @@ void *MemoryManager::allocate(ContextImplPtr TargetContext, SYCLMemObjI *MemObj,
OutEvent);
}

void *MemoryManager::wrapIntoImageBuffer(ContextImplPtr TargetContext,
void *MemBuf, SYCLMemObjI *MemObj) {
(void)TargetContext;
(void)MemBuf;
(void)MemObj;
// TODO remove when ABI breaking changes are allowed.
throw runtime_error("Deprecated allocation operation",
PI_ERROR_INVALID_OPERATION);
}

void *MemoryManager::allocateHostMemory(SYCLMemObjI *MemObj, void *UserPtr,
bool HostPtrReadOnly, size_t Size,
const sycl::property_list &) {
Expand Down Expand Up @@ -941,36 +922,6 @@ void MemoryManager::advise_usm(const void *Mem, QueueImplPtr Queue,
Length, Advice, OutEvent);
}
}

// TODO: Delete this function when ABI breaking changes are allowed.
void MemoryManager::copy_usm(const void *SrcMem, QueueImplPtr Queue, size_t Len,
void *DstMem, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent) {
copy_usm(SrcMem, Queue, Len, DstMem, DepEvents, &OutEvent);
}

// TODO: Delete this function when ABI breaking changes are allowed.
void MemoryManager::fill_usm(void *DstMem, QueueImplPtr Queue, size_t Len,
int Pattern, std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent) {
fill_usm(DstMem, Queue, Len, Pattern, DepEvents, &OutEvent);
}

// TODO: Delete this function when ABI breaking changes are allowed.
void MemoryManager::prefetch_usm(void *Ptr, QueueImplPtr Queue, size_t Len,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent) {
prefetch_usm(Ptr, Queue, Len, DepEvents, &OutEvent);
}

// TODO: Delete this function when ABI breaking changes are allowed.
void MemoryManager::advise_usm(const void *Ptr, QueueImplPtr Queue, size_t Len,
pi_mem_advice Advice,
std::vector<RT::PiEvent> DepEvents,
RT::PiEvent &OutEvent) {
advise_usm(Ptr, Queue, Len, Advice, DepEvents, &OutEvent);
}

} // namespace detail
} // namespace sycl
} // __SYCL_INLINE_NAMESPACE(cl)
6 changes: 0 additions & 6 deletions sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3862,16 +3862,12 @@ _ZN2cl4sycl6detail12sampler_implD1Ev
_ZN2cl4sycl6detail12sampler_implD2Ev
_ZN2cl4sycl6detail12split_stringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEc
_ZN2cl4sycl6detail13MemoryManager10advise_usmEPKvSt10shared_ptrINS1_10queue_implEEm14_pi_mem_adviceSt6vectorIP9_pi_eventSaISB_EEPSB_
_ZN2cl4sycl6detail13MemoryManager10advise_usmEPKvSt10shared_ptrINS1_10queue_implEEm14_pi_mem_adviceSt6vectorIP9_pi_eventSaISB_EERSB_
_ZN2cl4sycl6detail13MemoryManager12prefetch_usmEPvSt10shared_ptrINS1_10queue_implEEmSt6vectorIP9_pi_eventSaIS9_EEPS9_
_ZN2cl4sycl6detail13MemoryManager12prefetch_usmEPvSt10shared_ptrINS1_10queue_implEEmSt6vectorIP9_pi_eventSaIS9_EERS9_
_ZN2cl4sycl6detail13MemoryManager13releaseMemObjESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvS8_
_ZN2cl4sycl6detail13MemoryManager16allocateMemImageESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvbmRK14_pi_image_descRK16_pi_image_formatRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
_ZN2cl4sycl6detail13MemoryManager17allocateMemBufferESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvbmRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
_ZN2cl4sycl6detail13MemoryManager18allocateHostMemoryEPNS1_11SYCLMemObjIEPvbmRKNS0_13property_listE
_ZN2cl4sycl6detail13MemoryManager18releaseImageBufferESt10shared_ptrINS1_12context_implEEPv
_ZN2cl4sycl6detail13MemoryManager19allocateImageObjectESt10shared_ptrINS1_12context_implEEPvbRK14_pi_image_descRK16_pi_image_formatRKNS0_13property_listE
_ZN2cl4sycl6detail13MemoryManager19wrapIntoImageBufferESt10shared_ptrINS1_12context_implEEPvPNS1_11SYCLMemObjIE
_ZN2cl4sycl6detail13MemoryManager20allocateBufferObjectESt10shared_ptrINS1_12context_implEEPvbmRKNS0_13property_listE
_ZN2cl4sycl6detail13MemoryManager20allocateMemSubBufferESt10shared_ptrINS1_12context_implEEPvmmNS0_5rangeILi3EEESt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
_ZN2cl4sycl6detail13MemoryManager24allocateInteropMemObjectESt10shared_ptrINS1_12context_implEEPvRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
Expand All @@ -3882,9 +3878,7 @@ _ZN2cl4sycl6detail13MemoryManager5unmapEPNS1_11SYCLMemObjIEPvSt10shared_ptrINS1_
_ZN2cl4sycl6detail13MemoryManager7releaseESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEPvSt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
_ZN2cl4sycl6detail13MemoryManager8allocateESt10shared_ptrINS1_12context_implEEPNS1_11SYCLMemObjIEbPvSt6vectorIS3_INS1_10event_implEESaISB_EERP9_pi_event
_ZN2cl4sycl6detail13MemoryManager8copy_usmEPKvSt10shared_ptrINS1_10queue_implEEmPvSt6vectorIP9_pi_eventSaISB_EEPSB_
_ZN2cl4sycl6detail13MemoryManager8copy_usmEPKvSt10shared_ptrINS1_10queue_implEEmPvSt6vectorIP9_pi_eventSaISB_EERSB_
_ZN2cl4sycl6detail13MemoryManager8fill_usmEPvSt10shared_ptrINS1_10queue_implEEmiSt6vectorIP9_pi_eventSaIS9_EEPS9_
_ZN2cl4sycl6detail13MemoryManager8fill_usmEPvSt10shared_ptrINS1_10queue_implEEmiSt6vectorIP9_pi_eventSaIS9_EERS9_
_ZN2cl4sycl6detail13make_platformEmNS0_7backendE
_ZN2cl4sycl6detail14getBorderColorENS0_19image_channel_orderE
_ZN2cl4sycl6detail14host_half_impl4halfC1ERKf
Expand Down
Loading