add support for clEnqueueSVMMemcpyWithPropertiesKHR

Author: bashbaug

layers/99_svmplusplus/emulate.cpp

@@ -962,6 +962,31 @@ cl_int CL_API_CALL clGetSVMPointerInfoKHR_EMU(
     return CL_INVALID_VALUE;
 }
 
+cl_int CL_API_CALL clEnqueueSVMMemcpyWithPropertiesKHR_EMU(
+    cl_command_queue command_queue,
+    cl_svm_copy_properties_khr* properties,
+    cl_bool blocking_copy,
+    void* dst_ptr,
+    const void* src_ptr,
+    size_t size,
+    cl_uint num_events_in_wait_list,
+    const cl_event* event_wait_list,
+    cl_event* event)
+{
+    if (properties != nullptr && properties[0] != 0) {
+        return CL_INVALID_PROPERTY;
+    }
+    return clEnqueueSVMMemcpy_override(
+        command_queue,
+        blocking_copy,
+        dst_ptr,
+        src_ptr,
+        size,
+        num_events_in_wait_list,
+        event_wait_list,
+        event);
+}
+
 cl_int CL_API_CALL clGetDeviceInfo_override(
     cl_device_id device,
     cl_device_info param_name,

layers/99_svmplusplus/emulate.h

@@ -39,6 +39,17 @@ cl_int CL_API_CALL clGetSVMPointerInfoKHR_EMU(
     void* param_value,
     size_t* param_value_size_ret);
 
+cl_int CL_API_CALL clEnqueueSVMMemcpyWithPropertiesKHR_EMU(
+    cl_command_queue command_queue,
+    cl_svm_copy_properties_khr* properties,
+    cl_bool blocking_copy,
+    void* dst_ptr,
+    const void* src_ptr,
+    size_t size,
+    cl_uint num_events_in_wait_list,
+    const cl_event* event_wait_list,
+    cl_event* event);
+
 cl_int CL_API_CALL clGetDeviceInfo_override(
     cl_device_id device,
     cl_device_info param_name,

layers/99_svmplusplus/main.cpp

@@ -43,6 +43,7 @@ clGetExtensionFunctionAddressForPlatform_override(
     CHECK_RETURN_EXTENSION_FUNCTION( clSVMFreeWithPropertiesKHR );
     CHECK_RETURN_EXTENSION_FUNCTION( clGetSVMSuggestedTypeIndexKHR );
     CHECK_RETURN_EXTENSION_FUNCTION( clGetSVMPointerInfoKHR );
+    CHECK_RETURN_EXTENSION_FUNCTION( clEnqueueSVMMemcpyWithPropertiesKHR );
 
     return g_pNextDispatch->clGetExtensionFunctionAddressForPlatform(
         platform,

samples/usvm/00_usvmqueries/main.cpp

@@ -47,11 +47,13 @@ void PrintUSVMCaps(
     const char* prefix,
     cl_svm_capabilities_khr svmcaps )
 {
-    printf("%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+    printf("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
         prefix,
         ( svmcaps & CL_SVM_CAPABILITY_SINGLE_ADDRESS_SPACE_KHR     ) ? "\n\t\t\tCL_SVM_CAPABILITY_SINGLE_ADDRESS_SPACE_KHR"      : "",
         ( svmcaps & CL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR         ) ? "\n\t\t\tCL_SVM_CAPABILITY_SYSTEM_ALLOCATED_KHR"          : "",
         ( svmcaps & CL_SVM_CAPABILITY_DEVICE_OWNED_KHR             ) ? "\n\t\t\tCL_SVM_CAPABILITY_DEVICE_OWNED_KHR"              : "",
+        ( svmcaps & CL_SVM_CAPABILITY_DEVICE_UNASSOCIATED_KHR      ) ? "\n\t\t\tCL_SVM_CAPABILITY_DEVICE_UNASSOCIATED_KHR"       : "",
+        ( svmcaps & CL_SVM_CAPABILITY_CONTEXT_ACCESS_KHR           ) ? "\n\t\t\tCL_SVM_CAPABILITY_CONTEXT_ACCESS_KHR"            : "",
         ( svmcaps & CL_SVM_CAPABILITY_HOST_OWNED_KHR               ) ? "\n\t\t\tCL_SVM_CAPABILITY_HOST_OWNED_KHR"                : "",
         ( svmcaps & CL_SVM_CAPABILITY_HOST_READ_KHR                ) ? "\n\t\t\tCL_SVM_CAPABILITY_HOST_READ_KHR"                 : "",
         ( svmcaps & CL_SVM_CAPABILITY_HOST_WRITE_KHR               ) ? "\n\t\t\tCL_SVM_CAPABILITY_HOST_WRITE_KHR"                : "",

samples/usvm/100_udmemhelloworld/main.cpp

@@ -125,8 +125,9 @@ int main(
 
         // verification
         {
-            clEnqueueSVMMemcpy(
+            clEnqueueSVMMemcpyWithPropertiesKHR(
                 commandQueue(),
+                nullptr,
                 CL_TRUE,
                 h_buf,
                 d_dst,