[SYCL] Change of name of piextDevice/ProgramInterop to piextDeviceProgramConvert.

Returning error code from clRetainDevice/clRetainProgram.

Signed-off-by: Garima Gupta <[email protected]>

Author: garimagu

sycl/include/CL/sycl/detail/pi.def

@@ -18,7 +18,7 @@
 _PI_API(piPlatformsGet)
 _PI_API(piPlatformGetInfo)
 // Device
-_PI_API(piextDeviceInterop)
+_PI_API(piextDeviceConvert)
 _PI_API(piDevicesGet)
 _PI_API(piDeviceGetInfo)
 _PI_API(piDevicePartition)
@@ -46,7 +46,7 @@ _PI_API(piMemRetain)
 _PI_API(piMemRelease)
 _PI_API(piMemBufferPartition)
 // Program
-_PI_API(piextProgramInterop)
+_PI_API(piextProgramConvert)
 _PI_API(piProgramCreate)
 _PI_API(piclProgramCreateWithSource)
 _PI_API(piclProgramCreateWithBinary)

sycl/include/CL/sycl/detail/pi.h

@@ -717,7 +717,7 @@ pi_result piPlatformGetInfo(pi_platform platform, pi_platform_info param_name,
 /// the "handle" (if it was pointing to a null) from the given PI device.
 /// NOTE: The instance of the PI device created is retained.
 ///
-pi_result piextDeviceInterop(
+pi_result piextDeviceConvert(
     pi_device *device, ///< [in,out] the pointer to PI device
     void **handle);    ///< [in,out] the pointer to the raw device handle
 
@@ -827,7 +827,7 @@ pi_result piMemBufferPartition(pi_mem buffer, pi_mem_flags flags,
 /// the "handle" (if it was pointing to a null) from the given PI program.
 /// NOTE: The instance of the PI program created is retained.
 ///
-pi_result piextProgramInterop(
+pi_result piextProgramConvert(
     pi_context context,  ///< [in] the PI context of the program
     pi_program *program, ///< [in,out] the pointer to PI program
     void **handle);      ///< [in,out] the pointer to the raw program handle

sycl/include/CL/sycl/detail/pi.hpp

@@ -179,12 +179,12 @@ template <class To, class From> To inline pi::cast(From value) {
 
 // These conversions should use PI interop API.
 template <> pi::PiProgram inline pi::cast(cl_program interop) {
-  RT::assertion(false, "pi::cast -> use piextProgramInterop");
+  RT::assertion(false, "pi::cast -> use piextProgramConvert");
   return {};
 }
 
 template <> pi::PiDevice inline pi::cast(cl_device_id interop) {
-  RT::assertion(false, "pi::cast -> use piextDeviceInterop");
+  RT::assertion(false, "pi::cast -> use piextDeviceConvert");
   return {};
 }
 

sycl/plugins/cuda/pi_cuda.cpp

@@ -680,8 +680,8 @@ pi_result cuda_piPlatformGetInfo(pi_platform platform,
   return {};
 }
 
-pi_result cuda_piextDeviceInterop(pi_device *device, void **handle) {
-  cl::sycl::detail::pi::die("cuda_piextDeviceInterop not implemented");
+pi_result cuda_piextDeviceConvert(pi_device *device, void **handle) {
+  cl::sycl::detail::pi::die("cuda_piextDeviceConvert not implemented");
   return {};
 }
 
@@ -2143,12 +2143,12 @@ pi_result cuda_piMemRetain(pi_mem mem) {
 //
 // Program
 //
-pi_result cuda_piextProgramInterop(
+pi_result cuda_piextProgramConvert(
     pi_context context,  ///< [in] the PI context of the program
     pi_program *program, ///< [in,out] the pointer to PI program
     void **handle)       ///< [in,out] the pointer to the raw program handle
 {
-  cl::sycl::detail::pi::die("cuda_piextProgramInterop not implemented");
+  cl::sycl::detail::pi::die("cuda_piextProgramConvert not implemented");
   return {};
 }
 
@@ -3494,7 +3494,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piPlatformsGet, cuda_piPlatformsGet)
   _PI_CL(piPlatformGetInfo, cuda_piPlatformGetInfo)
   // Device
-  _PI_CL(piextDeviceInterop, cuda_piextDeviceInterop)
+  _PI_CL(piextDeviceConvert, cuda_piextDeviceConvert)
   _PI_CL(piDevicesGet, cuda_piDevicesGet)
   _PI_CL(piDeviceGetInfo, cuda_piDeviceGetInfo)
   _PI_CL(piDevicePartition, cuda_piDevicePartition)
@@ -3522,7 +3522,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piMemRelease, cuda_piMemRelease)
   _PI_CL(piMemBufferPartition, cuda_piMemBufferPartition)
   // Program
-  _PI_CL(piextProgramInterop, cuda_piextProgramInterop)
+  _PI_CL(piextProgramConvert, cuda_piextProgramConvert)
   _PI_CL(piProgramCreate, cuda_piProgramCreate)
   _PI_CL(piclProgramCreateWithSource, cuda_piclProgramCreateWithSource)
   _PI_CL(piclProgramCreateWithBinary, cuda_piclProgramCreateWithBinary)

sycl/plugins/opencl/pi_opencl.cpp

@@ -176,7 +176,7 @@ pi_result OCL(piPlatformsGet)(pi_uint32 num_entries, pi_platform *platforms,
   return static_cast<pi_result>(result);
 }
 
-pi_result OCL(piextDeviceInterop)(pi_device *device, void **handle) {
+pi_result OCL(piextDeviceConvert)(pi_device *device, void **handle) {
   // The PI device is the same as OpenCL device handle.
   assert(device);
   assert(handle);
@@ -190,8 +190,8 @@ pi_result OCL(piextDeviceInterop)(pi_device *device, void **handle) {
     *handle = *device;
   }
 
-  clRetainDevice(cast<cl_device_id>(*handle));
-  return PI_SUCCESS;
+  cl_int result = clRetainDevice(cast<cl_device_id>(*handle));
+  return cast<pi_result>(result);
 }
 
 // Example of a PI interface that does not map exactly to an OpenCL one.
@@ -323,7 +323,7 @@ pi_result OCL(piQueueCreate)(pi_context context, pi_device device,
   return cast<pi_result>(ret_err);
 }
 
-pi_result OCL(piextProgramInterop)(
+pi_result OCL(piextProgramConvert)(
     pi_context context,  ///< [in] the PI context of the program
     pi_program *program, ///< [in,out] the pointer to PI program
     void **handle)       ///< [in,out] the pointer to the raw program handle
@@ -340,8 +340,8 @@ pi_result OCL(piextProgramInterop)(
     assert(*handle == nullptr);
     *handle = *program;
   }
-  clRetainProgram(cast<cl_program>(*handle));
-  return PI_SUCCESS;
+  cl_int result = clRetainProgram(cast<cl_program>(*handle));
+  return cast<pi_result>(result);
 }
 
 pi_result OCL(piProgramCreate)(pi_context context, const void *il,
@@ -1031,7 +1031,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piPlatformsGet, OCL(piPlatformsGet))
   _PI_CL(piPlatformGetInfo, clGetPlatformInfo)
   // Device
-  _PI_CL(piextDeviceInterop, OCL(piextDeviceInterop))
+  _PI_CL(piextDeviceConvert, OCL(piextDeviceConvert))
   _PI_CL(piDevicesGet, OCL(piDevicesGet))
   _PI_CL(piDeviceGetInfo, clGetDeviceInfo)
   _PI_CL(piDevicePartition, clCreateSubDevices)
@@ -1059,7 +1059,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_CL(piMemRelease, clReleaseMemObject)
   _PI_CL(piMemBufferPartition, OCL(piMemBufferPartition))
   // Program
-  _PI_CL(piextProgramInterop, OCL(piextProgramInterop))
+  _PI_CL(piextProgramConvert, OCL(piextProgramConvert))
   _PI_CL(piProgramCreate, OCL(piProgramCreate))
   _PI_CL(piclProgramCreateWithSource, OCL(piclProgramCreateWithSource))
   _PI_CL(piclProgramCreateWithBinary, OCL(piclProgramCreateWithBinary))

sycl/source/detail/device_impl.cpp

@@ -38,7 +38,7 @@ device_impl::device_impl(device_interop_handle_t InteropDeviceHandle,
   if (Device == nullptr) {
     assert(InteropDeviceHandle != nullptr);
     // Get PI device from the raw device handle.
-    Plugin.call<PiApiKind::piextDeviceInterop>(&MDevice,
+    Plugin.call<PiApiKind::piextDeviceConvert>(&MDevice,
                                                (void **)&InteropDeviceHandle);
     InteroperabilityConstructor = true;
   }
@@ -56,7 +56,7 @@ device_impl::device_impl(device_interop_handle_t InteropDeviceHandle,
   if (!MIsRootDevice && !InteroperabilityConstructor) {
     // TODO catch an exception and put it to list of asynchronous exceptions
     // Interoperability Constructor already calls DeviceRetain in
-    // piextDeviceInterop.
+    // piextDeviceConvert.
     Plugin.call<PiApiKind::piDeviceRetain>(MDevice);
   }
 
@@ -98,7 +98,7 @@ cl_device_id device_impl::get() const {
     Plugin.call<PiApiKind::piDeviceRetain>(MDevice);
   }
   void *handle = nullptr;
-  Plugin.call<PiApiKind::piextDeviceInterop>(
+  Plugin.call<PiApiKind::piextDeviceConvert>(
       const_cast<RT::PiDevice *>(&MDevice), &handle);
   return pi::cast<cl_device_id>(handle);
 }

sycl/source/detail/program_impl.cpp

@@ -92,18 +92,18 @@ program_impl::program_impl(ContextImplPtr Context,
   const detail::plugin &Plugin = getPlugin();
   if (MProgram == nullptr) {
     assert(InteropProgram != nullptr &&
-           "No InteropProgram/PiProgram defined with piextProgramInterop");
+           "No InteropProgram/PiProgram defined with piextProgramConvert");
     // Translate the raw program handle into PI program.
-    Plugin.call<PiApiKind::piextProgramInterop>(
+    Plugin.call<PiApiKind::piextProgramConvert>(
         Context->getHandleRef(), &MProgram, (void **)&InteropProgram);
   } else
     Plugin.call<PiApiKind::piProgramRetain>(Program);
 
   // TODO handle the case when cl_program build is in progress
   pi_uint32 NumDevices;
-  Plugin.call<PiApiKind::piProgramGetInfo>(MProgram, PI_PROGRAM_INFO_NUM_DEVICES,
-                                           sizeof(pi_uint32), &NumDevices,
-                                           nullptr);
+  Plugin.call<PiApiKind::piProgramGetInfo>(
+      MProgram, PI_PROGRAM_INFO_NUM_DEVICES, sizeof(pi_uint32), &NumDevices,
+      nullptr);
   vector_class<RT::PiDevice> PiDevices(NumDevices);
   Plugin.call<PiApiKind::piProgramGetInfo>(MProgram, PI_PROGRAM_INFO_DEVICES,
                                            sizeof(RT::PiDevice) * NumDevices,