Skip to content

Commit 1911c45

Browse files
kswiecickikswiecicki
committed
[UR][OpenCL] Strip UR_API macros from functions exported via ddi tables
Those macros were causing issues with opencl adapter being built as a dynamic library.
1 parent 72b423a commit 1911c45

21 files changed

Lines changed: 537 additions & 567 deletions

‎unified-runtime/source/adapters/opencl/adapter.cpp‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ ur_adapter_handle_t ur::cl::getAdapter() {
9191

9292
namespace ur::opencl {
9393

94-
UR_APIEXPORT ur_result_t UR_APICALL
95-
urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
96-
uint32_t *pNumAdapters) {
94+
ur_result_t urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
95+
uint32_t *pNumAdapters) {
9796
static std::mutex AdapterConstructionMutex{};
9897

9998
// Always construct the adapter, even for count-only queries (NumEntries==0),
@@ -125,33 +124,31 @@ urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
125124
return UR_RESULT_SUCCESS;
126125
}
127126

128-
UR_APIEXPORT ur_result_t UR_APICALL
129-
urAdapterRetain(ur_adapter_handle_t hAdapter) {
127+
ur_result_t urAdapterRetain(ur_adapter_handle_t hAdapter) {
130128
auto Adapter = cast(hAdapter);
131129
Adapter->RefCount.retain();
132130
return UR_RESULT_SUCCESS;
133131
}
134132

135-
UR_APIEXPORT ur_result_t UR_APICALL
136-
urAdapterRelease(ur_adapter_handle_t hAdapter) {
133+
ur_result_t urAdapterRelease(ur_adapter_handle_t hAdapter) {
137134
auto Adapter = cast(hAdapter);
138135
if (Adapter->RefCount.release()) {
139136
delete Adapter;
140137
}
141138
return UR_RESULT_SUCCESS;
142139
}
143140

144-
UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetLastError(
145-
ur_adapter_handle_t, const char **ppMessage, int32_t *pError) {
141+
ur_result_t urAdapterGetLastError(ur_adapter_handle_t, const char **ppMessage,
142+
int32_t *pError) {
146143
*ppMessage = cl_adapter::ErrorMessage;
147144
*pError = cl_adapter::ErrorMessageCode;
148145

149146
return UR_RESULT_SUCCESS;
150147
}
151148

152-
UR_APIEXPORT ur_result_t UR_APICALL
153-
urAdapterGetInfo(ur_adapter_handle_t hAdapter, ur_adapter_info_t propName,
154-
size_t propSize, void *pPropValue, size_t *pPropSizeRet) {
149+
ur_result_t urAdapterGetInfo(ur_adapter_handle_t hAdapter,
150+
ur_adapter_info_t propName, size_t propSize,
151+
void *pPropValue, size_t *pPropSizeRet) {
155152
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
156153

157154
switch (propName) {
@@ -170,7 +167,7 @@ urAdapterGetInfo(ur_adapter_handle_t hAdapter, ur_adapter_info_t propName,
170167
return UR_RESULT_SUCCESS;
171168
}
172169

173-
UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallback(
170+
ur_result_t urAdapterSetLoggerCallback(
174171
ur_adapter_handle_t hAdapter, ur_logger_callback_t pfnLoggerCallback,
175172
void *pUserData, ur_logger_level_t level = UR_LOGGER_LEVEL_QUIET) {
176173

@@ -182,8 +179,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallback(
182179
return UR_RESULT_SUCCESS;
183180
}
184181

185-
UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallbackLevel(
186-
ur_adapter_handle_t hAdapter, ur_logger_level_t level) {
182+
ur_result_t urAdapterSetLoggerCallbackLevel(ur_adapter_handle_t hAdapter,
183+
ur_logger_level_t level) {
187184

188185
if (hAdapter) {
189186
auto Adapter = cast(hAdapter);

‎unified-runtime/source/adapters/opencl/async_alloc.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,31 @@
1111

1212
namespace ur::opencl {
1313

14-
UR_APIEXPORT ur_result_t urEnqueueUSMDeviceAllocExp(
14+
ur_result_t urEnqueueUSMDeviceAllocExp(
1515
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
1616
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
1717
const ur_event_handle_t *, void **, ur_event_handle_t *) {
1818
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
1919
}
2020

21-
UR_APIEXPORT ur_result_t urEnqueueUSMSharedAllocExp(
21+
ur_result_t urEnqueueUSMSharedAllocExp(
2222
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
2323
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
2424
const ur_event_handle_t *, void **, ur_event_handle_t *) {
2525
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
2626
}
2727

28-
UR_APIEXPORT ur_result_t urEnqueueUSMHostAllocExp(
29-
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
30-
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
31-
const ur_event_handle_t *, void **, ur_event_handle_t *) {
28+
ur_result_t
29+
urEnqueueUSMHostAllocExp(ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
30+
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
31+
const ur_event_handle_t *, void **,
32+
ur_event_handle_t *) {
3233
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
3334
}
3435

35-
UR_APIEXPORT ur_result_t urEnqueueUSMFreeExp(ur_queue_handle_t,
36-
ur_usm_pool_handle_t, void *,
37-
uint32_t,
38-
const ur_event_handle_t *,
39-
ur_event_handle_t *) {
36+
ur_result_t urEnqueueUSMFreeExp(ur_queue_handle_t, ur_usm_pool_handle_t, void *,
37+
uint32_t, const ur_event_handle_t *,
38+
ur_event_handle_t *) {
4039
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
4140
}
4241

‎unified-runtime/source/adapters/opencl/command_buffer.cpp‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
4040
clReleaseCommandBufferKHR(CLCommandBuffer);
4141
}
4242

43-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferCreateExp(
44-
ur_context_handle_t hContext, ur_device_handle_t hDevice,
45-
const ur_exp_command_buffer_desc_t *pCommandBufferDesc,
46-
ur_exp_command_buffer_handle_t *phCommandBuffer) {
43+
ur_result_t
44+
urCommandBufferCreateExp(ur_context_handle_t hContext,
45+
ur_device_handle_t hDevice,
46+
const ur_exp_command_buffer_desc_t *pCommandBufferDesc,
47+
ur_exp_command_buffer_handle_t *phCommandBuffer) {
4748

4849
auto Context = cast(hContext);
4950
cl_context CLContext = Context->CLContext;
@@ -112,14 +113,14 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferCreateExp(
112113
return UR_RESULT_SUCCESS;
113114
}
114115

115-
UR_APIEXPORT ur_result_t UR_APICALL
116+
ur_result_t
116117
urCommandBufferRetainExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
117118
auto CommandBuffer = cast(hCommandBuffer);
118119
CommandBuffer->RefCount.retain();
119120
return UR_RESULT_SUCCESS;
120121
}
121122

122-
UR_APIEXPORT ur_result_t UR_APICALL
123+
ur_result_t
123124
urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
124125
auto CommandBuffer = cast(hCommandBuffer);
125126
if (CommandBuffer->RefCount.release()) {
@@ -129,7 +130,7 @@ urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
129130
return UR_RESULT_SUCCESS;
130131
}
131132

132-
UR_APIEXPORT ur_result_t UR_APICALL
133+
ur_result_t
133134
urCommandBufferFinalizeExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
134135
auto CommandBuffer = cast(hCommandBuffer);
135136
UR_ASSERT(!CommandBuffer->IsFinalized, UR_RESULT_ERROR_INVALID_OPERATION);
@@ -148,8 +149,7 @@ urCommandBufferFinalizeExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
148149
return UR_RESULT_SUCCESS;
149150
}
150151

151-
UR_APIEXPORT ur_result_t UR_APICALL
152-
urCommandBufferAppendKernelLaunchWithArgsExp(
152+
ur_result_t urCommandBufferAppendKernelLaunchWithArgsExp(
153153
ur_exp_command_buffer_handle_t hCommandBuffer, ur_kernel_handle_t hKernel,
154154
uint32_t workDim, const size_t *pGlobalWorkOffset,
155155
const size_t *pGlobalWorkSize, const size_t *pLocalWorkSize,
@@ -228,7 +228,7 @@ urCommandBufferAppendKernelLaunchWithArgsExp(
228228
phCommandHandle);
229229
}
230230

231-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
231+
ur_result_t urCommandBufferAppendKernelLaunchExp(
232232
ur_exp_command_buffer_handle_t hCommandBuffer, ur_kernel_handle_t hKernel,
233233
uint32_t workDim, const size_t *pGlobalWorkOffset,
234234
const size_t *pGlobalWorkSize, const size_t *pLocalWorkSize,
@@ -299,7 +299,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
299299
return UR_RESULT_SUCCESS;
300300
}
301301

302-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
302+
ur_result_t urCommandBufferAppendUSMMemcpyExp(
303303
ur_exp_command_buffer_handle_t hCommandBuffer, void *pDst, const void *pSrc,
304304
size_t size, uint32_t numSyncPointsInWaitList,
305305
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList, uint32_t,
@@ -329,7 +329,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
329329
return UR_RESULT_SUCCESS;
330330
}
331331

332-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
332+
ur_result_t urCommandBufferAppendUSMFillExp(
333333
ur_exp_command_buffer_handle_t hCommandBuffer, void *pMemory,
334334
const void *pPattern, size_t patternSize, size_t size,
335335
uint32_t numSyncPointsInWaitList,
@@ -361,7 +361,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
361361
return UR_RESULT_SUCCESS;
362362
}
363363

364-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
364+
ur_result_t urCommandBufferAppendMemBufferCopyExp(
365365
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
366366
ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size,
367367
uint32_t numSyncPointsInWaitList,
@@ -398,7 +398,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
398398
return UR_RESULT_SUCCESS;
399399
}
400400

401-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
401+
ur_result_t urCommandBufferAppendMemBufferCopyRectExp(
402402
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
403403
[[maybe_unused]] ur_mem_handle_t hSrcMem,
404404
[[maybe_unused]] ur_mem_handle_t hDstMem,
@@ -445,8 +445,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
445445
return UR_RESULT_SUCCESS;
446446
}
447447

448-
UR_APIEXPORT
449-
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
448+
ur_result_t urCommandBufferAppendMemBufferWriteExp(
450449
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
451450
[[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset,
452451
[[maybe_unused]] size_t size, [[maybe_unused]] const void *pSrc,
@@ -461,8 +460,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
461460
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
462461
}
463462

464-
UR_APIEXPORT
465-
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
463+
ur_result_t urCommandBufferAppendMemBufferReadExp(
466464
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
467465
[[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset,
468466
[[maybe_unused]] size_t size, [[maybe_unused]] void *pDst,
@@ -477,8 +475,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
477475
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
478476
}
479477

480-
UR_APIEXPORT
481-
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
478+
ur_result_t urCommandBufferAppendMemBufferWriteRectExp(
482479
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
483480
[[maybe_unused]] ur_mem_handle_t hBuffer,
484481
[[maybe_unused]] ur_rect_offset_t bufferOffset,
@@ -499,8 +496,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
499496
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
500497
}
501498

502-
UR_APIEXPORT
503-
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
499+
ur_result_t urCommandBufferAppendMemBufferReadRectExp(
504500
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
505501
[[maybe_unused]] ur_mem_handle_t hBuffer,
506502
[[maybe_unused]] ur_rect_offset_t bufferOffset,
@@ -521,7 +517,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
521517
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
522518
}
523519

524-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
520+
ur_result_t urCommandBufferAppendMemBufferFillExp(
525521
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
526522
const void *pPattern, size_t patternSize, size_t offset, size_t size,
527523
uint32_t numSyncPointsInWaitList,
@@ -555,7 +551,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
555551
return UR_RESULT_SUCCESS;
556552
}
557553

558-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
554+
ur_result_t urCommandBufferAppendUSMPrefetchExp(
559555
ur_exp_command_buffer_handle_t hCommandBuffer, const void *mem, size_t size,
560556
ur_usm_migration_flags_t flags, uint32_t numSyncPointsInWaitList,
561557
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -578,7 +574,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
578574
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
579575
}
580576

581-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMAdviseExp(
577+
ur_result_t urCommandBufferAppendUSMAdviseExp(
582578
ur_exp_command_buffer_handle_t hCommandBuffer, const void *mem, size_t size,
583579
ur_usm_advice_flags_t advice, uint32_t numSyncPointsInWaitList,
584580
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
@@ -601,7 +597,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMAdviseExp(
601597
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
602598
}
603599

604-
UR_APIEXPORT ur_result_t UR_APICALL urEnqueueCommandBufferExp(
600+
ur_result_t urEnqueueCommandBufferExp(
605601
ur_queue_handle_t hQueue, ur_exp_command_buffer_handle_t hCommandBuffer,
606602
uint32_t numEventsInWaitList, const ur_event_handle_t *phEventWaitList,
607603
ur_event_handle_t *phEvent) {
@@ -778,7 +774,7 @@ ur_result_t validateCommandDesc(
778774
}
779775
} // end anonymous namespace
780776

781-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(
777+
ur_result_t urCommandBufferUpdateKernelLaunchExp(
782778
ur_exp_command_buffer_handle_t hCommandBuffer, uint32_t numKernelUpdates,
783779
const ur_exp_command_buffer_update_kernel_launch_desc_t
784780
*pUpdateKernelLaunch) {
@@ -876,23 +872,24 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(
876872
return UR_RESULT_SUCCESS;
877873
}
878874

879-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateSignalEventExp(
875+
ur_result_t urCommandBufferUpdateSignalEventExp(
880876
[[maybe_unused]] ur_exp_command_buffer_command_handle_t Command,
881877
[[maybe_unused]] ur_event_handle_t *Event) {
882878
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
883879
}
884880

885-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateWaitEventsExp(
881+
ur_result_t urCommandBufferUpdateWaitEventsExp(
886882
[[maybe_unused]] ur_exp_command_buffer_command_handle_t Command,
887883
[[maybe_unused]] uint32_t NumEventsInWaitList,
888884
[[maybe_unused]] const ur_event_handle_t *EventWaitList) {
889885
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
890886
}
891887

892-
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferGetInfoExp(
893-
ur_exp_command_buffer_handle_t hCommandBuffer,
894-
ur_exp_command_buffer_info_t propName, size_t propSize, void *pPropValue,
895-
size_t *pPropSizeRet) {
888+
ur_result_t
889+
urCommandBufferGetInfoExp(ur_exp_command_buffer_handle_t hCommandBuffer,
890+
ur_exp_command_buffer_info_t propName,
891+
size_t propSize, void *pPropValue,
892+
size_t *pPropSizeRet) {
896893

897894
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
898895
auto CommandBuffer = cast(hCommandBuffer);
@@ -917,8 +914,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferGetInfoExp(
917914
return UR_RESULT_ERROR_INVALID_ENUMERATION;
918915
}
919916

920-
UR_APIEXPORT
921-
ur_result_t UR_APICALL urCommandBufferAppendNativeCommandExp(
917+
ur_result_t urCommandBufferAppendNativeCommandExp(
922918
ur_exp_command_buffer_handle_t hCommandBuffer,
923919
ur_exp_command_buffer_native_command_function_t pfnNativeCommand,
924920
void *pData, ur_exp_command_buffer_handle_t,
@@ -957,7 +953,7 @@ ur_result_t UR_APICALL urCommandBufferAppendNativeCommandExp(
957953
return UR_RESULT_SUCCESS;
958954
}
959955

960-
UR_APIEXPORT ur_result_t UR_APICALL
956+
ur_result_t
961957
urCommandBufferGetNativeHandleExp(ur_exp_command_buffer_handle_t hCommandBuffer,
962958
ur_native_handle_t *phNativeCommandBuffer) {
963959
auto CommandBuffer = cast(hCommandBuffer);

0 commit comments

Comments
 (0)