Skip to content

[NATIVECPU] Fix pointer arithmetic in USMfill #1860

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

Merged
omarahmed1111 merged 3 commits into from
Aug 8, 2024
Merged

[NATIVECPU] Fix pointer arithmetic in USMfill #1860

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
385cd05
Fix pointer arithmetic in USMfill
PietroGhg Jul 8, 2024
a4510ac
Merge remote-tracking branch 'upstream/main' into pietro/fill
uwedolinsky Jul 31, 2024
8fb6824
Merge branch 'main' into pietro/fill
uwedolinsky Jul 31, 2024
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
28 changes: 17 additions & 11 deletions source/adapters/native_cpu/enqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMFill(

UR_ASSERT(ptr, UR_RESULT_ERROR_INVALID_NULL_POINTER);
UR_ASSERT(pPattern, UR_RESULT_ERROR_INVALID_NULL_POINTER);
UR_ASSERT(size % patternSize == 0 || patternSize > size,
UR_RESULT_ERROR_INVALID_SIZE);
UR_ASSERT(patternSize != 0, UR_RESULT_ERROR_INVALID_SIZE)
UR_ASSERT(size != 0, UR_RESULT_ERROR_INVALID_SIZE)
UR_ASSERT(patternSize < size, UR_RESULT_ERROR_INVALID_SIZE)
UR_ASSERT(size % patternSize == 0, UR_RESULT_ERROR_INVALID_SIZE)
// TODO: add check for allocation size once the query is supported

switch (patternSize) {
case 1:
Expand All @@ -522,33 +525,34 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMFill(
const auto pattern = *static_cast<const uint16_t *>(pPattern);
auto *start = reinterpret_cast<uint16_t *>(ptr);
auto *end =
reinterpret_cast<uint16_t *>(reinterpret_cast<uint16_t *>(ptr) + size);
reinterpret_cast<uint16_t *>(reinterpret_cast<uint8_t *>(ptr) + size);
std::fill(start, end, pattern);
break;
}
case 4: {
const auto pattern = *static_cast<const uint32_t *>(pPattern);
auto *start = reinterpret_cast<uint32_t *>(ptr);
auto *end =
reinterpret_cast<uint32_t *>(reinterpret_cast<uint32_t *>(ptr) + size);
reinterpret_cast<uint32_t *>(reinterpret_cast<uint8_t *>(ptr) + size);
std::fill(start, end, pattern);
break;
}
case 8: {
const auto pattern = *static_cast<const uint64_t *>(pPattern);
auto *start = reinterpret_cast<uint64_t *>(ptr);
auto *end =
reinterpret_cast<uint64_t *>(reinterpret_cast<uint64_t *>(ptr) + size);
reinterpret_cast<uint64_t *>(reinterpret_cast<uint8_t *>(ptr) + size);
std::fill(start, end, pattern);
break;
}
default:
for (unsigned int step{0}; step < size; ++step) {
auto *dest = reinterpret_cast<void *>(reinterpret_cast<uint8_t *>(ptr) +
step * patternSize);
default: {
for (unsigned int step{0}; step < size; step += patternSize) {
auto *dest =
reinterpret_cast<void *>(reinterpret_cast<uint8_t *>(ptr) + step);
memcpy(dest, pPattern, patternSize);
}
}
}
return UR_RESULT_SUCCESS;
}

Expand Down Expand Up @@ -583,7 +587,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMPrefetch(
std::ignore = phEventWaitList;
std::ignore = phEvent;

DIE_NO_IMPLEMENTATION;
// TODO: properly implement USM prefetch
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL
Expand All @@ -595,7 +600,8 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
std::ignore = advice;
std::ignore = phEvent;

DIE_NO_IMPLEMENTATION;
// TODO: properly implement USM advise
return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMFill2D(
Expand Down