Check for memory alignment before calling clEnqueueMemFillINTEL_fn in OpenCL. Use checkUSMImplAlignment from the Hip adapter for this but moved it to a common header.

Author: martygrant

unified-runtime/source/adapters/hip/usm.cpp

@@ -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 *,

unified-runtime/source/adapters/hip/usm.hpp

@@ -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);

unified-runtime/source/adapters/opencl/usm.cpp

@@ -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) &&
+      checkUSMImplAlignment(patternSize, &ptr)) {
     clEnqueueMemFillINTEL_fn EnqueueMemFill = nullptr;
     UR_RETURN_ON_FAILURE(
         cl_ext::getExtFuncFromContext<clEnqueueMemFillINTEL_fn>(

unified-runtime/source/common/ur_util.hpp

@@ -548,4 +548,9 @@ static inline std::string groupDigits(Numeric numeric) {
 
 template <typename T> Spinlock<Rc<T>> AtomicSingleton<T>::instance;
 
+inline bool checkUSMImplAlignment(uint32_t Alignment, void **ResultPtr) {
+  return Alignment == 0 ||
+         reinterpret_cast<std::uintptr_t>(*ResultPtr) % Alignment == 0;
+}
+
 #endif /* UR_UTIL_H */