Skip to content
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

Jump to bottom

[SYCL][Graph] Fix clang build #242

Merged
merged 1 commit into from
Jun 27, 2023
Merged

[SYCL][Graph] Fix clang build #242

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
6 changes: 3 additions & 3 deletions sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_command_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(

UR_APIEXPORT 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,
ur_mem_handle_t hBuffer, size_t offset, size_t size, const void *pSrc,
uint32_t numSyncPointsInWaitList,
const ur_exp_command_buffer_sync_point_t *pSyncPointWaitList,
ur_exp_command_buffer_sync_point_t *pSyncPoint) {

Expand All @@ -608,7 +608,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
UR_COMMAND_MEM_BUFFER_WRITE, hCommandBuffer,
ZeHandleDst + offset, // dst
pSrc, // src
size, numEventsInWaitList, pSyncPointWaitList, pSyncPoint);
size, numSyncPointsInWaitList, pSyncPointWaitList, pSyncPoint);
}

UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/memory_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
sycl::detail::ContextImplPtr Context, RT::PiExtCommandBuffer CommandBuffer,
SYCLMemObjI *SYCLMemObj, void *SrcMem, unsigned int DimSrc,
sycl::range<3> SrcSize, sycl::range<3> SrcAccessRange,
sycl::id<3> SrcOffset, unsigned int SrcElemSize, void *DstMem,
sycl::id<3> SrcOffset, unsigned int SrcElemSize, char *DstMem,
unsigned int DimDst, sycl::range<3> DstSize,
sycl::id<3> DstOffset, unsigned int DstElemSize,
std::vector<RT::PiExtSyncPoint> Deps, RT::PiExtSyncPoint *OutSyncPoint) {
Expand Down Expand Up @@ -1345,7 +1345,7 @@ void MemoryManager::ext_oneapi_copyD2H_cmd_buffer(

void MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
sycl::detail::ContextImplPtr Context, RT::PiExtCommandBuffer CommandBuffer,
SYCLMemObjI *SYCLMemObj, void *SrcMem, unsigned int DimSrc,
SYCLMemObjI *SYCLMemObj, char *SrcMem, unsigned int DimSrc,
sycl::range<3> SrcSize, sycl::id<3> SrcOffset, unsigned int SrcElemSize, void *DstMem,
unsigned int DimDst, sycl::range<3> DstSize, sycl::range<3> DstAccessRange,
sycl::id<3> DstOffset, unsigned int DstElemSize,
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/memory_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ class __SYCL_EXPORT MemoryManager {
RT::PiExtCommandBuffer CommandBuffer, SYCLMemObjI *SYCLMemObj,
void *SrcMem, unsigned int DimSrc, sycl::range<3> SrcSize,
sycl::range<3> SrcAccessRange, sycl::id<3> SrcOffset,
unsigned int SrcElemSize, void *DstMem, unsigned int DimDst,
unsigned int SrcElemSize, char *DstMem, unsigned int DimDst,
sycl::range<3> DstSize, sycl::id<3> DstOffset, unsigned int DstElemSize,
std::vector<RT::PiExtSyncPoint> Deps, RT::PiExtSyncPoint *OutSyncPoint);

static void ext_oneapi_copyH2D_cmd_buffer(
sycl::detail::ContextImplPtr Context,
RT::PiExtCommandBuffer CommandBuffer, SYCLMemObjI *SYCLMemObj,
void *SrcMem, unsigned int DimSrc, sycl::range<3> SrcSize,
char *SrcMem, unsigned int DimSrc, sycl::range<3> SrcSize,
sycl::id<3> SrcOffset, unsigned int SrcElemSize, void *DstMem, unsigned int DimDst,
sycl::range<3> DstSize, sycl::range<3> DstAccessRange,
sycl::id<3> DstOffset, unsigned int DstElemSize,
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2639,7 +2639,7 @@ pi_int32 ExecCGCommand::enqueueImpCommandBuffer() {
MemoryManager::ext_oneapi_copyD2H_cmd_buffer(
MQueue->getContextImplPtr(), MCommandBuffer, AllocaCmd->getSYCLMemObj(),
AllocaCmd->getMemAllocation(), Req->MDims, Req->MMemoryRange,
Req->MAccessRange, Req->MOffset, Req->MElemSize, Copy->getDst(),
Req->MAccessRange, Req->MOffset, Req->MElemSize, (char *)Copy->getDst(),
Req->MDims, Req->MAccessRange,
/*DstOffset=*/ {0, 0, 0}, Req->MElemSize, std::move(MSyncPointDeps),
&OutSyncPoint);
Expand All @@ -2653,7 +2653,7 @@ pi_int32 ExecCGCommand::enqueueImpCommandBuffer() {

MemoryManager::ext_oneapi_copyH2D_cmd_buffer(
MQueue->getContextImplPtr(), MCommandBuffer, AllocaCmd->getSYCLMemObj(),
Copy->getSrc(), Req->MDims, Req->MAccessRange,
(char *)Copy->getSrc(), Req->MDims, Req->MAccessRange,
/*SrcOffset*/ {0, 0, 0}, Req->MElemSize, AllocaCmd->getMemAllocation(),
Req->MDims, Req->MMemoryRange, Req->MAccessRange, Req->MOffset,
Req->MElemSize, std::move(MSyncPointDeps), &OutSyncPoint);
Expand Down