Add bounds checking for enqueue operations to the validation layer.

This is accomplished with the various size queries for buffers, images
and USM allocations. Since not all adapters have these queries
implemented the bounds checking isn't entirely comprehensive on all
platforms just yet.

include/ur_api.h

@@ -6510,7 +6510,7 @@ urEnqueueMemUnmap(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hQueue`
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == ptr`
+///         + `NULL == pMem`
 ///         + `NULL == pPattern`
 ///     - ::UR_RESULT_ERROR_INVALID_QUEUE
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT
@@ -6530,7 +6530,7 @@ urEnqueueMemUnmap(
 UR_APIEXPORT ur_result_t UR_APICALL
 urEnqueueUSMFill(
     ur_queue_handle_t hQueue,                 ///< [in] handle of the queue object
-    void *ptr,                                ///< [in] pointer to USM memory object
+    void *pMem,                               ///< [in] pointer to USM memory object
     size_t patternSize,                       ///< [in] the size in bytes of the pattern. Must be a power of 2 and less
                                               ///< than or equal to width.
     const void *pPattern,                     ///< [in] pointer with the bytes of the pattern to set.
@@ -9246,7 +9246,7 @@ typedef struct ur_enqueue_mem_unmap_params_t {
 ///     allowing the callback the ability to modify the parameter's value
 typedef struct ur_enqueue_usm_fill_params_t {
     ur_queue_handle_t *phQueue;
-    void **pptr;
+    void **ppMem;
     size_t *ppatternSize;
     const void **ppPattern;
     size_t *psize;

scripts/core/enqueue.yml

@@ -985,7 +985,7 @@ params:
       name: hQueue
       desc: "[in] handle of the queue object"
     - type: void*
-      name: ptr
+      name: pMem
       desc: "[in] pointer to USM memory object"
     - type: size_t
       name: patternSize

scripts/templates/helper.py

@@ -1300,3 +1300,32 @@ def get_create_retain_release_functions(specs, namespace, tags):
     )
 
     return {"create": create_funcs, "retain": retain_funcs, "release": release_funcs}
+
+"""
+Public:
+    returns a dictionary with enqueue entry-points and calls to thir bounds
+    checking helper functions
+"""
+def get_bounds_check(func_name):
+    if "EnqueueMemBuffer" in func_name:
+        if "BufferCopyRect" in func_name:
+            return "boundsCheckBufferRect(hQueue, hBufferSrc, hBufferDst, region, srcOrigin, dstOrigin)"
+        if "Rect" in func_name:
+            return "boundsCheckBufferRect(hQueue, hBuffer, region, bufferOrigin)"
+        if "BufferCopy" in func_name:
+            return "boundsCheckBuffer(hQueue, hBufferSrc, hBufferDst, size, srcOffset, dstOffset)"
+        return "boundsCheckBuffer(hQueue, hBuffer, size, offset)"
+    if "EnqueueMemImage" in func_name:
+        if "Copy" in func_name:
+            return "boundsCheckImage(hQueue, hImageSrc, hImageDst, region, srcOrigin, dstOrigin)"
+        return "boundsCheckImage(hQueue, hImage, region, origin)"
+    if "EnqueueUSM" in func_name:
+        if "Memcpy2D" in func_name:
+            return "boundsCheckUSMAllocation(hQueue, pSrc, pDst, srcPitch * height, dstPitch * height)"
+        if "2D" in func_name:
+            return "boundsCheckUSMAllocation(hQueue, pMem, pitch * height)"
+        if "Memcpy" in func_name:
+            return "boundsCheckUSMAllocation(hQueue, pSrc, pDst, size, size)"
+        return "boundsCheckUSMAllocation(hQueue, pMem, size)"
+
+    return ""

scripts/templates/valddi.cpp.mako

@@ -60,6 +60,13 @@ namespace ur_validation_layer
 
             %endfor
             %endfor
+
+            <% bounds_check = th.get_bounds_check(func_name) %>
+            %if bounds_check:
+            if(auto boundsErr = ${bounds_check}; boundsErr != ${X}_RESULT_SUCCESS) {
+                return boundsErr;
+            }
+            %endif
         }
 
         ${x}_result_t result = ${th.make_pfn_name(n, tags, obj)}( ${", ".join(th.make_param_lines(n, tags, obj, format=["name"]))} );

source/adapters/hip/usm.cpp

@@ -190,9 +190,6 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
 #endif
       return ReturnValue(UR_USM_TYPE_UNKNOWN);
     }
-    case UR_USM_ALLOC_INFO_BASE_PTR:
-    case UR_USM_ALLOC_INFO_SIZE:
-      return UR_RESULT_ERROR_INVALID_VALUE;
     case UR_USM_ALLOC_INFO_DEVICE: {
       // get device index associated with this pointer
       UR_CHECK_ERROR(hipPointerGetAttributes(&hipPointerAttributeType, pMem));
@@ -222,6 +219,9 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
       }
       return ReturnValue(Pool);
     }
+    case UR_USM_ALLOC_INFO_BASE_PTR:
+    case UR_USM_ALLOC_INFO_SIZE:
+      return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
     default:
       return UR_RESULT_ERROR_INVALID_ENUMERATION;
     }

source/adapters/null/ur_nullddi.cpp

@@ -3488,7 +3488,7 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueMemUnmap(
 /// @brief Intercept function for urEnqueueUSMFill
 __urdlllocal ur_result_t UR_APICALL urEnqueueUSMFill(
     ur_queue_handle_t hQueue, ///< [in] handle of the queue object
-    void *ptr,                ///< [in] pointer to USM memory object
+    void *pMem,               ///< [in] pointer to USM memory object
     size_t
         patternSize, ///< [in] the size in bytes of the pattern. Must be a power of 2 and less
                      ///< than or equal to width.
@@ -3511,7 +3511,7 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueUSMFill(
     // if the driver has created a custom function, then call it instead of using the generic path
     auto pfnUSMFill = d_context.urDdiTable.Enqueue.pfnUSMFill;
     if (nullptr != pfnUSMFill) {
-        result = pfnUSMFill(hQueue, ptr, patternSize, pPattern, size,
+        result = pfnUSMFill(hQueue, pMem, patternSize, pPattern, size,
                             numEventsInWaitList, phEventWaitList, phEvent);
     } else {
         // generic implementation