From a4780a034f4cdca0f72a8fd8dd9aa77bc1433750 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Fri, 28 Jun 2024 16:24:11 +0100 Subject: [PATCH] [SYCL][Bindless] Remove deprecated functions and structs * remove the following deprecated functions and their overloads: - read_image - read_mipmap - map_external_memory_array - free_mipmap_mem - alloc_mipmap_mem - free_image_mem * removed deprecated structures in bindless_images_interop.hpp * removed piextMemImportOpaqueFD and piextImportExternalSemaphoreOpaqueFD --- sycl/include/sycl/detail/pi.def | 2 - sycl/include/sycl/detail/pi.h | 40 +-- .../sycl/ext/oneapi/bindless_images.hpp | 276 +----------------- .../ext/oneapi/bindless_images_interop.hpp | 18 -- sycl/plugins/cuda/pi_cuda.cpp | 19 -- sycl/plugins/hip/pi_hip.cpp | 19 -- sycl/plugins/level_zero/pi_level_zero.cpp | 19 -- sycl/plugins/native_cpu/pi_native_cpu.cpp | 19 -- sycl/plugins/opencl/pi_opencl.cpp | 19 -- sycl/plugins/unified_runtime/pi2ur.hpp | 57 ---- .../unified_runtime/pi_unified_runtime.cpp | 19 -- sycl/source/detail/bindless_images.cpp | 147 ---------- sycl/test/abi/pi_cuda_symbol_check.dump | 2 - sycl/test/abi/pi_hip_symbol_check.dump | 2 - sycl/test/abi/pi_level_zero_symbol_check.dump | 2 - sycl/test/abi/pi_nativecpu_symbol_check.dump | 2 - sycl/test/abi/pi_opencl_symbol_check.dump | 2 - sycl/test/abi/sycl_symbols_linux.dump | 12 - sycl/test/abi/sycl_symbols_windows.dump | 12 - sycl/unittests/helpers/PiMockPlugin.hpp | 17 -- 20 files changed, 7 insertions(+), 698 deletions(-) diff --git a/sycl/include/sycl/detail/pi.def b/sycl/include/sycl/detail/pi.def index d1d76ddd8ed6f..3a0200ab6492d 100644 --- a/sycl/include/sycl/detail/pi.def +++ b/sycl/include/sycl/detail/pi.def @@ -205,11 +205,9 @@ _PI_API(piextMemMipmapGetLevel) _PI_API(piextMemMipmapFree) // Interop -_PI_API(piextMemImportOpaqueFD) _PI_API(piextImportExternalMemory) _PI_API(piextMemReleaseInterop) _PI_API(piextMemMapExternalArray) -_PI_API(piextImportExternalSemaphoreOpaqueFD) _PI_API(piextImportExternalSemaphore) _PI_API(piextDestroyExternalSemaphore) _PI_API(piextWaitExternalSemaphore) diff --git a/sycl/include/sycl/detail/pi.h b/sycl/include/sycl/detail/pi.h index 3731c527dde67..c97b59e99dc49 100644 --- a/sycl/include/sycl/detail/pi.h +++ b/sycl/include/sycl/detail/pi.h @@ -200,9 +200,11 @@ // 16.57 Added mappings to UR launch properties extension // (piextEnqueueKernelLaunchCustom) // 17.58 Added context parameter to piextMemImageGetInfo +// 18.59 Remove deprecated functions piextMemImportOpaqueFD and +// piextImportExternalSemaphoreOpaqueFD -#define _PI_H_VERSION_MAJOR 17 -#define _PI_H_VERSION_MINOR 58 +#define _PI_H_VERSION_MAJOR 18 +#define _PI_H_VERSION_MINOR 59 #define _PI_STRING_HELPER(a) #a #define _PI_CONCAT(a, b) _PI_STRING_HELPER(a.b) @@ -3114,23 +3116,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context context, void *param_value, size_t *param_value_size_ret); -/// [DEPRECATED] This function is deprecated in favor of -/// `piextImportExternalMemory` -/// -/// API to import external memory in the form of a file descriptor. -/// -/// \param context is the pi_context -/// \param device is the pi_device -/// \param size is the size of the external memory -/// \param file_descriptor is the file descriptor -/// \param ret_handle is the returned interop memory handle to the external -/// memory -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context context, pi_device device, - size_t size, int file_descriptor, - pi_interop_mem_handle *ret_handle); - /// API to import external memory /// /// \param context is the pi_context @@ -3165,23 +3150,6 @@ __SYCL_EXPORT pi_result piextMemMapExternalArray( __SYCL_EXPORT pi_result piextMemReleaseInterop( pi_context context, pi_device device, pi_interop_mem_handle memory_handle); -/// [DEPRECATED] This function is deprecated in favor of -/// `piextImportExternalSemaphore` -/// -/// API to import an external semaphore in the form of a file descriptor. -/// -/// \param context is the pi_context -/// \param device is the pi_device -/// \param file_descriptor is the file descriptor -/// \param ret_handle is the returned interop semaphore handle to the external -/// semaphore -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context context, pi_device device, - int file_descriptor, - pi_interop_semaphore_handle *ret_handle); - /// API to import an external semaphore /// /// \param context is the pi_context diff --git a/sycl/include/sycl/ext/oneapi/bindless_images.hpp b/sycl/include/sycl/ext/oneapi/bindless_images.hpp index 75e7f06297d4e..6980a7023f8d0 100644 --- a/sycl/include/sycl/ext/oneapi/bindless_images.hpp +++ b/sycl/include/sycl/ext/oneapi/bindless_images.hpp @@ -77,28 +77,6 @@ alloc_image_mem(const image_descriptor &desc, const sycl::device &syclDevice, __SYCL_EXPORT image_mem_handle alloc_image_mem(const image_descriptor &desc, const sycl::queue &syclQueue); -/** - * @brief [Deprecated] Free image memory - * - * @param handle Memory handle to allocated memory on the device - * @param syclDevice The device in which we create our memory handle - * @param syclContext The context in which we created our memory handle - */ -__SYCL_EXPORT_DEPRECATED("Distinct image frees are deprecated. " - "Instead use overload that accepts image_type.") -void free_image_mem(image_mem_handle handle, const sycl::device &syclDevice, - const sycl::context &syclContext); - -/** - * @brief [Deprecated] Free image memory - * - * @param handle Memory handle to allocated memory on the device - * @param syclQueue The queue in which we create our memory handle - */ -__SYCL_EXPORT_DEPRECATED("Distinct image frees are deprecated. " - "Instead use overload that accepts image_type.") -void free_image_mem(image_mem_handle handle, const sycl::queue &syclQueue); - /** * @brief Free image memory * @@ -121,56 +99,6 @@ __SYCL_EXPORT void free_image_mem(image_mem_handle handle, image_type imageType, __SYCL_EXPORT void free_image_mem(image_mem_handle handle, image_type imageType, const sycl::queue &syclQueue); -/** - * @brief [Deprecated] Allocate mipmap memory based on image_descriptor - * - * @param desc The image descriptor - * @param syclDevice The device in which we create our memory handle - * @param syclContext The context in which we create our memory handle - * @return Memory handle to allocated memory on the device - */ -__SYCL_EXPORT_DEPRECATED("Distinct mipmap allocs are deprecated. " - "Instead use alloc_image_mem().") -image_mem_handle alloc_mipmap_mem(const image_descriptor &desc, - const sycl::device &syclDevice, - const sycl::context &syclContext); - -/** - * @brief [Deprecated] Allocate mipmap memory based on image_descriptor - * - * @param desc The image descriptor - * @param syclQueue The queue in which we create our memory handle - * @return Memory handle to allocated memory on the device - */ -__SYCL_EXPORT_DEPRECATED("Distinct mipmap allocs are deprecated. " - "Instead use alloc_image_mem().") -image_mem_handle alloc_mipmap_mem(const image_descriptor &desc, - const sycl::device &syclQueue); - -/** - * @brief [Deprecated] Free mipmap memory - * - * @param handle The mipmap memory handle - * @param syclDevice The device in which we created our memory handle - * @param syclContext The context in which we created our memory handle - */ -__SYCL_EXPORT_DEPRECATED( - "Distinct mipmap frees are deprecated. " - "Instead use free_image_mem() that accepts image_type.") -void free_mipmap_mem(image_mem_handle handle, const sycl::device &syclDevice, - const sycl::context &syclContext); - -/** - * @brief [Deprecated] Free mipmap memory - * - * @param handle The mipmap memory handle - * @param syclQueue The queue in which we created our memory handle - */ -__SYCL_EXPORT_DEPRECATED( - "Distinct mipmap frees are deprecated. " - "Instead use free_image_mem() that accepts image_type.") -void free_mipmap_mem(image_mem_handle handle, const sycl::queue &syclQueue); - /** * @brief Retrieve the memory handle to an individual mipmap image * @@ -229,38 +157,6 @@ __SYCL_EXPORT interop_mem_handle import_external_memory( external_mem_descriptor externalMem, const sycl::queue &syclQueue); -/** - * @brief [Deprecated] Maps an interop memory handle to an image memory - * handle (which may have a device optimized memory layout) - * - * @param memHandle Interop memory handle - * @param desc The image descriptor - * @param syclDevice The device in which we create our image memory handle - * @param syclContext The conext in which we create our image memory handle - * @return Memory handle to externally allocated memory on the device - */ -__SYCL_EXPORT_DEPRECATED("map_external_memory_array is deprecated." - "use map_external_image_memory") -image_mem_handle map_external_memory_array(interop_mem_handle memHandle, - const image_descriptor &desc, - const sycl::device &syclDevice, - const sycl::context &syclContext); - -/** - * @brief [Deprecated] Maps an interop memory handle to an image memory - * handle (which may have a device optimized memory layout) - * - * @param memHandle Interop memory handle - * @param desc The image descriptor - * @param syclQueue The queue in which we create our image memory handle - * @return Memory handle to externally allocated memory on the device - */ -__SYCL_EXPORT_DEPRECATED("map_external_memory_array is deprecated." - "use map_external_image_memory") -image_mem_handle map_external_memory_array(interop_mem_handle memHandle, - const image_descriptor &desc, - const sycl::queue &syclQueue); - /** * @brief Maps an interop memory handle to an image memory handle (which may * have a device optimized memory layout) @@ -686,7 +582,9 @@ get_image_num_channels(const image_mem_handle memHandle, namespace detail { // is sycl::vec -template struct is_vec { static constexpr bool value = false; }; +template struct is_vec { + static constexpr bool value = false; +}; template struct is_vec> { static constexpr bool value = true; }; @@ -947,35 +845,6 @@ DataT fetch_image(const unsampled_image_handle &imageHandle [[maybe_unused]], #endif } -/** - * @brief [Deprecated] Read an unsampled image using its handle - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. int, int2, or int3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The image handle - * @param coords The coordinates at which to fetch image data - * @return Image data - * - * __NVPTX__: Name mangling info - * Cuda surfaces require integer coords (by bytes) - * Cuda textures require float coords (by element or normalized) - * for sampling, and integer coords (by bytes) for fetching - * The name mangling should therefore not interfere with one - * another - */ -template -__SYCL_DEPRECATED("read_image for standard unsampled images is deprecated. " - "Instead use fetch_image.") -DataT read_image(const unsampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]]) { - return fetch_image(imageHandle, coords); -} - /** * @brief Fetch data from a sampled image using its handle * @@ -1080,41 +949,6 @@ DataT sample_image(const sampled_image_handle &imageHandle [[maybe_unused]], #endif } -/** - * @brief [Deprecated] Read a sampled image using its handle - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. float, float2, or float3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The image handle - * @param coords The coordinates at which to sample image data - * @return Sampled image data - * - * __NVPTX__: Name mangling info - * Cuda surfaces require integer coords (by bytes) - * Cuda textures require float coords (by element or normalized) - * for sampling, and integer coords (by bytes) for fetching - * The name mangling should therefore not interfere with one - * another - */ -template -__SYCL_DEPRECATED("read_image for standard sampled images is deprecated. " - "Instead use sample_image with floating point coordinates or " - "fetch_image with integer coordinates.") -DataT read_image(const sampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]]) { - detail::assert_coords_type(); - if constexpr (detail::are_floating_coords()) { - return sample_image(imageHandle, coords); - } else if constexpr (detail::are_integer_coords()) { - return fetch_image(imageHandle, coords); - } -} - /** * @brief Sample a mipmap image using its handle with LOD filtering * @@ -1207,110 +1041,6 @@ DataT sample_mipmap(const sampled_image_handle &imageHandle [[maybe_unused]], #endif } -/** - * @brief [Deprecated] Read a mipmap image using its handle with LOD - * filtering - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. float, float2, or float3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The mipmap image handle - * @param coords The coordinates at which to sample mipmap image data - * @param level The mipmap level at which to sample - * @return Mipmap image data with LOD filtering - */ -template -__SYCL_DEPRECATED("read_mipmap has been deprecated. " - "Instead use sample_mipmap.") -DataT read_mipmap(const sampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]], - const float level [[maybe_unused]]) { - return sample_mipmap(imageHandle, coords, level); -} - -/** - * @brief [Deprecated] Read a mipmap image using its handle with anisotropic - * filtering - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. float, float2, or float3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The mipmap image handle - * @param coords The coordinates at which to sample mipmap image data - * @param dX Screen space gradient in the x dimension - * @param dY Screen space gradient in the y dimension - * @return Mipmap image data with anisotropic filtering - */ -template -__SYCL_DEPRECATED("read_mipmap has been deprecated. " - "Instead use sample_mipmap.") -DataT read_mipmap(const sampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]], - const CoordT &dX [[maybe_unused]], - const CoordT &dY [[maybe_unused]]) { - return sample_mipmap(imageHandle, coords, dX, dY); -} - -/** - * @brief [Deprecated] Read a mipmap image using its handle with LOD - * filtering - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. float, float2, or float3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The mipmap image handle - * @param coords The coordinates at which to sample mipmap image data - * @param level The mipmap level at which to sample - * @return Mipmap image data with LOD filtering - */ -template -__SYCL_DEPRECATED("read_image for mipmaps is deprecated. " - "Instead use sample_mipmap.") -DataT read_image(const sampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]], - const float level [[maybe_unused]]) { - return sample_mipmap(imageHandle, coords, level); -} - -/** - * @brief [Deprecated] Read a mipmap image using its handle with anisotropic - * filtering - * - * @tparam DataT The return type - * @tparam HintT A hint type that can be used to select for a specialized - * backend intrinsic when a user-defined type is passed as `DataT`. - * HintT should be a `sycl::vec` type, `sycl::half` type, or POD type. - * HintT must also have the same size as DataT. - * @tparam CoordT The input coordinate type. e.g. float, float2, or float3 for - * 1D, 2D, and 3D, respectively - * @param imageHandle The mipmap image handle - * @param coords The coordinates at which to fetch mipmap image data - * @param dX Screen space gradient in the x dimension - * @param dY Screen space gradient in the y dimension - * @return Mipmap image data with anisotropic filtering - */ -template -__SYCL_DEPRECATED("read_image for mipmaps is deprecated. " - "Instead use sample_mipmap.") -DataT read_image(const sampled_image_handle &imageHandle [[maybe_unused]], - const CoordT &coords [[maybe_unused]], - const CoordT &dX [[maybe_unused]], - const CoordT &dY [[maybe_unused]]) { - return sample_mipmap(imageHandle, coords, dX, dY); -} - /** * @brief Fetch data from an unsampled image array using its handle * diff --git a/sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp b/sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp index 3992f5d93075d..7c7400404f677 100644 --- a/sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp +++ b/sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp @@ -71,24 +71,6 @@ template struct external_semaphore_descriptor { external_semaphore_handle_type handle_type; }; -/// EVERYTHING BELOW IS DEPRECATED - -/// External memory file descriptor type -struct external_mem_fd { - int file_descriptor; -}; - -/// Windows external memory type -struct external_mem_win32 { - void *handle; - const void *name; -}; - -/// External semaphore file descriptor type -struct external_semaphore_fd { - int file_descriptor; -}; - } // namespace ext::oneapi::experimental } // namespace _V1 } // namespace sycl diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp index 7c0f62b1f1e71..fc5eceee48dcd 100644 --- a/sycl/plugins/cuda/pi_cuda.cpp +++ b/sycl/plugins/cuda/pi_cuda.cpp @@ -455,15 +455,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalMemory( pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -484,16 +475,6 @@ __SYCL_EXPORT pi_result piextMemReleaseInterop(pi_context Context, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/plugins/hip/pi_hip.cpp b/sycl/plugins/hip/pi_hip.cpp index 52008bd2e6d0c..24167439c32e5 100644 --- a/sycl/plugins/hip/pi_hip.cpp +++ b/sycl/plugins/hip/pi_hip.cpp @@ -458,15 +458,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalMemory( pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -487,16 +478,6 @@ __SYCL_EXPORT pi_result piextMemReleaseInterop(pi_context Context, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/plugins/level_zero/pi_level_zero.cpp b/sycl/plugins/level_zero/pi_level_zero.cpp index fc3805135c9e3..80bc8109669d7 100644 --- a/sycl/plugins/level_zero/pi_level_zero.cpp +++ b/sycl/plugins/level_zero/pi_level_zero.cpp @@ -467,15 +467,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalMemory( pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -496,16 +487,6 @@ __SYCL_EXPORT pi_result piextMemReleaseInterop(pi_context Context, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/plugins/native_cpu/pi_native_cpu.cpp b/sycl/plugins/native_cpu/pi_native_cpu.cpp index 3d786fe71f248..577c3845041ba 100644 --- a/sycl/plugins/native_cpu/pi_native_cpu.cpp +++ b/sycl/plugins/native_cpu/pi_native_cpu.cpp @@ -462,15 +462,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalMemory( pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -491,16 +482,6 @@ __SYCL_EXPORT pi_result piextMemReleaseInterop(pi_context Context, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/plugins/opencl/pi_opencl.cpp b/sycl/plugins/opencl/pi_opencl.cpp index 66074630c5f3b..54b85cd24d39f 100644 --- a/sycl/plugins/opencl/pi_opencl.cpp +++ b/sycl/plugins/opencl/pi_opencl.cpp @@ -439,15 +439,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalMemory`")]] -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - pi_result piextImportExternalMemory(pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -468,16 +459,6 @@ pi_result piextMemReleaseInterop(pi_context Context, pi_device Device, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`")]] -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/plugins/unified_runtime/pi2ur.hpp b/sycl/plugins/unified_runtime/pi2ur.hpp index c2ee7816ddc45..10ca22cf8b646 100644 --- a/sycl/plugins/unified_runtime/pi2ur.hpp +++ b/sycl/plugins/unified_runtime/pi2ur.hpp @@ -5444,34 +5444,6 @@ inline pi_result piextMemImageGetInfo(pi_context Context, return PI_SUCCESS; } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalMemory`")]] -inline pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - PI_ASSERT(Context, PI_ERROR_INVALID_CONTEXT); - PI_ASSERT(Device, PI_ERROR_INVALID_DEVICE); - - auto UrContext = reinterpret_cast(Context); - auto UrDevice = reinterpret_cast(Device); - auto *UrRetHandle = - reinterpret_cast(RetHandle); - - ur_exp_file_descriptor_t PosixFD{}; - PosixFD.stype = UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR; - PosixFD.fd = FileDescriptor; - - ur_exp_interop_mem_desc_t InteropMemDesc{}; - InteropMemDesc.stype = UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC; - InteropMemDesc.pNext = &PosixFD; - - HANDLE_ERRORS(urBindlessImagesImportExternalMemoryExp( - UrContext, UrDevice, Size, UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD, - &InteropMemDesc, UrRetHandle)); - - return PI_SUCCESS; -} - inline pi_result piextImportExternalMemory(pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDescriptor, @@ -5578,35 +5550,6 @@ inline pi_result piextMemReleaseInterop(pi_context Context, pi_device Device, return PI_SUCCESS; } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`")]] -inline pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - PI_ASSERT(Context, PI_ERROR_INVALID_CONTEXT); - PI_ASSERT(Device, PI_ERROR_INVALID_DEVICE); - - auto UrContext = reinterpret_cast(Context); - auto UrDevice = reinterpret_cast(Device); - auto *UrRetHandle = - reinterpret_cast(RetHandle); - - ur_exp_file_descriptor_t PosixFD{}; - PosixFD.stype = UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR; - PosixFD.fd = FileDescriptor; - - ur_exp_interop_semaphore_desc_t InteropSemDesc{}; - InteropSemDesc.stype = UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC; - InteropSemDesc.pNext = &PosixFD; - - HANDLE_ERRORS(urBindlessImagesImportExternalSemaphoreExp( - UrContext, UrDevice, UR_EXP_EXTERNAL_SEMAPHORE_TYPE_OPAQUE_FD, - &InteropSemDesc, UrRetHandle)); - - return PI_SUCCESS; -} - inline pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDescriptor, diff --git a/sycl/plugins/unified_runtime/pi_unified_runtime.cpp b/sycl/plugins/unified_runtime/pi_unified_runtime.cpp index 6506700b80a95..1e467df1d6d47 100644 --- a/sycl/plugins/unified_runtime/pi_unified_runtime.cpp +++ b/sycl/plugins/unified_runtime/pi_unified_runtime.cpp @@ -1390,15 +1390,6 @@ __SYCL_EXPORT pi_result piextMemImageGetInfo(pi_context Context, ParamValueSizeRet); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalMemory`") -pi_result piextMemImportOpaqueFD(pi_context Context, pi_device Device, - size_t Size, int FileDescriptor, - pi_interop_mem_handle *RetHandle) { - return pi2ur::piextMemImportOpaqueFD(Context, Device, Size, FileDescriptor, - RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalMemory( pi_context Context, pi_device Device, pi_external_mem_descriptor *MemDesc, pi_interop_mem_handle *RetHandle) { @@ -1419,16 +1410,6 @@ __SYCL_EXPORT pi_result piextMemReleaseInterop(pi_context Context, return pi2ur::piextMemReleaseInterop(Context, Device, ExtMem); } -__SYCL_EXPORT_DEPRECATED("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`") -pi_result -piextImportExternalSemaphoreOpaqueFD(pi_context Context, pi_device Device, - int FileDescriptor, - pi_interop_semaphore_handle *RetHandle) { - return pi2ur::piextImportExternalSemaphoreOpaqueFD(Context, Device, - FileDescriptor, RetHandle); -} - __SYCL_EXPORT pi_result piextImportExternalSemaphore(pi_context Context, pi_device Device, pi_external_semaphore_descriptor *SemDesc, diff --git a/sycl/source/detail/bindless_images.cpp b/sycl/source/detail/bindless_images.cpp index efc3df2471936..fb5b3be529d9c 100644 --- a/sycl/source/detail/bindless_images.cpp +++ b/sycl/source/detail/bindless_images.cpp @@ -189,42 +189,6 @@ __SYCL_EXPORT image_mem_handle alloc_image_mem(const image_descriptor &desc, return alloc_image_mem(desc, syclQueue.get_device(), syclQueue.get_context()); } -__SYCL_EXPORT_DEPRECATED("Distinct mipmap allocs are deprecated. " - "Instead use alloc_image_mem().") -image_mem_handle alloc_mipmap_mem(const image_descriptor &desc, - const sycl::device &syclDevice, - const sycl::context &syclContext) { - desc.verify(); - - std::shared_ptr CtxImpl = - sycl::detail::getSyclObjImpl(syclContext); - pi_context C = CtxImpl->getHandleRef(); - std::shared_ptr DevImpl = - sycl::detail::getSyclObjImpl(syclDevice); - pi_device Device = DevImpl->getHandleRef(); - const sycl::detail::PluginPtr &Plugin = CtxImpl->getPlugin(); - - pi_image_desc piDesc; - pi_image_format piFormat; - populate_pi_structs(desc, piDesc, piFormat); - - // Call impl. - image_mem_handle retHandle; - Plugin->call( - C, Device, &piFormat, &piDesc, &retHandle.raw_handle); - - return retHandle; -} - -__SYCL_EXPORT_DEPRECATED("Distinct mipmap allocs are deprecated. " - "Instead use alloc_image_mem().") -image_mem_handle alloc_mipmap_mem(const image_descriptor &desc, - const sycl::queue &syclQueue) { - return alloc_mipmap_mem(desc, syclQueue.get_device(), - syclQueue.get_context()); -} - __SYCL_EXPORT image_mem_handle get_mip_level_mem_handle( const image_mem_handle mipMem, unsigned int level, const sycl::device &syclDevice, const sycl::context &syclContext) { @@ -290,48 +254,6 @@ __SYCL_EXPORT void free_image_mem(image_mem_handle memHandle, syclQueue.get_context()); } -__SYCL_EXPORT_DEPRECATED("Distinct image frees are deprecated. " - "Instead use overload that accepts image_type.") -void free_image_mem(image_mem_handle memHandle, const sycl::device &syclDevice, - const sycl::context &syclContext) { - return free_image_mem(memHandle, image_type::standard, syclDevice, - syclContext); -} - -__SYCL_EXPORT_DEPRECATED("Distinct image frees are deprecated. " - "Instead use overload that accepts image_type.") -void free_image_mem(image_mem_handle memHandle, const sycl::queue &syclQueue) { - free_image_mem(memHandle, syclQueue.get_device(), syclQueue.get_context()); -} - -__SYCL_EXPORT_DEPRECATED( - "Distinct mipmap frees are deprecated. " - "Instead use free_image_mem() that accepts image_type.") -void free_mipmap_mem(image_mem_handle memoryHandle, - const sycl::device &syclDevice, - const sycl::context &syclContext) { - std::shared_ptr CtxImpl = - sycl::detail::getSyclObjImpl(syclContext); - pi_context C = CtxImpl->getHandleRef(); - std::shared_ptr DevImpl = - sycl::detail::getSyclObjImpl(syclDevice); - pi_device Device = DevImpl->getHandleRef(); - const sycl::detail::PluginPtr &Plugin = CtxImpl->getPlugin(); - - Plugin->call( - C, Device, memoryHandle.raw_handle); -} - -__SYCL_EXPORT_DEPRECATED( - "Distinct mipmap frees are deprecated. " - "Instead use free_image_mem() that accepts image_type.") -void free_mipmap_mem(image_mem_handle memoryHandle, - const sycl::queue &syclQueue) { - free_mipmap_mem(memoryHandle, syclQueue.get_device(), - syclQueue.get_context()); -} - __SYCL_EXPORT unsampled_image_handle create_image(image_mem &imgMem, const image_descriptor &desc, const sycl::device &syclDevice, const sycl::context &syclContext) { @@ -544,32 +466,6 @@ __SYCL_EXPORT interop_mem_handle import_external_memory( return interop_mem_handle{piInteropMem}; } -template <> -__SYCL_EXPORT_DEPRECATED( - "import_external_memory templated by external_mem_fd is deprecated." - "Template with resource_fd instead.") -interop_mem_handle import_external_memory( - external_mem_descriptor externalMem, - const sycl::device &syclDevice, const sycl::context &syclContext) { - - external_mem_descriptor extMem; - extMem.external_resource.file_descriptor = - externalMem.external_resource.file_descriptor; - extMem.size_in_bytes = externalMem.size_in_bytes; - return import_external_memory(extMem, syclDevice, syclContext); -} - -template <> -__SYCL_EXPORT_DEPRECATED( - "import_external_memory templated by external_mem_fd is deprecated." - "Template with resource_fd instead.") -interop_mem_handle import_external_memory( - external_mem_descriptor externalMem, - const sycl::queue &syclQueue) { - return import_external_memory( - externalMem, syclQueue.get_device(), syclQueue.get_context()); -} - template <> __SYCL_EXPORT interop_mem_handle import_external_memory( external_mem_descriptor externalMem, @@ -615,24 +511,6 @@ image_mem_handle map_external_image_memory(interop_mem_handle memHandle, syclQueue.get_context()); } -__SYCL_EXPORT_DEPRECATED("map_external_memory_array is deprecated." - "use map_external_image_memory") -image_mem_handle map_external_memory_array(interop_mem_handle memHandle, - const image_descriptor &desc, - const sycl::device &syclDevice, - const sycl::context &syclContext) { - return map_external_image_memory(memHandle, desc, syclDevice, syclContext); -} - -__SYCL_EXPORT_DEPRECATED("map_external_memory_array is deprecated." - "use map_external_image_memory") -image_mem_handle map_external_memory_array(interop_mem_handle memHandle, - const image_descriptor &desc, - const sycl::queue &syclQueue) { - return map_external_memory_array(memHandle, desc, syclQueue.get_device(), - syclQueue.get_context()); -} - __SYCL_EXPORT void release_external_memory(interop_mem_handle interopMem, const sycl::device &syclDevice, const sycl::context &syclContext) { @@ -741,31 +619,6 @@ __SYCL_EXPORT interop_semaphore_handle import_external_semaphore( externalSemaphoreDesc, syclQueue.get_device(), syclQueue.get_context()); } -template <> -__SYCL_EXPORT_DEPRECATED("import_external_semaphore templated by " - "external_semaphore_fd is deprecated." - "Template with resource_fd instead.") -interop_semaphore_handle import_external_semaphore( - external_semaphore_descriptor externalSemaphoreDesc, - const sycl::device &syclDevice, const sycl::context &syclContext) { - external_semaphore_descriptor extSem; - extSem.external_resource.file_descriptor = - externalSemaphoreDesc.external_resource.file_descriptor; - return import_external_semaphore(extSem, syclDevice, - syclContext); -} - -template <> -__SYCL_EXPORT_DEPRECATED("import_external_semaphore templated by " - "external_semaphore_fd is deprecated." - "Template with resource_fd instead.") -interop_semaphore_handle import_external_semaphore( - external_semaphore_descriptor externalSemaphoreDesc, - const sycl::queue &syclQueue) { - return import_external_semaphore( - externalSemaphoreDesc, syclQueue.get_device(), syclQueue.get_context()); -} - __SYCL_EXPORT void destroy_external_semaphore(interop_semaphore_handle semaphoreHandle, const sycl::device &syclDevice, diff --git a/sycl/test/abi/pi_cuda_symbol_check.dump b/sycl/test/abi/pi_cuda_symbol_check.dump index f85c8a8b1b55f..3cb946c05ed9e 100644 --- a/sycl/test/abi/pi_cuda_symbol_check.dump +++ b/sycl/test/abi/pi_cuda_symbol_check.dump @@ -123,7 +123,6 @@ piextGetDeviceFunctionPointer piextGetGlobalVariablePointer piextImportExternalMemory piextImportExternalSemaphore -piextImportExternalSemaphoreOpaqueFD piextKernelCreateWithNativeHandle piextKernelGetNativeHandle piextKernelSetArgMemObj @@ -137,7 +136,6 @@ piextMemImageCopy piextMemImageCreateWithNativeHandle piextMemImageFree piextMemImageGetInfo -piextMemImportOpaqueFD piextMemMapExternalArray piextMemMipmapFree piextMemMipmapGetLevel diff --git a/sycl/test/abi/pi_hip_symbol_check.dump b/sycl/test/abi/pi_hip_symbol_check.dump index f3706312ae9d6..526ecfd474452 100644 --- a/sycl/test/abi/pi_hip_symbol_check.dump +++ b/sycl/test/abi/pi_hip_symbol_check.dump @@ -123,7 +123,6 @@ piextGetDeviceFunctionPointer piextGetGlobalVariablePointer piextImportExternalMemory piextImportExternalSemaphore -piextImportExternalSemaphoreOpaqueFD piextKernelCreateWithNativeHandle piextKernelGetNativeHandle piextKernelSetArgMemObj @@ -137,7 +136,6 @@ piextMemImageCopy piextMemImageCreateWithNativeHandle piextMemImageFree piextMemImageGetInfo -piextMemImportOpaqueFD piextMemMapExternalArray piextMemMipmapFree piextMemMipmapGetLevel diff --git a/sycl/test/abi/pi_level_zero_symbol_check.dump b/sycl/test/abi/pi_level_zero_symbol_check.dump index 88fc7c1e80cf7..c27aa699d6377 100644 --- a/sycl/test/abi/pi_level_zero_symbol_check.dump +++ b/sycl/test/abi/pi_level_zero_symbol_check.dump @@ -122,7 +122,6 @@ piextGetDeviceFunctionPointer piextGetGlobalVariablePointer piextImportExternalMemory piextImportExternalSemaphore -piextImportExternalSemaphoreOpaqueFD piextKernelCreateWithNativeHandle piextKernelGetNativeHandle piextKernelSetArgMemObj @@ -136,7 +135,6 @@ piextMemImageCopy piextMemImageCreateWithNativeHandle piextMemImageFree piextMemImageGetInfo -piextMemImportOpaqueFD piextMemMapExternalArray piextMemMipmapFree piextMemMipmapGetLevel diff --git a/sycl/test/abi/pi_nativecpu_symbol_check.dump b/sycl/test/abi/pi_nativecpu_symbol_check.dump index 760f222f9a11e..ec1ac29358bbb 100644 --- a/sycl/test/abi/pi_nativecpu_symbol_check.dump +++ b/sycl/test/abi/pi_nativecpu_symbol_check.dump @@ -123,7 +123,6 @@ piextGetDeviceFunctionPointer piextGetGlobalVariablePointer piextImportExternalMemory piextImportExternalSemaphore -piextImportExternalSemaphoreOpaqueFD piextKernelCreateWithNativeHandle piextKernelGetNativeHandle piextKernelSetArgMemObj @@ -137,7 +136,6 @@ piextMemImageCopy piextMemImageCreateWithNativeHandle piextMemImageFree piextMemImageGetInfo -piextMemImportOpaqueFD piextMemMapExternalArray piextMemMipmapFree piextMemMipmapGetLevel diff --git a/sycl/test/abi/pi_opencl_symbol_check.dump b/sycl/test/abi/pi_opencl_symbol_check.dump index 75fba0db0809a..b34c289772d63 100644 --- a/sycl/test/abi/pi_opencl_symbol_check.dump +++ b/sycl/test/abi/pi_opencl_symbol_check.dump @@ -122,7 +122,6 @@ piextGetDeviceFunctionPointer piextGetGlobalVariablePointer piextImportExternalMemory piextImportExternalSemaphore -piextImportExternalSemaphoreOpaqueFD piextKernelCreateWithNativeHandle piextKernelGetNativeHandle piextKernelSetArgMemObj @@ -139,7 +138,6 @@ piextPhysicalMemRelease piextPhysicalMemRetain piextMemImageFree piextMemImageGetInfo -piextMemImportOpaqueFD piextMemMapExternalArray piextMemMipmapFree piextMemMipmapGetLevel diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index db5026458f8ec..f3ee04c245a32 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3004,18 +3004,12 @@ _ZN4sycl3_V13ext6oneapi12experimental12physical_memC1ERKNS0_6deviceERKNS0_7conte _ZN4sycl3_V13ext6oneapi12experimental12physical_memC2ERKNS0_6deviceERKNS0_7contextEm _ZN4sycl3_V13ext6oneapi12experimental14free_image_memENS3_16image_mem_handleENS3_10image_typeERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental14free_image_memENS3_16image_mem_handleENS3_10image_typeERKNS0_6deviceERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental14free_image_memENS3_16image_mem_handleERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental14free_image_memENS3_16image_mem_handleERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental15alloc_image_memERKNS3_16image_descriptorERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental15alloc_image_memERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental15free_mipmap_memENS3_16image_mem_handleERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental15free_mipmap_memENS3_16image_mem_handleERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental15get_access_modeEPKvmRKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental15get_image_rangeENS3_16image_mem_handleERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental15get_image_rangeENS3_16image_mem_handleERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental15set_access_modeEPKvmNS3_19address_access_modeERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental16alloc_mipmap_memERKNS3_16image_descriptorERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental16alloc_mipmap_memERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental16free_virtual_memEmmRKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental19get_mem_granularityERKNS0_6deviceERKNS0_7contextENS3_16granularity_modeE _ZN4sycl3_V13ext6oneapi12experimental19get_mem_granularityERKNS0_7contextENS3_16granularity_modeE @@ -3035,8 +3029,6 @@ _ZN4sycl3_V13ext6oneapi12experimental22get_image_num_channelsENS3_16image_mem_ha _ZN4sycl3_V13ext6oneapi12experimental22get_image_num_channelsENS3_16image_mem_handleERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_11resource_fdEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_11resource_fdEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_6deviceERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_15external_mem_fdEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_15external_mem_fdEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_21resource_win32_handleEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental22import_external_memoryINS3_21resource_win32_handleEEENS3_18interop_mem_handleENS3_23external_mem_descriptorIT_EERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental23prepare_for_device_copyEPKvmRKNS0_5queueE @@ -3049,14 +3041,10 @@ _ZN4sycl3_V13ext6oneapi12experimental24release_from_device_copyEPKvRKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental24release_from_device_copyEPKvRKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_11resource_fdEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_11resource_fdEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_6deviceERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_21external_semaphore_fdEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_21external_semaphore_fdEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_21resource_win32_handleEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental25import_external_semaphoreINS3_21resource_win32_handleEEENS3_24interop_semaphore_handleENS3_29external_semaphore_descriptorIT_EERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental25map_external_image_memoryENS3_18interop_mem_handleERKNS3_16image_descriptorERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental25map_external_image_memoryENS3_18interop_mem_handleERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE -_ZN4sycl3_V13ext6oneapi12experimental25map_external_memory_arrayENS3_18interop_mem_handleERKNS3_16image_descriptorERKNS0_5queueE -_ZN4sycl3_V13ext6oneapi12experimental25map_external_memory_arrayENS3_18interop_mem_handleERKNS3_16image_descriptorERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental26destroy_external_semaphoreENS3_24interop_semaphore_handleERKNS0_5queueE _ZN4sycl3_V13ext6oneapi12experimental26destroy_external_semaphoreENS3_24interop_semaphore_handleERKNS0_6deviceERKNS0_7contextE _ZN4sycl3_V13ext6oneapi12experimental4node12update_rangeILi1EEEvNS0_5rangeIXT_EEE diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 488600ab51189..3dd5fd29a4e3c 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -251,14 +251,10 @@ ??$get_profiling_info@Ucommand_end@event_profiling@info@_V1@sycl@@@event@_V1@sycl@@QEBA_KXZ ??$get_profiling_info@Ucommand_start@event_profiling@info@_V1@sycl@@@event@_V1@sycl@@QEBA_KXZ ??$get_profiling_info@Ucommand_submit@event_profiling@info@_V1@sycl@@@event@_V1@sycl@@QEBA_KXZ -??$import_external_memory@Uexternal_mem_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uexternal_mem_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z -??$import_external_memory@Uexternal_mem_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uexternal_mem_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVqueue@34@@Z ??$import_external_memory@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z ??$import_external_memory@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVqueue@34@@Z ??$import_external_memory@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z ??$import_external_memory@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_mem_handle@01234@U?$external_mem_descriptor@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVqueue@34@@Z -??$import_external_semaphore@Uexternal_semaphore_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_semaphore_handle@01234@U?$external_semaphore_descriptor@Uexternal_semaphore_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z -??$import_external_semaphore@Uexternal_semaphore_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_semaphore_handle@01234@U?$external_semaphore_descriptor@Uexternal_semaphore_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVqueue@34@@Z ??$import_external_semaphore@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_semaphore_handle@01234@U?$external_semaphore_descriptor@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z ??$import_external_semaphore@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_semaphore_handle@01234@U?$external_semaphore_descriptor@Uresource_fd@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVqueue@34@@Z ??$import_external_semaphore@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@experimental@oneapi@ext@_V1@sycl@@YA?AUinterop_semaphore_handle@01234@U?$external_semaphore_descriptor@Uresource_win32_handle@experimental@oneapi@ext@_V1@sycl@@@01234@AEBVdevice@34@AEBVcontext@34@@Z @@ -3715,8 +3711,6 @@ ?aligned_alloc_shared@_V1@sycl@@YAPEAX_K0AEBVqueue@12@AEBVproperty_list@12@AEBUcode_location@detail@12@@Z ?alloc_image_mem@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@AEBUimage_descriptor@12345@AEBVdevice@45@AEBVcontext@45@@Z ?alloc_image_mem@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@AEBUimage_descriptor@12345@AEBVqueue@45@@Z -?alloc_mipmap_mem@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@AEBUimage_descriptor@12345@AEBVdevice@45@AEBVcontext@45@@Z -?alloc_mipmap_mem@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@AEBUimage_descriptor@12345@AEBVqueue@45@@Z ?aspect_selector@_V1@sycl@@YA?AV?$function@$$A6AHAEBVdevice@_V1@sycl@@@Z@std@@AEBV?$vector@W4aspect@_V1@sycl@@V?$allocator@W4aspect@_V1@sycl@@@std@@@4@0@Z ?assertion@pi@detail@_V1@sycl@@YAX_NPEBD@Z ?associateWithHandler@detail@_V1@sycl@@YAXAEAVhandler@23@PEAVAccessorBaseHost@123@W4target@access@23@@Z @@ -3884,12 +3878,8 @@ ?find_device_intersection@detail@_V1@sycl@@YA?AV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@AEBV?$vector@V?$kernel_bundle@$00@_V1@sycl@@V?$allocator@V?$kernel_bundle@$00@_V1@sycl@@@std@@@5@@Z ?free@_V1@sycl@@YAXPEAXAEBVcontext@12@AEBUcode_location@detail@12@@Z ?free@_V1@sycl@@YAXPEAXAEBVqueue@12@AEBUcode_location@detail@12@@Z -?free_image_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@AEBVdevice@45@AEBVcontext@45@@Z -?free_image_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@AEBVqueue@45@@Z ?free_image_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@W4image_type@12345@AEBVdevice@45@AEBVcontext@45@@Z ?free_image_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@W4image_type@12345@AEBVqueue@45@@Z -?free_mipmap_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@AEBVdevice@45@AEBVcontext@45@@Z -?free_mipmap_mem@experimental@oneapi@ext@_V1@sycl@@YAXUimage_mem_handle@12345@AEBVqueue@45@@Z ?free_virtual_mem@experimental@oneapi@ext@_V1@sycl@@YAX_K0AEBVcontext@45@@Z ?frexp_impl@detail@_V1@sycl@@YA?AVhalf@half_impl@123@V45123@PEAH@Z ?frexp_impl@detail@_V1@sycl@@YAMMPEAH@Z @@ -4146,8 +4136,6 @@ ?map@physical_mem@experimental@oneapi@ext@_V1@sycl@@QEBAPEAX_K0W4address_access_mode@23456@0@Z ?map_external_image_memory@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@Uinterop_mem_handle@12345@AEBUimage_descriptor@12345@AEBVdevice@45@AEBVcontext@45@@Z ?map_external_image_memory@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@Uinterop_mem_handle@12345@AEBUimage_descriptor@12345@AEBVqueue@45@@Z -?map_external_memory_array@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@Uinterop_mem_handle@12345@AEBUimage_descriptor@12345@AEBVdevice@45@AEBVcontext@45@@Z -?map_external_memory_array@experimental@oneapi@ext@_V1@sycl@@YA?AUimage_mem_handle@12345@Uinterop_mem_handle@12345@AEBUimage_descriptor@12345@AEBVqueue@45@@Z ?markBufferAsInternal@detail@_V1@sycl@@YAXAEBV?$shared_ptr@Vbuffer_impl@detail@_V1@sycl@@@std@@@Z ?mem_advise@experimental@oneapi@ext@_V1@sycl@@YAXVqueue@45@PEAX_KHAEBUcode_location@detail@45@@Z ?mem_advise@handler@_V1@sycl@@QEAAXPEBX_KH@Z diff --git a/sycl/unittests/helpers/PiMockPlugin.hpp b/sycl/unittests/helpers/PiMockPlugin.hpp index 054161022d40f..fb8269e7ec99a 100644 --- a/sycl/unittests/helpers/PiMockPlugin.hpp +++ b/sycl/unittests/helpers/PiMockPlugin.hpp @@ -512,15 +512,6 @@ inline pi_result mock_piextMemUnsampledImageCreate( return PI_SUCCESS; } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalMemory`")]] -inline pi_result -mock_piextMemImportOpaqueFD(pi_context context, pi_device device, size_t size, - int file_descriptor, - pi_interop_mem_handle *ret_handle) { - return PI_SUCCESS; -} - inline pi_result mock_piextMemMapExternalArray(pi_context context, pi_device device, pi_image_format *image_format, @@ -536,14 +527,6 @@ inline pi_result mock_piextMemReleaseInterop(pi_context context, return PI_SUCCESS; } -[[deprecated("This function has been deprecated in favor of " - "`piextImportExternalSemaphore`")]] -inline pi_result mock_piextImportExternalSemaphoreOpaqueFD( - pi_context context, pi_device device, int file_descriptor, - pi_interop_semaphore_handle *ret_handle) { - return PI_SUCCESS; -} - inline pi_result mock_piextImportExternalSemaphore( pi_context context, pi_device device, pi_external_semaphore_descriptor *sem_descriptor,