Skip to content

Commit 3ae3cc3

Browse files
bjoernknaflabjoernknafla
committed
[SYCL][PI] Rename piclProgramCreateWithBinary
As all PI backends (OpenCL, Level Zero, CUDA) implement the `piclProgramCreateWithBinary` function we rename it to `piProgramCreateWithBinary` as it isn't OpenCL-specifici anymore. Signed-off-by: Bjoern Knafla <[email protected]>
1 parent bc5be46 commit 3ae3cc3

File tree

10 files changed

+17
-21
lines changed

10 files changed

+17
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ _PI_API(piextMemCreateWithNativeHandle)
5656
// Program
5757
_PI_API(piProgramCreate)
5858
_PI_API(piclProgramCreateWithSource)
59-
_PI_API(piclProgramCreateWithBinary)
59+
_PI_API(piProgramCreateWithBinary)
6060
_PI_API(piProgramGetInfo)
6161
_PI_API(piProgramCompile)
6262
_PI_API(piProgramBuild)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ __SYCL_EXPORT pi_result piclProgramCreateWithSource(pi_context context,
992992
const size_t *lengths,
993993
pi_program *ret_program);
994994

995-
__SYCL_EXPORT pi_result piclProgramCreateWithBinary(
995+
__SYCL_EXPORT pi_result piProgramCreateWithBinary(
996996
pi_context context, pi_uint32 num_devices, const pi_device *device_list,
997997
const size_t *lengths, const unsigned char **binaries,
998998
pi_int32 *binary_status, pi_program *ret_program);

‎sycl/plugins/cuda/pi_cuda.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,7 +2225,7 @@ pi_result cuda_piProgramCreate(pi_context context, const void *il,
22252225
///
22262226
/// Note: Only supports one device
22272227
///
2228-
pi_result cuda_piclProgramCreateWithBinary(
2228+
pi_result cuda_piProgramCreateWithBinary(
22292229
pi_context context, pi_uint32 num_devices, const pi_device *device_list,
22302230
const size_t *lengths, const unsigned char **binaries,
22312231
pi_int32 *binary_status, pi_program *program) {
@@ -3688,7 +3688,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
36883688
// Program
36893689
_PI_CL(piProgramCreate, cuda_piProgramCreate)
36903690
_PI_CL(piclProgramCreateWithSource, cuda_piclProgramCreateWithSource)
3691-
_PI_CL(piclProgramCreateWithBinary, cuda_piclProgramCreateWithBinary)
3691+
_PI_CL(piProgramCreateWithBinary, cuda_piProgramCreateWithBinary)
36923692
_PI_CL(piProgramGetInfo, cuda_piProgramGetInfo)
36933693
_PI_CL(piProgramCompile, cuda_piProgramCompile)
36943694
_PI_CL(piProgramBuild, cuda_piProgramBuild)

‎sycl/plugins/level_zero/pi_level0.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ pi_result piProgramCreate(pi_context Context, const void *IL, size_t Length,
16361636
return PI_SUCCESS;
16371637
}
16381638

1639-
pi_result piclProgramCreateWithBinary(pi_context Context, pi_uint32 NumDevices,
1639+
pi_result piProgramCreateWithBinary(pi_context Context, pi_uint32 NumDevices,
16401640
const pi_device *DeviceList,
16411641
const size_t *Lengths,
16421642
const unsigned char **Binaries,

‎sycl/plugins/opencl/pi_opencl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ pi_result piclProgramCreateWithSource(pi_context context, pi_uint32 count,
556556
return ret_err;
557557
}
558558

559-
pi_result piclProgramCreateWithBinary(pi_context context, pi_uint32 num_devices,
559+
pi_result piProgramCreateWithBinary(pi_context context, pi_uint32 num_devices,
560560
const pi_device *device_list,
561561
const size_t *lengths,
562562
const unsigned char **binaries,
@@ -1151,7 +1151,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) {
11511151
// Program
11521152
_PI_CL(piProgramCreate, piProgramCreate)
11531153
_PI_CL(piclProgramCreateWithSource, piclProgramCreateWithSource)
1154-
_PI_CL(piclProgramCreateWithBinary, piclProgramCreateWithBinary)
1154+
_PI_CL(piProgramCreateWithBinary, piProgramCreateWithBinary)
11551155
_PI_CL(piProgramGetInfo, clGetProgramInfo)
11561156
_PI_CL(piProgramCompile, clCompileProgram)
11571157
_PI_CL(piProgramBuild, clBuildProgram)

‎sycl/source/detail/program_manager/program_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static RT::PiProgram createBinaryProgram(const ContextImplPtr Context,
8787
RT::PiProgram Program;
8888
RT::PiDevice Device = getFirstDevice(Context);
8989
pi_int32 BinaryStatus = CL_SUCCESS;
90-
Plugin.call<PiApiKind::piclProgramCreateWithBinary>(
90+
Plugin.call<PiApiKind::piProgramCreateWithBinary>(
9191
Context->getHandleRef(), 1 /*one binary*/, &Device, &DataLen, &Data,
9292
&BinaryStatus, &Program);
9393

‎sycl/test/abi/pi_level0_symbol_check.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ piKernelSetArg
8484
piEnqueueMemBufferCopyRect
8585
piEnqueueKernelLaunch
8686
piextContextCreateWithNativeHandle
87-
piclProgramCreateWithBinary
87+
piProgramCreateWithBinary
8888
piKernelGetGroupInfo
8989
piextEventCreateWithNativeHandle
9090
piEventsWait

‎sycl/test/abi/pi_opencl_symbol_check.dump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ piProgramCreate
1717
piProgramLink
1818
piQueueCreate
1919
piSamplerCreate
20-
piclProgramCreateWithBinary
20+
piProgramCreateWithBinary
2121
piclProgramCreateWithSource
2222
piextContextCreateWithNativeHandle
2323
piextContextGetNativeHandle

‎sycl/test/scheduler/ReleaseResourcesTest.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
55
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
66

7-
// TODO: error: expected string not found in input
8-
// TODO: PI ---> pi::piProgramCreate(Context, Data, DataLen, &Program)
9-
// XFAIL: cuda
10-
117
//==------------------- ReleaseResourcesTests.cpp --------------------------==//
128
//
139
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎sycl/unittests/pi/cuda/test_kernels.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ TEST_F(CudaKernelsTest, PICreateProgramAndKernel) {
130130
pi_program prog;
131131
pi_int32 binary_status = PI_SUCCESS;
132132
ASSERT_EQ(
133-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
133+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
134134
context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
135135
&binary_status, &prog)),
136136
PI_SUCCESS);
@@ -154,7 +154,7 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSimple) {
154154
/// Same goes for all the other tests in this file.
155155
pi_int32 binary_status = PI_SUCCESS;
156156
ASSERT_EQ(
157-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
157+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
158158
context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
159159
&binary_status, &prog)),
160160
PI_SUCCESS);
@@ -184,7 +184,7 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSetTwice) {
184184
pi_program prog;
185185
pi_int32 binary_status = PI_SUCCESS;
186186
ASSERT_EQ(
187-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
187+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
188188
context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
189189
&binary_status, &prog)),
190190
PI_SUCCESS);
@@ -223,7 +223,7 @@ TEST_F(CudaKernelsTest, PIKernelSetMemObj) {
223223
pi_program prog;
224224
pi_int32 binary_status = PI_SUCCESS;
225225
ASSERT_EQ(
226-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
226+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
227227
context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
228228
&binary_status, &prog)),
229229
PI_SUCCESS);
@@ -258,7 +258,7 @@ TEST_F(CudaKernelsTest, PIkerneldispatch) {
258258
pi_program prog;
259259
pi_int32 binary_status = PI_SUCCESS;
260260
ASSERT_EQ(
261-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
261+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
262262
context_, 1, &device_, nullptr, (const unsigned char **)&ptxSource,
263263
&binary_status, &prog)),
264264
PI_SUCCESS);
@@ -301,7 +301,7 @@ TEST_F(CudaKernelsTest, PIkerneldispatchTwo) {
301301
pi_program prog;
302302
pi_int32 binary_status = PI_SUCCESS;
303303
ASSERT_EQ(
304-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
304+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
305305
context_, 1, &device_, nullptr, (const unsigned char **)&twoParams,
306306
&binary_status, &prog)),
307307
PI_SUCCESS);
@@ -355,7 +355,7 @@ TEST_F(CudaKernelsTest, PIKernelArgumentSetTwiceOneLocal) {
355355
pi_program prog;
356356
pi_int32 binary_status = PI_SUCCESS;
357357
ASSERT_EQ(
358-
(plugin.call_nocheck<detail::PiApiKind::piclProgramCreateWithBinary>(
358+
(plugin.call_nocheck<detail::PiApiKind::piProgramCreateWithBinary>(
359359
context_, 1, &device_, nullptr,
360360
(const unsigned char **)&threeParamsTwoLocal, &binary_status, &prog)),
361361
PI_SUCCESS);

0 commit comments

Comments
 (0)