Rename piclProgramCreateWithBinary to piProgramCreateWithBinary

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

@@ -56,7 +56,7 @@ _PI_API(piextMemCreateWithNativeHandle)
 // Program
 _PI_API(piProgramCreate)
 _PI_API(piclProgramCreateWithSource)
-_PI_API(piclProgramCreateWithBinary)
+_PI_API(piProgramCreateWithBinary)
 _PI_API(piProgramGetInfo)
 _PI_API(piProgramCompile)
 _PI_API(piProgramBuild)

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

@@ -992,7 +992,7 @@ __SYCL_EXPORT pi_result piclProgramCreateWithSource(pi_context context,
                                                     const size_t *lengths,
                                                     pi_program *ret_program);
 
-__SYCL_EXPORT pi_result piclProgramCreateWithBinary(
+__SYCL_EXPORT pi_result piProgramCreateWithBinary(
     pi_context context, pi_uint32 num_devices, const pi_device *device_list,
     const size_t *lengths, const unsigned char **binaries,
     pi_int32 *binary_status, pi_program *ret_program);

sycl/plugins/level_zero/pi_level0.cpp

@@ -1636,12 +1636,12 @@ pi_result piProgramCreate(pi_context Context, const void *IL, size_t Length,
   return PI_SUCCESS;
 }
 
-pi_result piclProgramCreateWithBinary(pi_context Context, pi_uint32 NumDevices,
-                                      const pi_device *DeviceList,
-                                      const size_t *Lengths,
-                                      const unsigned char **Binaries,
-                                      pi_int32 *BinaryStatus,
-                                      pi_program *RetProgram) {
+pi_result piProgramCreateWithBinary(pi_context Context, pi_uint32 NumDevices,
+                                    const pi_device *DeviceList,
+                                    const size_t *Lengths,
+                                    const unsigned char **Binaries,
+                                    pi_int32 *BinaryStatus,
+                                    pi_program *RetProgram) {
 
   // This must be for the single device in this context.
   assert(NumDevices == 1);

sycl/plugins/opencl/pi_opencl.cpp

@@ -556,12 +556,12 @@ pi_result piclProgramCreateWithSource(pi_context context, pi_uint32 count,
   return ret_err;
 }
 
-pi_result piclProgramCreateWithBinary(pi_context context, pi_uint32 num_devices,
-                                      const pi_device *device_list,
-                                      const size_t *lengths,
-                                      const unsigned char **binaries,
-                                      pi_int32 *binary_status,
-                                      pi_program *ret_program) {
+pi_result piProgramCreateWithBinary(pi_context context, pi_uint32 num_devices,
+                                    const pi_device *device_list,
+                                    const size_t *lengths,
+                                    const unsigned char **binaries,
+                                    pi_int32 *binary_status,
+                                    pi_program *ret_program) {
 
   pi_result ret_err = PI_INVALID_OPERATION;
   *ret_program = cast<pi_program>(clCreateProgramWithBinary(
@@ -1151,7 +1151,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
   // Program
   _PI_CL(piProgramCreate, piProgramCreate)
   _PI_CL(piclProgramCreateWithSource, piclProgramCreateWithSource)
-  _PI_CL(piclProgramCreateWithBinary, piclProgramCreateWithBinary)
+  _PI_CL(piProgramCreateWithBinary, piProgramCreateWithBinary)
   _PI_CL(piProgramGetInfo, clGetProgramInfo)
   _PI_CL(piProgramCompile, clCompileProgram)
   _PI_CL(piProgramBuild, clBuildProgram)

sycl/source/detail/program_manager/program_manager.cpp

@@ -87,7 +87,7 @@ static RT::PiProgram createBinaryProgram(const ContextImplPtr Context,
   RT::PiProgram Program;
   RT::PiDevice Device = getFirstDevice(Context);
   pi_int32 BinaryStatus = CL_SUCCESS;
-  Plugin.call<PiApiKind::piclProgramCreateWithBinary>(
+  Plugin.call<PiApiKind::piProgramCreateWithBinary>(
       Context->getHandleRef(), 1 /*one binary*/, &Device, &DataLen, &Data,
       &BinaryStatus, &Program);
 

sycl/test/abi/pi_level0_symbol_check.dump

@@ -84,7 +84,7 @@ piKernelSetArg
 piEnqueueMemBufferCopyRect
 piEnqueueKernelLaunch
 piextContextCreateWithNativeHandle
-piclProgramCreateWithBinary
+piProgramCreateWithBinary
 piKernelGetGroupInfo
 piextEventCreateWithNativeHandle
 piEventsWait

sycl/test/abi/pi_opencl_symbol_check.dump

@@ -17,7 +17,7 @@ piProgramCreate
 piProgramLink
 piQueueCreate
 piSamplerCreate
-piclProgramCreateWithBinary
+piProgramCreateWithBinary
 piclProgramCreateWithSource
 piextContextCreateWithNativeHandle
 piextContextGetNativeHandle

sycl/test/scheduler/ReleaseResourcesTest.cpp

@@ -4,10 +4,6 @@
 // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
 // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
 
-// TODO: error: expected string not found in input
-// TODO: PI ---> pi::piProgramCreate(Context, Data, DataLen, &Program)
-// XFAIL: cuda
-
 //==------------------- ReleaseResourcesTests.cpp --------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/unittests/pi/cuda/test_kernels.cpp

@@ -129,11 +129,10 @@ TEST_F(CudaKernelsTest, PICreateProgramAndKernel) {
 
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&ptxSource, &binary_status, &prog)),
+            PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
                 prog, 1, &device_, "", nullptr, nullptr)),
@@ -153,11 +152,10 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSimple) {
   /// use it at some point in the future, pass it anyway and check the result.
   /// Same goes for all the other tests in this file.
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&ptxSource, &binary_status, &prog)),
+            PI_SUCCESS);
   ASSERT_EQ(binary_status, PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
@@ -183,11 +181,10 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSetTwice) {
 
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&ptxSource, &binary_status, &prog)),
+            PI_SUCCESS);
   ASSERT_EQ(binary_status, PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
@@ -222,11 +219,10 @@ TEST_F(CudaKernelsTest, PIKernelSetMemObj) {
 
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&ptxSource, &binary_status, &prog)),
+            PI_SUCCESS);
   ASSERT_EQ(binary_status, PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
@@ -257,11 +253,10 @@ TEST_F(CudaKernelsTest, PIkerneldispatch) {
 
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&ptxSource, &binary_status, &prog)),
+            PI_SUCCESS);
   ASSERT_EQ(binary_status, PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
@@ -300,11 +295,10 @@ TEST_F(CudaKernelsTest, PIkerneldispatchTwo) {
 
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
-  ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
-          context_, 1, &device_, nullptr, (const unsigned char **)&twoParams,
-          &binary_status, &prog)),
-      PI_SUCCESS);
+  ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
+                context_, 1, &device_, nullptr,
+                (const unsigned char **)&twoParams, &binary_status, &prog)),
+            PI_SUCCESS);
   ASSERT_EQ(binary_status, PI_SUCCESS);
 
   ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piProgramBuild>(
@@ -355,7 +349,7 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSetTwiceOneLocal) {
   pi_program prog;
   pi_int32 binary_status = PI_SUCCESS;
   ASSERT_EQ(
-      (plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
+      (plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
           context_, 1, &device_, nullptr,
           (const unsigned char **)&threeParamsTwoLocal, &binary_status, &prog)),
       PI_SUCCESS);