Skip to content

[UR][OpenCL] Strip UR_API macros from functions exported via ddi tables #22598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kswiecicki wants to merge 1 commit into
base: sycl
Choose a base branch
from
Open

[UR][OpenCL] Strip UR_API macros from functions exported via ddi tables #22598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions unified-runtime/source/adapters/opencl/adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@ ur_adapter_handle_t ur::cl::getAdapter() {

namespace ur::opencl {

UR_APIEXPORT ur_result_t UR_APICALL
urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
uint32_t *pNumAdapters) {
ur_result_t urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
uint32_t *pNumAdapters) {
static std::mutex AdapterConstructionMutex{};

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

UR_APIEXPORT ur_result_t UR_APICALL
urAdapterRetain(ur_adapter_handle_t hAdapter) {
ur_result_t urAdapterRetain(ur_adapter_handle_t hAdapter) {
auto Adapter = cast(hAdapter);
Adapter->RefCount.retain();
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
urAdapterRelease(ur_adapter_handle_t hAdapter) {
ur_result_t urAdapterRelease(ur_adapter_handle_t hAdapter) {
auto Adapter = cast(hAdapter);
if (Adapter->RefCount.release()) {
delete Adapter;
}
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetLastError(
ur_adapter_handle_t, const char **ppMessage, int32_t *pError) {
ur_result_t urAdapterGetLastError(ur_adapter_handle_t, const char **ppMessage,
int32_t *pError) {
*ppMessage = cl_adapter::ErrorMessage;
*pError = cl_adapter::ErrorMessageCode;

return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
urAdapterGetInfo(ur_adapter_handle_t hAdapter, ur_adapter_info_t propName,
size_t propSize, void *pPropValue, size_t *pPropSizeRet) {
ur_result_t urAdapterGetInfo(ur_adapter_handle_t hAdapter,
ur_adapter_info_t propName, size_t propSize,
void *pPropValue, size_t *pPropSizeRet) {
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);

switch (propName) {
Expand All @@ -170,7 +167,7 @@ urAdapterGetInfo(ur_adapter_handle_t hAdapter, ur_adapter_info_t propName,
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallback(
ur_result_t urAdapterSetLoggerCallback(
ur_adapter_handle_t hAdapter, ur_logger_callback_t pfnLoggerCallback,
void *pUserData, ur_logger_level_t level = UR_LOGGER_LEVEL_QUIET) {

Expand All @@ -182,8 +179,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallback(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urAdapterSetLoggerCallbackLevel(
ur_adapter_handle_t hAdapter, ur_logger_level_t level) {
ur_result_t urAdapterSetLoggerCallbackLevel(ur_adapter_handle_t hAdapter,
ur_logger_level_t level) {

if (hAdapter) {
auto Adapter = cast(hAdapter);
Expand Down
21 changes: 10 additions & 11 deletions unified-runtime/source/adapters/opencl/async_alloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,31 @@

namespace ur::opencl {

UR_APIEXPORT ur_result_t urEnqueueUSMDeviceAllocExp(
ur_result_t urEnqueueUSMDeviceAllocExp(
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
const ur_event_handle_t *, void **, ur_event_handle_t *) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t urEnqueueUSMSharedAllocExp(
ur_result_t urEnqueueUSMSharedAllocExp(
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
const ur_event_handle_t *, void **, ur_event_handle_t *) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t urEnqueueUSMHostAllocExp(
ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
const ur_event_handle_t *, void **, ur_event_handle_t *) {
ur_result_t
urEnqueueUSMHostAllocExp(ur_queue_handle_t, ur_usm_pool_handle_t, const size_t,
const ur_exp_async_usm_alloc_properties_t *, uint32_t,
const ur_event_handle_t *, void **,
ur_event_handle_t *) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t urEnqueueUSMFreeExp(ur_queue_handle_t,
ur_usm_pool_handle_t, void *,
uint32_t,
const ur_event_handle_t *,
ur_event_handle_t *) {
ur_result_t urEnqueueUSMFreeExp(ur_queue_handle_t, ur_usm_pool_handle_t, void *,
uint32_t, const ur_event_handle_t *,
ur_event_handle_t *) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

Expand Down
68 changes: 32 additions & 36 deletions unified-runtime/source/adapters/opencl/command_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ ur_exp_command_buffer_handle_t_::~ur_exp_command_buffer_handle_t_() {
clReleaseCommandBufferKHR(CLCommandBuffer);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferCreateExp(
ur_context_handle_t hContext, ur_device_handle_t hDevice,
const ur_exp_command_buffer_desc_t *pCommandBufferDesc,
ur_exp_command_buffer_handle_t *phCommandBuffer) {
ur_result_t
urCommandBufferCreateExp(ur_context_handle_t hContext,
ur_device_handle_t hDevice,
const ur_exp_command_buffer_desc_t *pCommandBufferDesc,
ur_exp_command_buffer_handle_t *phCommandBuffer) {

auto Context = cast(hContext);
cl_context CLContext = Context->CLContext;
Expand Down Expand Up @@ -112,14 +113,14 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferCreateExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
ur_result_t
urCommandBufferRetainExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
auto CommandBuffer = cast(hCommandBuffer);
CommandBuffer->RefCount.retain();
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
ur_result_t
urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
auto CommandBuffer = cast(hCommandBuffer);
if (CommandBuffer->RefCount.release()) {
Expand All @@ -129,7 +130,7 @@ urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
ur_result_t
urCommandBufferFinalizeExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
auto CommandBuffer = cast(hCommandBuffer);
UR_ASSERT(!CommandBuffer->IsFinalized, UR_RESULT_ERROR_INVALID_OPERATION);
Expand All @@ -148,8 +149,7 @@ urCommandBufferFinalizeExp(ur_exp_command_buffer_handle_t hCommandBuffer) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
urCommandBufferAppendKernelLaunchWithArgsExp(
ur_result_t urCommandBufferAppendKernelLaunchWithArgsExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_kernel_handle_t hKernel,
uint32_t workDim, const size_t *pGlobalWorkOffset,
const size_t *pGlobalWorkSize, const size_t *pLocalWorkSize,
Expand Down Expand Up @@ -228,7 +228,7 @@ urCommandBufferAppendKernelLaunchWithArgsExp(
phCommandHandle);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
ur_result_t urCommandBufferAppendKernelLaunchExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_kernel_handle_t hKernel,
uint32_t workDim, const size_t *pGlobalWorkOffset,
const size_t *pGlobalWorkSize, const size_t *pLocalWorkSize,
Expand Down Expand Up @@ -299,7 +299,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
ur_result_t urCommandBufferAppendUSMMemcpyExp(
ur_exp_command_buffer_handle_t hCommandBuffer, void *pDst, const void *pSrc,
size_t size, uint32_t numSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList, uint32_t,
Expand Down Expand Up @@ -329,7 +329,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
ur_result_t urCommandBufferAppendUSMFillExp(
ur_exp_command_buffer_handle_t hCommandBuffer, void *pMemory,
const void *pPattern, size_t patternSize, size_t size,
uint32_t numSyncPointsInWaitList,
Expand Down Expand Up @@ -361,7 +361,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
ur_result_t urCommandBufferAppendMemBufferCopyExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
ur_mem_handle_t hDstMem, size_t srcOffset, size_t dstOffset, size_t size,
uint32_t numSyncPointsInWaitList,
Expand Down Expand Up @@ -398,7 +398,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
ur_result_t urCommandBufferAppendMemBufferCopyRectExp(
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
[[maybe_unused]] ur_mem_handle_t hSrcMem,
[[maybe_unused]] ur_mem_handle_t hDstMem,
Expand Down Expand Up @@ -445,8 +445,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
ur_result_t urCommandBufferAppendMemBufferWriteExp(
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
[[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset,
[[maybe_unused]] size_t size, [[maybe_unused]] const void *pSrc,
Expand All @@ -461,8 +460,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
ur_result_t urCommandBufferAppendMemBufferReadExp(
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
[[maybe_unused]] ur_mem_handle_t hBuffer, [[maybe_unused]] size_t offset,
[[maybe_unused]] size_t size, [[maybe_unused]] void *pDst,
Expand All @@ -477,8 +475,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
ur_result_t urCommandBufferAppendMemBufferWriteRectExp(
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
[[maybe_unused]] ur_mem_handle_t hBuffer,
[[maybe_unused]] ur_rect_offset_t bufferOffset,
Expand All @@ -499,8 +496,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
ur_result_t urCommandBufferAppendMemBufferReadRectExp(
[[maybe_unused]] ur_exp_command_buffer_handle_t hCommandBuffer,
[[maybe_unused]] ur_mem_handle_t hBuffer,
[[maybe_unused]] ur_rect_offset_t bufferOffset,
Expand All @@ -521,7 +517,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
ur_result_t urCommandBufferAppendMemBufferFillExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
const void *pPattern, size_t patternSize, size_t offset, size_t size,
uint32_t numSyncPointsInWaitList,
Expand Down Expand Up @@ -555,7 +551,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferFillExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
ur_result_t urCommandBufferAppendUSMPrefetchExp(
ur_exp_command_buffer_handle_t hCommandBuffer, const void *mem, size_t size,
ur_usm_migration_flags_t flags, uint32_t numSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
Expand All @@ -578,7 +574,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMPrefetchExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMAdviseExp(
ur_result_t urCommandBufferAppendUSMAdviseExp(
ur_exp_command_buffer_handle_t hCommandBuffer, const void *mem, size_t size,
ur_usm_advice_flags_t advice, uint32_t numSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
Expand All @@ -601,7 +597,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMAdviseExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urEnqueueCommandBufferExp(
ur_result_t urEnqueueCommandBufferExp(
ur_queue_handle_t hQueue, ur_exp_command_buffer_handle_t hCommandBuffer,
uint32_t numEventsInWaitList, const ur_event_handle_t *phEventWaitList,
ur_event_handle_t *phEvent) {
Expand Down Expand Up @@ -778,7 +774,7 @@ ur_result_t validateCommandDesc(
}
} // end anonymous namespace

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(
ur_result_t urCommandBufferUpdateKernelLaunchExp(
ur_exp_command_buffer_handle_t hCommandBuffer, uint32_t numKernelUpdates,
const ur_exp_command_buffer_update_kernel_launch_desc_t
*pUpdateKernelLaunch) {
Expand Down Expand Up @@ -876,23 +872,24 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateKernelLaunchExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateSignalEventExp(
ur_result_t urCommandBufferUpdateSignalEventExp(
[[maybe_unused]] ur_exp_command_buffer_command_handle_t Command,
[[maybe_unused]] ur_event_handle_t *Event) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferUpdateWaitEventsExp(
ur_result_t urCommandBufferUpdateWaitEventsExp(
[[maybe_unused]] ur_exp_command_buffer_command_handle_t Command,
[[maybe_unused]] uint32_t NumEventsInWaitList,
[[maybe_unused]] const ur_event_handle_t *EventWaitList) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferGetInfoExp(
ur_exp_command_buffer_handle_t hCommandBuffer,
ur_exp_command_buffer_info_t propName, size_t propSize, void *pPropValue,
size_t *pPropSizeRet) {
ur_result_t
urCommandBufferGetInfoExp(ur_exp_command_buffer_handle_t hCommandBuffer,
ur_exp_command_buffer_info_t propName,
size_t propSize, void *pPropValue,
size_t *pPropSizeRet) {

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

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendNativeCommandExp(
ur_result_t urCommandBufferAppendNativeCommandExp(
ur_exp_command_buffer_handle_t hCommandBuffer,
ur_exp_command_buffer_native_command_function_t pfnNativeCommand,
void *pData, ur_exp_command_buffer_handle_t,
Expand Down Expand Up @@ -957,7 +953,7 @@ ur_result_t UR_APICALL urCommandBufferAppendNativeCommandExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
ur_result_t
urCommandBufferGetNativeHandleExp(ur_exp_command_buffer_handle_t hCommandBuffer,
ur_native_handle_t *phNativeCommandBuffer) {
auto CommandBuffer = cast(hCommandBuffer);
Expand Down
Loading
Loading