Skip to content

[UR] Check for memory alignment before calling clEnqueueMemFillINTEL_fn in OpenCL #18423

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
merged 3 commits into from
May 23, 2025
Merged

[UR] Check for memory alignment before calling clEnqueueMemFillINTEL_fn in OpenCL #18423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbca6c4
Check for memory alignment before calling clEnqueueMemFillINTEL_fn in…
martygrant May 12, 2025
9455b95
Re-enable fill_any_size.cpp test for OpenCL.
martygrant May 14, 2025
4aa4f89
Rename checkUSMImplAlignment to isPointerAlignedTo. Change func to ta…
martygrant May 21, 2025
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
2 changes: 0 additions & 2 deletions sycl/test-e2e/USM/fill_any_size.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// RUN: %{build} -o %t1.out
// RUN: %{run} %t1.out
// clang-format off
// UNSUPPORTED: opencl
// UNSUPPORTED-TRACKER: https://github.com/oneapi-src/unified-runtime/issues/2440
// clang-format on

/**
Expand Down
11 changes: 3 additions & 8 deletions unified-runtime/source/adapters/hip/usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ ur_result_t USMDeviceAllocImpl(void **ResultPtr, ur_context_handle_t,
return Err;
}

assert(checkUSMImplAlignment(Alignment, ResultPtr));
assert(isPointerAlignedTo(Alignment, *ResultPtr));
return UR_RESULT_SUCCESS;
}

Expand All @@ -160,7 +160,7 @@ ur_result_t USMSharedAllocImpl(void **ResultPtr, ur_context_handle_t,
return Err;
}

assert(checkUSMImplAlignment(Alignment, ResultPtr));
assert(isPointerAlignedTo(Alignment, *ResultPtr));
return UR_RESULT_SUCCESS;
}

Expand All @@ -174,7 +174,7 @@ ur_result_t USMHostAllocImpl(void **ResultPtr,
return Err;
}

assert(checkUSMImplAlignment(Alignment, ResultPtr));
assert(isPointerAlignedTo(Alignment, *ResultPtr));
return UR_RESULT_SUCCESS;
}

Expand Down Expand Up @@ -485,11 +485,6 @@ bool checkUSMAlignment(uint32_t &alignment, const ur_usm_desc_t *pUSMDesc) {
(alignment == 0 || ((alignment & (alignment - 1)) == 0)));
}

bool checkUSMImplAlignment(uint32_t Alignment, void **ResultPtr) {
return Alignment == 0 ||
reinterpret_cast<std::uintptr_t>(*ResultPtr) % Alignment == 0;
}

UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreateExp(ur_context_handle_t,
ur_device_handle_t,
ur_usm_pool_desc_t *,
Expand Down
2 changes: 0 additions & 2 deletions unified-runtime/source/adapters/hip/usm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,3 @@ ur_result_t USMHostAllocImpl(void **ResultPtr, ur_context_handle_t Context,
uint32_t Alignment);

bool checkUSMAlignment(uint32_t &alignment, const ur_usm_desc_t *pUSMDesc);

bool checkUSMImplAlignment(uint32_t Alignment, void **ResultPtr);
3 changes: 2 additions & 1 deletion unified-runtime/source/adapters/opencl/usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMFill(
// Have to look up the context from the kernel
cl_context CLContext = hQueue->Context->CLContext;

if (patternSize <= 128 && isPowerOf2(patternSize)) {
if (patternSize <= 128 && isPowerOf2(patternSize) &&
isPointerAlignedTo(patternSize, ptr)) {
clEnqueueMemFillINTEL_fn EnqueueMemFill = nullptr;
UR_RETURN_ON_FAILURE(
cl_ext::getExtFuncFromContext<clEnqueueMemFillINTEL_fn>(
Expand Down
5 changes: 5 additions & 0 deletions unified-runtime/source/common/ur_util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,4 +548,9 @@ static inline std::string groupDigits(Numeric numeric) {

template <typename T> Spinlock<Rc<T>> AtomicSingleton<T>::instance;

inline bool isPointerAlignedTo(uint32_t Alignment, void *Ptr) {
return Alignment == 0 ||
reinterpret_cast<std::uintptr_t>(Ptr) % Alignment == 0;
}

#endif /* UR_UTIL_H */