Skip to content

Commit

Permalink
Add more merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
omarahmed1111 committed Nov 10, 2023
1 parent 65bfeab commit 19e8d43
Show file tree
Hide file tree
Showing 30 changed files with 119 additions and 172 deletions.
6 changes: 3 additions & 3 deletions examples/codegen/codegen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ constexpr unsigned PAGE_SIZE = 4096;

void ur_check(const ur_result_t r) {
if (r != UR_RESULT_SUCCESS) {
urTearDown(nullptr);
urLoaderTearDown();
throw std::runtime_error("Unified runtime error: " + std::to_string(r));
}
}
Expand Down Expand Up @@ -95,7 +95,7 @@ template <typename T, size_t N> struct alignas(PAGE_SIZE) AlignedArray {

int main() {
ur_loader_config_handle_t loader_config = nullptr;
ur_check(urInit(UR_DEVICE_INIT_FLAG_GPU, loader_config));
ur_check(urLoaderInit(UR_DEVICE_INIT_FLAG_GPU, loader_config));

auto adapters = get_adapters();
auto supported_adapters = get_supported_adapters(adapters);
Expand Down Expand Up @@ -172,5 +172,5 @@ int main() {
std::cout << "Results are incorrect." << std::endl;
}

return urTearDown(nullptr) == UR_RESULT_SUCCESS && expectedResult ? 0 : 1;
return urLoaderTearDown() == UR_RESULT_SUCCESS && expectedResult ? 0 : 1;
}
9 changes: 0 additions & 9 deletions source/adapters/cuda/adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ struct ur_adapter_handle_t_ {

ur_adapter_handle_t_ adapter{};

UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
ur_loader_config_handle_t) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
urAdapterGet(uint32_t NumEntries, ur_adapter_handle_t *phAdapters,
uint32_t *pNumAdapters) {
Expand Down
14 changes: 7 additions & 7 deletions source/adapters/cuda/command_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
return Result;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
UR_APIEXPORT ur_result_t UR_APICALL 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,
Expand Down Expand Up @@ -270,7 +270,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
return Result;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
UR_APIEXPORT ur_result_t UR_APICALL 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 @@ -314,7 +314,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
return Result;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hSrcMem,
ur_mem_handle_t hDstMem, ur_rect_offset_t srcOrigin,
ur_rect_offset_t dstOrigin, ur_rect_region_t region, size_t srcRowPitch,
Expand Down Expand Up @@ -356,7 +356,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
size_t offset, size_t size, const void *pSrc,
uint32_t numSyncPointsInWaitList,
Expand Down Expand Up @@ -394,7 +394,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
size_t offset, size_t size, void *pDst, uint32_t numSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
Expand Down Expand Up @@ -431,7 +431,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
Expand Down Expand Up @@ -473,7 +473,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
ur_exp_command_buffer_handle_t hCommandBuffer, ur_mem_handle_t hBuffer,
ur_rect_offset_t bufferOffset, ur_rect_offset_t hostOffset,
ur_rect_region_t region, size_t bufferRowPitch, size_t bufferSlicePitch,
Expand Down
2 changes: 1 addition & 1 deletion source/adapters/cuda/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void detail::ur::assertion(bool Condition, const char *Message) {
}

void detail::ur::cuPrint(const char *Message) {
std::fprintf(stderr, "ur_print: %s\n", Message);
std::cerr << "ur_print: " << Message << std::endl;
}

// Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR
Expand Down
24 changes: 11 additions & 13 deletions source/adapters/cuda/ur_interface_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
if (UR_RESULT_SUCCESS != result) {
return result;
}
pDdiTable->pfnInit = urInit;
pDdiTable->pfnTearDown = urTearDown;
pDdiTable->pfnAdapterGet = urAdapterGet;
pDdiTable->pfnAdapterRelease = urAdapterRelease;
pDdiTable->pfnAdapterRetain = urAdapterRetain;
Expand Down Expand Up @@ -280,17 +278,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
pDdiTable->pfnAppendMembufferCopyRectExp =
urCommandBufferAppendMembufferCopyRectExp;
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
pDdiTable->pfnAppendMembufferReadRectExp =
urCommandBufferAppendMembufferReadRectExp;
pDdiTable->pfnAppendMembufferWriteExp =
urCommandBufferAppendMembufferWriteExp;
pDdiTable->pfnAppendMembufferWriteRectExp =
urCommandBufferAppendMembufferWriteRectExp;
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
pDdiTable->pfnAppendMemBufferCopyRectExp =
urCommandBufferAppendMemBufferCopyRectExp;
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
pDdiTable->pfnAppendMemBufferReadRectExp =
urCommandBufferAppendMemBufferReadRectExp;
pDdiTable->pfnAppendMemBufferWriteExp =
urCommandBufferAppendMemBufferWriteExp;
pDdiTable->pfnAppendMemBufferWriteRectExp =
urCommandBufferAppendMemBufferWriteRectExp;
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;

return retVal;
Expand Down
9 changes: 0 additions & 9 deletions source/adapters/hip/adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ struct ur_adapter_handle_t_ {

ur_adapter_handle_t_ adapter{};

UR_APIEXPORT ur_result_t UR_APICALL urInit(ur_device_init_flags_t,
ur_loader_config_handle_t) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urTearDown(void *) {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
uint32_t, ur_adapter_handle_t *phAdapters, uint32_t *pNumAdapters) {
if (phAdapters) {
Expand Down
14 changes: 7 additions & 7 deletions source/adapters/hip/command_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
ur_exp_command_buffer_handle_t, void *, const void *, size_t, uint32_t,
const ur_exp_command_buffer_sync_point_t *,
ur_exp_command_buffer_sync_point_t *) {
Expand All @@ -61,7 +61,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t, size_t,
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
ur_exp_command_buffer_sync_point_t *) {
Expand All @@ -70,7 +70,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_mem_handle_t,
ur_rect_offset_t, ur_rect_offset_t, ur_rect_region_t, size_t, size_t,
size_t, size_t, uint32_t, const ur_exp_command_buffer_sync_point_t *,
Expand All @@ -81,7 +81,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t,
const void *, uint32_t, const ur_exp_command_buffer_sync_point_t *,
ur_exp_command_buffer_sync_point_t *) {
Expand All @@ -91,7 +91,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, size_t, size_t, void *,
uint32_t, const ur_exp_command_buffer_sync_point_t *,
ur_exp_command_buffer_sync_point_t *) {
Expand All @@ -101,7 +101,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
uint32_t, const ur_exp_command_buffer_sync_point_t *,
Expand All @@ -112,7 +112,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
}

UR_APIEXPORT
ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
ur_exp_command_buffer_handle_t, ur_mem_handle_t, ur_rect_offset_t,
ur_rect_offset_t, ur_rect_region_t, size_t, size_t, size_t, size_t, void *,
uint32_t, const ur_exp_command_buffer_sync_point_t *,
Expand Down
25 changes: 11 additions & 14 deletions source/adapters/hip/ur_interface_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetGlobalProcAddrTable(
if (UR_RESULT_SUCCESS != result) {
return result;
}

pDdiTable->pfnInit = urInit;
pDdiTable->pfnTearDown = urTearDown;
pDdiTable->pfnAdapterGet = urAdapterGet;
pDdiTable->pfnAdapterGetInfo = urAdapterGetInfo;
pDdiTable->pfnAdapterGetLastError = urAdapterGetLastError;
Expand Down Expand Up @@ -278,17 +275,17 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetCommandBufferExpProcAddrTable(
pDdiTable->pfnReleaseExp = urCommandBufferReleaseExp;
pDdiTable->pfnFinalizeExp = urCommandBufferFinalizeExp;
pDdiTable->pfnAppendKernelLaunchExp = urCommandBufferAppendKernelLaunchExp;
pDdiTable->pfnAppendMemcpyUSMExp = urCommandBufferAppendMemcpyUSMExp;
pDdiTable->pfnAppendMembufferCopyExp = urCommandBufferAppendMembufferCopyExp;
pDdiTable->pfnAppendMembufferCopyRectExp =
urCommandBufferAppendMembufferCopyRectExp;
pDdiTable->pfnAppendMembufferReadExp = urCommandBufferAppendMembufferReadExp;
pDdiTable->pfnAppendMembufferReadRectExp =
urCommandBufferAppendMembufferReadRectExp;
pDdiTable->pfnAppendMembufferWriteExp =
urCommandBufferAppendMembufferWriteExp;
pDdiTable->pfnAppendMembufferWriteRectExp =
urCommandBufferAppendMembufferWriteRectExp;
pDdiTable->pfnAppendUSMMemcpyExp = urCommandBufferAppendUSMMemcpyExp;
pDdiTable->pfnAppendMemBufferCopyExp = urCommandBufferAppendMemBufferCopyExp;
pDdiTable->pfnAppendMemBufferCopyRectExp =
urCommandBufferAppendMemBufferCopyRectExp;
pDdiTable->pfnAppendMemBufferReadExp = urCommandBufferAppendMemBufferReadExp;
pDdiTable->pfnAppendMemBufferReadRectExp =
urCommandBufferAppendMemBufferReadRectExp;
pDdiTable->pfnAppendMemBufferWriteExp =
urCommandBufferAppendMemBufferWriteExp;
pDdiTable->pfnAppendMemBufferWriteRectExp =
urCommandBufferAppendMemBufferWriteRectExp;
pDdiTable->pfnEnqueueExp = urCommandBufferEnqueueExp;

return retVal;
Expand Down
18 changes: 0 additions & 18 deletions source/adapters/level_zero/adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@

ur_adapter_handle_t_ Adapter{};

UR_APIEXPORT ur_result_t UR_APICALL
urInit(ur_device_init_flags_t
DeviceFlags, ///< [in] device initialization flags.
///< must be 0 (default) or a combination of
///< ::ur_device_init_flag_t.
ur_loader_config_handle_t) {
std::ignore = DeviceFlags;

return UR_RESULT_SUCCESS;
}

ur_result_t adapterStateTeardown() {
// reclaim ur_platform_handle_t objects here since we don't have
// urPlatformRelease.
Expand Down Expand Up @@ -122,13 +111,6 @@ ur_result_t adapterStateTeardown() {
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urTearDown(
void *Params ///< [in] pointer to tear down parameters
) {
std::ignore = Params;
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urAdapterGet(
uint32_t NumEntries, ///< [in] the number of platforms to be added to
///< phAdapters. If phAdapters is not NULL, then
Expand Down
14 changes: 7 additions & 7 deletions source/adapters/level_zero/command_buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
ur_exp_command_buffer_handle_t CommandBuffer, void *Dst, const void *Src,
size_t Size, uint32_t NumSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *SyncPointWaitList,
Expand All @@ -555,7 +555,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemcpyUSMExp(
NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem,
ur_mem_handle_t DstMem, size_t SrcOffset, size_t DstOffset, size_t Size,
uint32_t NumSyncPointsInWaitList,
Expand All @@ -581,7 +581,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferCopyRectExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t SrcMem,
ur_mem_handle_t DstMem, ur_rect_offset_t SrcOrigin,
ur_rect_offset_t DstOrigin, ur_rect_region_t Region, size_t SrcRowPitch,
Expand Down Expand Up @@ -609,7 +609,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
DstSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
size_t Offset, size_t Size, const void *Src,
uint32_t NumSyncPointsInWaitList,
Expand All @@ -628,7 +628,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferWriteRectExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset,
ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch,
Expand All @@ -648,7 +648,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
BufferSlicePitch, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
size_t Offset, size_t Size, void *Dst, uint32_t NumSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *SyncPointWaitList,
Expand All @@ -663,7 +663,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
Size, NumSyncPointsInWaitList, SyncPointWaitList, SyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMemBufferReadRectExp(
ur_exp_command_buffer_handle_t CommandBuffer, ur_mem_handle_t Buffer,
ur_rect_offset_t BufferOffset, ur_rect_offset_t HostOffset,
ur_rect_region_t Region, size_t BufferRowPitch, size_t BufferSlicePitch,
Expand Down
Loading

0 comments on commit 19e8d43

Please sign in to comment.