diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp index 4f6af2cc4090d..9bc3b13613356 100644 --- a/sycl/include/sycl/detail/common.hpp +++ b/sycl/include/sycl/detail/common.hpp @@ -83,6 +83,30 @@ struct code_location { unsigned long MLineNo; unsigned long MColumnNo; }; + +// The C++ FE may instrument user calls with code location metadata. +// If it does then that will appear as an extra last argument. +// Having _TWO_ mid-param #ifdefs makes the functions very difficult to read. +// Here we simplify the &CodeLoc declaration to be _CODELOCPARAM(&CodeLoc) and +// _CODELOCARG(&CodeLoc). + +#ifndef DISABLE_SYCL_INSTRUMENTATION_METADATA +#define _CODELOCONLYPARAM(a) \ + const detail::code_location a = detail::code_location::current() +#define _CODELOCPARAM(a) \ + , const detail::code_location a = detail::code_location::current() +#define _CODELOCPARAMDEF(a) , const detail::code_location a + +#define _CODELOCARG(a) +#define _CODELOCFW(a) , a +#else +#define _CODELOCONLYPARAM(a) +#define _CODELOCPARAM(a) + +#define _CODELOCARG(a) const detail::code_location a = {} +#define _CODELOCFW(a) +#endif + } // namespace detail } // namespace sycl } // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp index 3f3f135e653d9..e5f7510d20c4a 100644 --- a/sycl/include/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -32,33 +32,9 @@ #include // having _TWO_ mid-param #ifdefs makes the functions very difficult to read. -// Here we simplify the &CodeLoc declaration to be _CODELOCPARAM(&CodeLoc) and -// _CODELOCARG(&CodeLoc) Similarly, the KernelFunc param is simplified to be +// Here we simplify the KernelFunc param is simplified to be // _KERNELFUNCPARAM(KernelFunc) Once the queue kernel functions are defined, // these macros are #undef immediately. - -// replace _CODELOCPARAM(&CodeLoc) with nothing -// or : , const detail::code_location &CodeLoc = -// detail::code_location::current() -// replace _CODELOCARG(&CodeLoc) with nothing -// or : const detail::code_location &CodeLoc = {} - -#ifndef DISABLE_SYCL_INSTRUMENTATION_METADATA -#define _CODELOCONLYPARAM(a) \ - const detail::code_location a = detail::code_location::current() -#define _CODELOCPARAM(a) \ - , const detail::code_location a = detail::code_location::current() - -#define _CODELOCARG(a) -#define _CODELOCFW(a) , a -#else -#define _CODELOCONLYPARAM(a) -#define _CODELOCPARAM(a) - -#define _CODELOCARG(a) const detail::code_location a = {} -#define _CODELOCFW(a) -#endif - // replace _KERNELFUNCPARAM(KernelFunc) with KernelType KernelFunc // or const KernelType &KernelFunc #ifdef __SYCL_NONCONST_FUNCTOR__ @@ -1081,11 +1057,7 @@ class __SYCL_EXPORT queue { CodeLoc); } -// Clean up CODELOC and KERNELFUNC macros. -#undef _CODELOCPARAM -#undef _CODELOCONLYPARAM -#undef _CODELOCARG -#undef _CODELOCFW +// Clean KERNELFUNC macros. #undef _KERNELFUNCPARAM /// Returns whether the queue is in order or OoO diff --git a/sycl/include/sycl/usm.hpp b/sycl/include/sycl/usm.hpp index 885b4baf71b21..8020b26831299 100644 --- a/sycl/include/sycl/usm.hpp +++ b/sycl/include/sycl/usm.hpp @@ -7,6 +7,7 @@ // ===--------------------------------------------------------------------=== // #pragma once +#include #include #include #include @@ -19,135 +20,111 @@ namespace sycl { /// // Explicit USM /// -__SYCL_EXPORT void *malloc_device( - size_t size, const device &dev, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_device( - size_t size, const device &dev, const context &ctxt, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_device( - size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_device( - size_t size, const queue &q, const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void *malloc_device(size_t size, const device &dev, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_device(size_t size, const device &dev, const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *malloc_device(size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_device(size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void *aligned_alloc_device( - size_t alignment, size_t size, const device &dev, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_device( - size_t alignment, size_t size, const device &dev, const context &ctxt, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_device( - size_t alignment, size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_device( - size_t alignment, size_t size, const queue &q, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void * +aligned_alloc_device(size_t alignment, size_t size, const device &dev, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_device(size_t alignment, size_t size, const device &dev, + const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_device(size_t alignment, size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_device(size_t alignment, size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void -free(void *ptr, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void -free(void *ptr, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void free(void *ptr, const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void free(void *ptr, const queue &q _CODELOCPARAM(&CodeLoc)); /// // Restricted USM /// -__SYCL_EXPORT void *malloc_host( - size_t size, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_host( - size_t size, const context &ctxt, const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_host( - size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_host( - size_t size, const queue &q, const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void *malloc_host(size_t size, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_host(size_t size, const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *malloc_host(size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_host(size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void *malloc_shared( - size_t size, const device &dev, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_shared( - size_t size, const device &dev, const context &ctxt, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_shared( - size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *malloc_shared( - size_t size, const queue &q, const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void *malloc_shared(size_t size, const device &dev, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_shared(size_t size, const device &dev, const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *malloc_shared(size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +malloc_shared(size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void *aligned_alloc_host( - size_t alignment, size_t size, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_host( - size_t alignment, size_t size, const context &ctxt, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_host( - size_t alignment, size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_host( - size_t alignment, size_t size, const queue &q, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void * +aligned_alloc_host(size_t alignment, size_t size, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_host(size_t alignment, size_t size, const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *aligned_alloc_host(size_t alignment, size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_host(size_t alignment, size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void *aligned_alloc_shared( - size_t alignment, size_t size, const device &dev, const context &ctxt, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_shared( - size_t alignment, size_t size, const device &dev, const context &ctxt, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_shared( - size_t alignment, size_t size, const queue &q, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc_shared( - size_t alignment, size_t size, const queue &q, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void * +aligned_alloc_shared(size_t alignment, size_t size, const device &dev, + const context &ctxt _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_shared(size_t alignment, size_t size, const device &dev, + const context &ctxt, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_shared(size_t alignment, size_t size, + const queue &q _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc_shared(size_t alignment, size_t size, const queue &q, + const property_list &propList _CODELOCPARAM(&CodeLoc)); /// // single form /// +__SYCL_EXPORT void *malloc(size_t size, const device &dev, const context &ctxt, + usm::alloc kind _CODELOCPARAM(&CodeLoc)); __SYCL_EXPORT void * malloc(size_t size, const device &dev, const context &ctxt, usm::alloc kind, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void * -malloc(size_t size, const device &dev, const context &ctxt, usm::alloc kind, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void * -malloc(size_t size, const queue &q, usm::alloc kind, - const detail::code_location CodeLoc = detail::code_location::current()); + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *malloc(size_t size, const queue &q, + usm::alloc kind _CODELOCPARAM(&CodeLoc)); __SYCL_EXPORT void * malloc(size_t size, const queue &q, usm::alloc kind, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); + const property_list &propList _CODELOCPARAM(&CodeLoc)); -__SYCL_EXPORT void *aligned_alloc( - size_t alignment, size_t size, const device &dev, const context &ctxt, - usm::alloc kind, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc( - size_t alignment, size_t size, const device &dev, const context &ctxt, - usm::alloc kind, const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc( - size_t alignment, size_t size, const queue &q, usm::alloc kind, - const detail::code_location CodeLoc = detail::code_location::current()); -__SYCL_EXPORT void *aligned_alloc( - size_t alignment, size_t size, const queue &q, usm::alloc kind, - const property_list &propList, - const detail::code_location CodeLoc = detail::code_location::current()); +__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size, + const device &dev, const context &ctxt, + usm::alloc kind _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc(size_t alignment, size_t size, const device &dev, + const context &ctxt, usm::alloc kind, + const property_list &propList _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size, const queue &q, + usm::alloc kind _CODELOCPARAM(&CodeLoc)); +__SYCL_EXPORT void * +aligned_alloc(size_t alignment, size_t size, const queue &q, usm::alloc kind, + const property_list &propList _CODELOCPARAM(&CodeLoc)); /// // Template forms @@ -155,16 +132,17 @@ __SYCL_EXPORT void *aligned_alloc( template T *malloc_device( size_t Count, const device &Dev, const context &Ctxt, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_device(alignof(T), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc)); } template T *malloc_device( - size_t Count, const queue &Q, const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + size_t Count, const queue &Q, + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return malloc_device(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc); } @@ -172,8 +150,8 @@ T *malloc_device( template T *aligned_alloc_device( size_t Alignment, size_t Count, const device &Dev, const context &Ctxt, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_device(max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc)); @@ -182,40 +160,43 @@ T *aligned_alloc_device( template T *aligned_alloc_device( size_t Alignment, size_t Count, const queue &Q, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return aligned_alloc_device(Alignment, Count, Q.get_device(), Q.get_context(), PropList, CodeLoc); } template T *malloc_host( - size_t Count, const context &Ctxt, const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + size_t Count, const context &Ctxt, + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_host(alignof(T), Count * sizeof(T), Ctxt, PropList, CodeLoc)); } template T *malloc_host( - size_t Count, const queue &Q, const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + size_t Count, const queue &Q, + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return malloc_host(Count, Q.get_context(), PropList, CodeLoc); } template T *malloc_shared( size_t Count, const device &Dev, const context &Ctxt, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_shared(alignof(T), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc)); } template T *malloc_shared( - size_t Count, const queue &Q, const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + size_t Count, const queue &Q, + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return malloc_shared(Count, Q.get_device(), Q.get_context(), PropList, CodeLoc); } @@ -223,8 +204,8 @@ T *malloc_shared( template T *aligned_alloc_host( size_t Alignment, size_t Count, const context &Ctxt, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_host(std ::max(Alignment, alignof(T)), Count * sizeof(T), Ctxt, PropList, CodeLoc)); @@ -233,8 +214,8 @@ T *aligned_alloc_host( template T *aligned_alloc_host( size_t Alignment, size_t Count, const queue &Q, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return aligned_alloc_host(Alignment, Count, Q.get_context(), PropList, CodeLoc); } @@ -242,8 +223,8 @@ T *aligned_alloc_host( template T *aligned_alloc_shared( size_t Alignment, size_t Count, const device &Dev, const context &Ctxt, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc_shared(max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, PropList, CodeLoc)); @@ -252,8 +233,8 @@ T *aligned_alloc_shared( template T *aligned_alloc_shared( size_t Alignment, size_t Count, const queue &Q, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return aligned_alloc_shared(Alignment, Count, Q.get_device(), Q.get_context(), PropList, CodeLoc); } @@ -261,8 +242,8 @@ T *aligned_alloc_shared( template T *malloc( size_t Count, const device &Dev, const context &Ctxt, usm::alloc Kind, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc(alignof(T), Count * sizeof(T), Dev, Ctxt, Kind, PropList, CodeLoc)); } @@ -270,8 +251,8 @@ T *malloc( template T *malloc( size_t Count, const queue &Q, usm::alloc Kind, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return malloc(Count, Q.get_device(), Q.get_context(), Kind, PropList, CodeLoc); } @@ -279,8 +260,9 @@ T *malloc( template T *aligned_alloc( size_t Alignment, size_t Count, const device &Dev, const context &Ctxt, - usm::alloc Kind, const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + usm::alloc Kind, + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return static_cast(aligned_alloc(max(Alignment, alignof(T)), Count * sizeof(T), Dev, Ctxt, Kind, PropList, CodeLoc)); @@ -289,8 +271,8 @@ T *aligned_alloc( template T *aligned_alloc( size_t Alignment, size_t Count, const queue &Q, usm::alloc Kind, - const property_list &PropList = {}, - const detail::code_location CodeLoc = detail::code_location::current()) { + const property_list &PropList = {} _CODELOCPARAM(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return aligned_alloc(Alignment, Count, Q.get_device(), Q.get_context(), Kind, PropList, CodeLoc); } diff --git a/sycl/include/sycl/usm/usm_allocator.hpp b/sycl/include/sycl/usm/usm_allocator.hpp index 5c3ca1037bfb0..4b5b3c4f5b1d3 100644 --- a/sycl/include/sycl/usm/usm_allocator.hpp +++ b/sycl/include/sycl/usm/usm_allocator.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -20,16 +21,6 @@ __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { - -// Forward declarations. -__SYCL_EXPORT void *aligned_alloc(size_t alignment, size_t size, - const device &dev, const context &ctxt, - usm::alloc kind, - const property_list &propList, - const detail::code_location CodeLoc); -__SYCL_EXPORT void free(void *ptr, const context &ctxt, - const detail::code_location CodeLoc); - template class usm_allocator { public: diff --git a/sycl/source/detail/usm/usm_impl.cpp b/sycl/source/detail/usm/usm_impl.cpp index 4b2237b51e037..3d0d4abde2166 100644 --- a/sycl/source/detail/usm/usm_impl.cpp +++ b/sycl/source/detail/usm/usm_impl.cpp @@ -24,17 +24,18 @@ // traces using the trace framework #include "xpti/xpti_trace_framework.hpp" -#define XPTI_CREATE_TRACEPOINT(CL) \ +#define XPTI_CREATE_TRACEPOINT(CodeLoc) \ std::unique_ptr _TP(nullptr); \ if (xptiTraceEnabled()) { \ - xpti::payload_t Payload{CL.functionName(), CL.fileName(), \ - static_cast(CL.lineNumber()), \ - static_cast(CL.columnNumber()), nullptr}; \ + xpti::payload_t Payload{CodeLoc.functionName(), CodeLoc.fileName(), \ + static_cast(CodeLoc.lineNumber()), \ + static_cast(CodeLoc.columnNumber()), \ + nullptr}; \ _TP = std::make_unique(&Payload); \ } \ (void)_TP; #else -#define XPTI_CREATE_TRACEPOINT(CL) +#define XPTI_CREATE_TRACEPOINT(CodeLoc) #endif __SYCL_INLINE_NAMESPACE(cl) { @@ -46,9 +47,9 @@ namespace detail { namespace usm { void *alignedAllocHost(size_t Alignment, size_t Size, const context &Ctxt, - alloc Kind, const detail::code_location &CL, - const property_list &PropList = {}) { - XPTI_CREATE_TRACEPOINT(CL); + alloc Kind, const property_list &PropList, + const detail::code_location &CodeLoc) { + XPTI_CREATE_TRACEPOINT(CodeLoc); void *RetVal = nullptr; if (Size == 0) return nullptr; @@ -113,10 +114,9 @@ void *alignedAllocHost(size_t Alignment, size_t Size, const context &Ctxt, } void *alignedAlloc(size_t Alignment, size_t Size, const context &Ctxt, - const device &Dev, alloc Kind, - const detail::code_location &CL, - const property_list &PropList = {}) { - XPTI_CREATE_TRACEPOINT(CL); + const device &Dev, alloc Kind, const property_list &PropList, + const detail::code_location &CodeLoc) { + XPTI_CREATE_TRACEPOINT(CodeLoc); void *RetVal = nullptr; if (Size == 0) return nullptr; @@ -217,8 +217,9 @@ void *alignedAlloc(size_t Alignment, size_t Size, const context &Ctxt, return RetVal; } -void free(void *Ptr, const context &Ctxt, const detail::code_location &CL) { - XPTI_CREATE_TRACEPOINT(CL); +void free(void *Ptr, const context &Ctxt, + const detail::code_location &CodeLoc) { + XPTI_CREATE_TRACEPOINT(CodeLoc); if (Ptr == nullptr) return; if (Ctxt.is_host()) { @@ -232,240 +233,278 @@ void free(void *Ptr, const context &Ctxt, const detail::code_location &CL) { } } -// For ABI compatibility -// TODO remove once ABI breakages are allowed. -__SYCL_EXPORT void *alignedAllocHost(size_t Alignment, size_t Size, - const context &Ctxt, alloc Kind) { - return alignedAllocHost(Alignment, Size, Ctxt, Kind, detail::code_location{}); -} - -__SYCL_EXPORT void free(void *Ptr, const context &Ctxt) { - detail::usm::free(Ptr, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void *alignedAlloc(size_t Alignment, size_t Size, - const context &Ctxt, const device &Dev, - alloc Kind) { - return alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, - detail::code_location{}); -} - } // namespace usm } // namespace detail -void *malloc_device(size_t Size, const device &Dev, const context &Ctxt, - const detail::code_location CL) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::device, CL); +void *malloc_device(size_t Size, const device &Dev, + const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::device, + property_list{}, CodeLoc); } void *malloc_device(size_t Size, const device &Dev, const context &Ctxt, - const property_list &PropList, - const detail::code_location CL) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::device, CL, - PropList); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::device, PropList, + CodeLoc); } -void *malloc_device(size_t Size, const queue &Q, - const detail::code_location CL) { - return malloc_device(Size, Q.get_device(), Q.get_context(), CL); +void *malloc_device(size_t Size, const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + alloc::device, property_list{}, CodeLoc); } -void *malloc_device(size_t Size, const queue &Q, const property_list &PropList, - const detail::code_location CL) { - return malloc_device(Size, Q.get_device(), Q.get_context(), PropList, CL); +void *malloc_device(size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + alloc::device, PropList, CodeLoc); } void *aligned_alloc_device(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, - const detail::code_location CL) { + const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::device, - CL); + property_list{}, CodeLoc); } -void *aligned_alloc_device(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, const property_list &, - const detail::code_location CL) { - return aligned_alloc_device(Alignment, Size, Dev, Ctxt, CL); +void * +aligned_alloc_device(size_t Alignment, size_t Size, const device &Dev, + const context &Ctxt, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::device, + PropList, CodeLoc); } -void *aligned_alloc_device(size_t Alignment, size_t Size, const queue &Q, - const detail::code_location CL) { - return aligned_alloc_device(Alignment, Size, Q.get_device(), Q.get_context(), - CL); +void *aligned_alloc_device(size_t Alignment, size_t Size, + const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), alloc::device, + property_list{}, CodeLoc); } -void *aligned_alloc_device(size_t Alignment, size_t Size, const queue &Q, - const property_list &PropList, - const detail::code_location CL) { - return aligned_alloc_device(Alignment, Size, Q.get_device(), Q.get_context(), - PropList, CL); +void * +aligned_alloc_device(size_t Alignment, size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), alloc::device, PropList, + CodeLoc); } -void free(void *ptr, const context &Ctxt, const detail::code_location CL) { - return detail::usm::free(ptr, Ctxt, CL); +void free(void *ptr, const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::free(ptr, Ctxt, CodeLoc); } -void free(void *ptr, const queue &Q, const detail::code_location CL) { - return free(ptr, Q.get_context(), CL); +void free(void *ptr, const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::free(ptr, Q.get_context(), CodeLoc); } -/// -// Restricted USM -/// -void *malloc_host(size_t Size, const context &Ctxt, - const detail::code_location CL) { - return detail::usm::alignedAllocHost(0, Size, Ctxt, alloc::host, CL); +void *malloc_host(size_t Size, const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(0, Size, Ctxt, alloc::host, + property_list{}, CodeLoc); } void *malloc_host(size_t Size, const context &Ctxt, - const property_list &PropList, - const detail::code_location CL) { - return detail::usm::alignedAllocHost(0, Size, Ctxt, alloc::host, CL, - PropList); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(0, Size, Ctxt, alloc::host, PropList, + CodeLoc); } -void *malloc_host(size_t Size, const queue &Q, const detail::code_location CL) { - return malloc_host(Size, Q.get_context(), CL); +void *malloc_host(size_t Size, const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(0, Size, Q.get_context(), alloc::host, + property_list{}, CodeLoc); } -void *malloc_host(size_t Size, const queue &Q, const property_list &PropList, - const detail::code_location CL) { - return malloc_host(Size, Q.get_context(), PropList, CL); +void *malloc_host(size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(0, Size, Q.get_context(), alloc::host, + PropList, CodeLoc); } -void *malloc_shared(size_t Size, const device &Dev, const context &Ctxt, - const detail::code_location CL) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::shared, CL); +void *malloc_shared(size_t Size, const device &Dev, + const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::shared, + property_list{}, CodeLoc); } void *malloc_shared(size_t Size, const device &Dev, const context &Ctxt, - const property_list &PropList, - const detail::code_location CL) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::shared, CL, - PropList); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::shared, PropList, + CodeLoc); } -void *malloc_shared(size_t Size, const queue &Q, - const detail::code_location CL) { - return malloc_shared(Size, Q.get_device(), Q.get_context(), CL); +void *malloc_shared(size_t Size, const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + alloc::shared, property_list{}, CodeLoc); } -void *malloc_shared(size_t Size, const queue &Q, const property_list &PropList, - const detail::code_location CL) { - return malloc_shared(Size, Q.get_device(), Q.get_context(), PropList, CL); +void *malloc_shared(size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + alloc::shared, PropList, CodeLoc); } -void *aligned_alloc_host(size_t Alignment, size_t Size, const context &Ctxt, - const detail::code_location CL) { - return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host, CL); +void *aligned_alloc_host(size_t Alignment, size_t Size, + const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host, + property_list{}, CodeLoc); } -void *aligned_alloc_host(size_t Alignment, size_t Size, const context &Ctxt, - const property_list &PropList, - const detail::code_location CL) { - return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host, CL, - PropList); +void * +aligned_alloc_host(size_t Alignment, size_t Size, const context &Ctxt, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host, + PropList, CodeLoc); } -void *aligned_alloc_host(size_t Alignment, size_t Size, const queue &Q, - const detail::code_location CL) { - return aligned_alloc_host(Alignment, Size, Q.get_context(), CL); +void *aligned_alloc_host(size_t Alignment, size_t Size, + const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), + alloc::host, property_list{}, CodeLoc); } -void *aligned_alloc_host(size_t Alignment, size_t Size, const queue &Q, - const property_list &PropList, - const detail::code_location CL) { - return aligned_alloc_host(Alignment, Size, Q.get_context(), PropList, CL); +void * +aligned_alloc_host(size_t Alignment, size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), + alloc::host, PropList, CodeLoc); } void *aligned_alloc_shared(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, - const detail::code_location CL) { + const context &Ctxt _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::shared, - CL); + property_list{}, CodeLoc); } -void *aligned_alloc_shared(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, const property_list &PropList, - const detail::code_location CL) { +void * +aligned_alloc_shared(size_t Alignment, size_t Size, const device &Dev, + const context &Ctxt, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::shared, - CL, PropList); + PropList, CodeLoc); } -void *aligned_alloc_shared(size_t Alignment, size_t Size, const queue &Q, - const detail::code_location CL) { - return aligned_alloc_shared(Alignment, Size, Q.get_device(), Q.get_context(), - CL); +void *aligned_alloc_shared(size_t Alignment, size_t Size, + const queue &Q _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), alloc::shared, + property_list{}, CodeLoc); } -void *aligned_alloc_shared(size_t Alignment, size_t Size, const queue &Q, - const property_list &PropList, - const detail::code_location CL) { - return aligned_alloc_shared(Alignment, Size, Q.get_device(), Q.get_context(), - PropList, CL); +void * +aligned_alloc_shared(size_t Alignment, size_t Size, const queue &Q, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), alloc::shared, PropList, + CodeLoc); } // single form void *malloc(size_t Size, const device &Dev, const context &Ctxt, alloc Kind, - const detail::code_location CL) { - void *RetVal = nullptr; - - if (Kind == alloc::host) { - RetVal = detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, CL); - } else { - RetVal = detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, CL); - } - - return RetVal; -} - -void *malloc(size_t Size, const device &Dev, const context &Ctxt, alloc Kind, - const property_list &, const detail::code_location CL) { - return malloc(Size, Dev, Ctxt, Kind, CL); -} - -void *malloc(size_t Size, const queue &Q, alloc Kind, - const detail::code_location CL) { - return malloc(Size, Q.get_device(), Q.get_context(), Kind, CL); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, PropList, + CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, PropList, CodeLoc); +} + +void *malloc(size_t Size, const device &Dev, const context &Ctxt, + alloc Kind _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, property_list{}, + CodeLoc); + return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, property_list{}, + CodeLoc); +} + +void *malloc(size_t Size, const queue &Q, + alloc Kind _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(0, Size, Q.get_context(), Kind, + property_list{}, CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + Kind, property_list{}, CodeLoc); } void *malloc(size_t Size, const queue &Q, alloc Kind, - const property_list &PropList, const detail::code_location CL) { - return malloc(Size, Q.get_device(), Q.get_context(), Kind, PropList, CL); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(0, Size, Q.get_context(), Kind, + PropList, CodeLoc); + return detail::usm::alignedAlloc(0, Size, Q.get_context(), Q.get_device(), + Kind, PropList, CodeLoc); } void *aligned_alloc(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, alloc Kind, - const detail::code_location CL) { - void *RetVal = nullptr; + const context &Ctxt, + alloc Kind _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind, + property_list{}, CodeLoc); - if (Kind == alloc::host) { - RetVal = detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind, CL); - } else { - RetVal = detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, CL); - } - - return RetVal; + return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, + property_list{}, CodeLoc); } void *aligned_alloc(size_t Alignment, size_t Size, const device &Dev, - const context &Ctxt, alloc Kind, const property_list &, - const detail::code_location CL) { - return aligned_alloc(Alignment, Size, Dev, Ctxt, Kind, CL); -} - -void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, alloc Kind, - const detail::code_location CL) { - return aligned_alloc(Alignment, Size, Q.get_device(), Q.get_context(), Kind, - CL); + const context &Ctxt, alloc Kind, + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind, PropList, + CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, PropList, + CodeLoc); +} + +void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, + alloc Kind _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), Kind, + property_list{}, CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), Kind, property_list{}, + CodeLoc); } void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, alloc Kind, - const property_list &PropList, - const detail::code_location CL) { - return aligned_alloc(Alignment, Size, Q.get_device(), Q.get_context(), Kind, - PropList, CL); + const property_list &PropList _CODELOCPARAMDEF(&CodeLoc)) { + _CODELOCARG(&CodeLoc); + if (Kind == alloc::host) + return detail::usm::alignedAllocHost(Alignment, Size, Q.get_context(), Kind, + PropList, CodeLoc); + return detail::usm::alignedAlloc(Alignment, Size, Q.get_context(), + Q.get_device(), Kind, PropList, CodeLoc); } // Pointer queries @@ -565,227 +604,5 @@ device get_pointer_device(const void *Ptr, const context &Ctxt) { PI_ERROR_INVALID_OPERATION); } -// For ABI compatibility - -__SYCL_EXPORT void *malloc_device(size_t Size, const device &Dev, - const context &Ctxt) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::device, - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_device(size_t Size, const device &Dev, - const context &Ctxt, const property_list &) { - return malloc_device(Size, Dev, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_device(size_t Size, const queue &Q) { - return malloc_device(Size, Q.get_device(), Q.get_context(), - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_device(size_t Size, const queue &Q, - const property_list &PropList) { - return malloc_device(Size, Q.get_device(), Q.get_context(), PropList, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_device(size_t Alignment, size_t Size, - const device &Dev, - const context &Ctxt) { - return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::device, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_device(size_t Alignment, size_t Size, - const device &Dev, const context &Ctxt, - const property_list &) { - return aligned_alloc_device(Alignment, Size, Dev, Ctxt, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_device(size_t Alignment, size_t Size, - const queue &Q) { - return aligned_alloc_device(Alignment, Size, Q.get_device(), Q.get_context(), - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_device(size_t Alignment, size_t Size, - const queue &Q, - const property_list &PropList) { - return aligned_alloc_device(Alignment, Size, Q.get_device(), Q.get_context(), - PropList, detail::code_location{}); -} - -__SYCL_EXPORT void free(void *ptr, const context &Ctxt) { - return detail::usm::free(ptr, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void free(void *ptr, const queue &Q) { - return free(ptr, Q.get_context(), detail::code_location{}); -} - -/// -// Restricted USM -/// -__SYCL_EXPORT void *malloc_host(size_t Size, const context &Ctxt) { - return detail::usm::alignedAllocHost(0, Size, Ctxt, alloc::host, - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_host(size_t Size, const context &Ctxt, - const property_list &) { - return malloc_host(Size, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_host(size_t Size, const queue &Q) { - return malloc_host(Size, Q.get_context(), detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_host(size_t Size, const queue &Q, - const property_list &PropList) { - return malloc_host(Size, Q.get_context(), PropList, detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_shared(size_t Size, const device &Dev, - const context &Ctxt) { - return detail::usm::alignedAlloc(0, Size, Ctxt, Dev, alloc::shared, - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_shared(size_t Size, const device &Dev, - const context &Ctxt, const property_list &) { - return malloc_shared(Size, Dev, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_shared(size_t Size, const queue &Q) { - return malloc_shared(Size, Q.get_device(), Q.get_context(), - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc_shared(size_t Size, const queue &Q, - const property_list &PropList) { - return malloc_shared(Size, Q.get_device(), Q.get_context(), PropList, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_host(size_t Alignment, size_t Size, - const context &Ctxt) { - return detail::usm::alignedAllocHost(Alignment, Size, Ctxt, alloc::host, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_host(size_t Alignment, size_t Size, - const context &Ctxt, - const property_list &) { - return aligned_alloc_host(Alignment, Size, Ctxt, detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_host(size_t Alignment, size_t Size, - const queue &Q) { - return aligned_alloc_host(Alignment, Size, Q.get_context(), - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_host(size_t Alignment, size_t Size, - const queue &Q, - const property_list &PropList) { - return aligned_alloc_host(Alignment, Size, Q.get_context(), PropList, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_shared(size_t Alignment, size_t Size, - const device &Dev, - const context &Ctxt) { - return detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, alloc::shared, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_shared(size_t Alignment, size_t Size, - const device &Dev, const context &Ctxt, - const property_list &) { - return aligned_alloc_shared(Alignment, Size, Dev, Ctxt, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_shared(size_t Alignment, size_t Size, - const queue &Q) { - return aligned_alloc_shared(Alignment, Size, Q.get_device(), Q.get_context(), - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc_shared(size_t Alignment, size_t Size, - const queue &Q, - const property_list &PropList) { - return aligned_alloc_shared(Alignment, Size, Q.get_device(), Q.get_context(), - PropList, detail::code_location{}); -} - -// single form - -__SYCL_EXPORT void *malloc(size_t Size, const device &Dev, const context &Ctxt, - alloc Kind) { - void *RetVal = nullptr; - - if (Kind == alloc::host) { - RetVal = detail::usm::alignedAllocHost(0, Size, Ctxt, Kind, - detail::code_location{}); - } else { - RetVal = detail::usm::alignedAlloc(0, Size, Ctxt, Dev, Kind, - detail::code_location{}); - } - - return RetVal; -} - -__SYCL_EXPORT void *malloc(size_t Size, const device &Dev, const context &Ctxt, - alloc Kind, const property_list &) { - return malloc(Size, Dev, Ctxt, Kind, detail::code_location{}); -} - -__SYCL_EXPORT void *malloc(size_t Size, const queue &Q, alloc Kind) { - return malloc(Size, Q.get_device(), Q.get_context(), Kind, - detail::code_location{}); -} - -__SYCL_EXPORT void *malloc(size_t Size, const queue &Q, alloc Kind, - const property_list &PropList) { - return malloc(Size, Q.get_device(), Q.get_context(), Kind, PropList, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc(size_t Alignment, size_t Size, - const device &Dev, const context &Ctxt, - alloc Kind) { - void *RetVal = nullptr; - - if (Kind == alloc::host) { - RetVal = detail::usm::alignedAllocHost(Alignment, Size, Ctxt, Kind, - detail::code_location{}); - } else { - RetVal = detail::usm::alignedAlloc(Alignment, Size, Ctxt, Dev, Kind, - detail::code_location{}); - } - - return RetVal; -} - -__SYCL_EXPORT void *aligned_alloc(size_t Alignment, size_t Size, - const device &Dev, const context &Ctxt, - alloc Kind, const property_list &) { - return aligned_alloc(Alignment, Size, Dev, Ctxt, Kind, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, - alloc Kind) { - return aligned_alloc(Alignment, Size, Q.get_device(), Q.get_context(), Kind, - detail::code_location{}); -} - -__SYCL_EXPORT void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, - alloc Kind, const property_list &PropList) { - return aligned_alloc(Alignment, Size, Q.get_device(), Q.get_context(), Kind, - PropList, detail::code_location{}); -} } // namespace sycl } // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 149f3f243e254..59af07ee61366 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3619,38 +3619,22 @@ _ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEm _ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEmb _ZN2cl4sycl10level_zero12make_programERKNS0_7contextEm _ZN2cl4sycl10level_zero13make_platformEm -_ZN2cl4sycl11malloc_hostEmRKNS0_5queueE -_ZN2cl4sycl11malloc_hostEmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl11malloc_hostEmRKNS0_7contextE -_ZN2cl4sycl11malloc_hostEmRKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl11malloc_hostEmRKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl11malloc_hostEmRKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocE -_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocENS0_6detail13code_locationE -_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listE -_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocE -_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocENS0_6detail13code_locationE -_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listE -_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueE -_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextE -_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueE -_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextE -_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE +_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl11malloc_hostEmRKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl11malloc_hostEmRKNS0_7contextERKNS0_6detail13code_locationE +_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13aligned_allocEmmRKNS0_5queueENS0_3usm5allocERKNS0_6detail13code_locationE +_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13aligned_allocEmmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_deviceEmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_deviceEmRKNS0_6deviceERKNS0_7contextERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_sharedEmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl13malloc_sharedEmRKNS0_6deviceERKNS0_7contextERKNS0_6detail13code_locationE _ZN2cl4sycl13sycl_categoryEv _ZN2cl4sycl14exception_list5ClearEv _ZN2cl4sycl14exception_list8PushBackEONSt15__exception_ptr13exception_ptrE @@ -3658,31 +3642,19 @@ _ZN2cl4sycl14exception_list8PushBackERKNSt15__exception_ptr13exception_ptrE _ZN2cl4sycl14get_kernel_idsEv _ZN2cl4sycl15make_error_codeENS0_4errcE _ZN2cl4sycl16get_pointer_typeEPKvRKNS0_7contextE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE +_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl18aligned_alloc_hostEmmRKNS0_7contextERKNS0_6detail13code_locationE _ZN2cl4sycl18get_pointer_deviceEPKvRKNS0_7contextE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueERKNS0_13property_listE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextENS0_6detail13code_locationE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listE -_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listENS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_deviceEmmRKNS0_6deviceERKNS0_7contextERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_6detail13code_locationE _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_ _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_ _ZN2cl4sycl3ext5intel15online_compilerILNS2_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISD_EEEEES7_IhSaIhEERKSD_DpRKT_ @@ -3701,10 +3673,8 @@ _ZN2cl4sycl3ext6oneapi15filter_selectorC2ERKNSt7__cxx1112basic_stringIcSt11char_ _ZN2cl4sycl3ext6oneapi6detail16reduGetMaxWGSizeESt10shared_ptrINS0_6detail10queue_implEEm _ZN2cl4sycl3ext6oneapi6detail17reduComputeWGSizeEmmRm _ZN2cl4sycl3ext6oneapi6detail33reduGetMaxNumConcurrentWorkGroupsESt10shared_ptrINS0_6detail10queue_implEE -_ZN2cl4sycl4freeEPvRKNS0_5queueE -_ZN2cl4sycl4freeEPvRKNS0_5queueENS0_6detail13code_locationE -_ZN2cl4sycl4freeEPvRKNS0_7contextE -_ZN2cl4sycl4freeEPvRKNS0_7contextENS0_6detail13code_locationE +_ZN2cl4sycl4freeEPvRKNS0_5queueERKNS0_6detail13code_locationE +_ZN2cl4sycl4freeEPvRKNS0_7contextERKNS0_6detail13code_locationE _ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_ _ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_ _ZN2cl4sycl5event13get_wait_listEv @@ -3930,9 +3900,6 @@ _ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE2EEERKNS1_6pluginEv _ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE3EEERKNS1_6pluginEv _ZN2cl4sycl6detail2pi9getPluginILNS0_7backendE5EEERKNS1_6pluginEv _ZN2cl4sycl6detail36get_empty_interop_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EE -_ZN2cl4sycl6detail3usm12alignedAllocEmmRKNS0_7contextERKNS0_6deviceENS0_3usm5allocE -_ZN2cl4sycl6detail3usm16alignedAllocHostEmmRKNS0_7contextENS0_3usm5allocE -_ZN2cl4sycl6detail3usm4freeEPvRKNS0_7contextE _ZN2cl4sycl6detail6OSUtil10getDirNameB5cxx11EPKc _ZN2cl4sycl6detail6OSUtil11alignedFreeEPv _ZN2cl4sycl6detail6OSUtil12alignedAllocEmm @@ -3954,14 +3921,10 @@ _ZN2cl4sycl6kernelC1EP10_cl_kernelRKNS0_7contextE _ZN2cl4sycl6kernelC1ESt10shared_ptrINS0_6detail11kernel_implEE _ZN2cl4sycl6kernelC2EP10_cl_kernelRKNS0_7contextE _ZN2cl4sycl6kernelC2ESt10shared_ptrINS0_6detail11kernel_implEE -_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocE -_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocENS0_6detail13code_locationE -_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listE -_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listENS0_6detail13code_locationE -_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocE -_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocENS0_6detail13code_locationE -_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listE -_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listENS0_6detail13code_locationE +_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl6mallocEmRKNS0_5queueENS0_3usm5allocERKNS0_6detail13code_locationE +_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_13property_listERKNS0_6detail13code_locationE +_ZN2cl4sycl6mallocEmRKNS0_6deviceERKNS0_7contextENS0_3usm5allocERKNS0_6detail13code_locationE _ZN2cl4sycl6opencl10make_queueERKNS0_7contextEm _ZN2cl4sycl6opencl11make_deviceEm _ZN2cl4sycl6opencl12make_contextEm diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index b076b148bd4e7..1ac8659c3b960 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -1096,41 +1096,23 @@ ?addStream@handler@sycl@cl@@AEAAXAEBV?$shared_ptr@Vstream_impl@detail@sycl@cl@@@std@@@Z ?advise_usm@MemoryManager@detail@sycl@cl@@SAXPEBXV?$shared_ptr@Vqueue_impl@detail@sycl@cl@@@std@@_KW4_pi_mem_advice@@V?$vector@PEAU_pi_event@@V?$allocator@PEAU_pi_event@@@std@@@6@PEAPEAU_pi_event@@@Z ?alignedAlloc@OSUtil@detail@sycl@cl@@SAPEAX_K0@Z -?alignedAlloc@usm@detail@sycl@cl@@YAPEAX_K0AEBVcontext@34@AEBVdevice@34@W4alloc@134@@Z -?alignedAllocHost@usm@detail@sycl@cl@@YAPEAX_K0AEBVcontext@34@W4alloc@134@@Z ?alignedFree@OSUtil@detail@sycl@cl@@SAXPEAX@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@Ucode_location@detail@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@Ucode_location@detail@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@Ucode_location@detail@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@Ucode_location@detail@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@AEBVproperty_list@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@Ucode_location@detail@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@Ucode_location@detail@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@Ucode_location@detail@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@Ucode_location@detail@12@@Z +?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBUcode_location@detail@12@@Z +?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@AEBUcode_location@detail@12@@Z +?aligned_alloc@sycl@cl@@YAPEAX_K0AEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_device@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_host@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBUcode_location@detail@12@@Z +?aligned_alloc_shared@sycl@cl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z ?allocate@MemoryManager@detail@sycl@cl@@SAPEAXV?$shared_ptr@Vcontext_impl@detail@sycl@cl@@@std@@PEAVSYCLMemObjI@234@_NPEAXV?$vector@V?$shared_ptr@Vevent_impl@detail@sycl@cl@@@std@@V?$allocator@V?$shared_ptr@Vevent_impl@detail@sycl@cl@@@std@@@2@@6@AEAPEAU_pi_event@@@Z ?allocateBufferObject@MemoryManager@detail@sycl@cl@@SAPEAXV?$shared_ptr@Vcontext_impl@detail@sycl@cl@@@std@@PEAX_N_KAEBVproperty_list@34@@Z ?allocateHostMem@SYCLMemObjT@detail@sycl@cl@@UEAAPEAXXZ @@ -2101,11 +2083,8 @@ ?fract@__host_std@cl@@YA?AVhalf@half_impl@detail@sycl@2@V34562@PEAV34562@@Z ?fract@__host_std@cl@@YAMMPEAM@Z ?fract@__host_std@cl@@YANNPEAN@Z -?free@sycl@cl@@YAXPEAXAEBVcontext@12@@Z -?free@sycl@cl@@YAXPEAXAEBVcontext@12@Ucode_location@detail@12@@Z -?free@sycl@cl@@YAXPEAXAEBVqueue@12@@Z -?free@sycl@cl@@YAXPEAXAEBVqueue@12@Ucode_location@detail@12@@Z -?free@usm@detail@sycl@cl@@YAXPEAXAEBVcontext@34@@Z +?free@sycl@cl@@YAXPEAXAEBVcontext@12@AEBUcode_location@detail@12@@Z +?free@sycl@cl@@YAXPEAXAEBVqueue@12@AEBUcode_location@detail@12@@Z ?frexp@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@PEAV?$vec@H$00@42@@Z ?frexp@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@PEAV?$vec@H$01@42@@Z ?frexp@__host_std@cl@@YA?AV?$vec@M$02@sycl@2@V342@PEAV?$vec@H$02@42@@Z @@ -2701,38 +2680,22 @@ ?make_queue@level_zero@sycl@cl@@YA?AVqueue@23@AEBVcontext@23@_K@Z ?make_queue@level_zero@sycl@cl@@YA?AVqueue@23@AEBVcontext@23@_K_N@Z ?make_queue@opencl@sycl@cl@@YA?AVqueue@23@AEBVcontext@23@_K@Z -?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@Ucode_location@detail@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@Ucode_location@detail@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@Ucode_location@detail@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@Ucode_location@detail@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@AEBVproperty_list@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@Ucode_location@detail@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@Ucode_location@detail@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@Ucode_location@detail@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@Ucode_location@detail@12@@Z -?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@Ucode_location@detail@12@@Z +?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBUcode_location@detail@12@@Z +?malloc@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@W4alloc@usm@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@AEBUcode_location@detail@12@@Z +?malloc@sycl@cl@@YAPEAX_KAEBVqueue@12@W4alloc@usm@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBUcode_location@detail@12@@Z +?malloc_device@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBUcode_location@detail@12@@Z +?malloc_device@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@AEBUcode_location@detail@12@@Z +?malloc_host@sycl@cl@@YAPEAX_KAEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBUcode_location@detail@12@@Z +?malloc_host@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBUcode_location@detail@12@@Z +?malloc_shared@sycl@cl@@YAPEAX_KAEBVdevice@12@AEBVcontext@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z +?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBUcode_location@detail@12@@Z +?malloc_shared@sycl@cl@@YAPEAX_KAEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z ?map@MemoryManager@detail@sycl@cl@@SAPEAXPEAVSYCLMemObjI@234@PEAXV?$shared_ptr@Vqueue_impl@detail@sycl@cl@@@std@@W4mode@access@34@IV?$range@$02@34@4V?$id@$02@34@IV?$vector@PEAU_pi_event@@V?$allocator@PEAU_pi_event@@@std@@@7@AEAPEAU_pi_event@@@Z ?maxmag@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@0@Z ?maxmag@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@0@Z