Modify buffer location property if in simulation environment in acl_usm.cpp

Author: ericxu233

src/acl_hal_mmd.cpp

@@ -2767,19 +2767,10 @@ void *acl_hal_mmd_host_alloc(const std::vector<cl_device_id> devices,
     handles[i] = device_info[physical_device_id].handle;
   }
 
-  int use_offline_only;
-  acl_get_offline_device_user_setting(&use_offline_only);
-
-  if (use_offline_only == ACL_CONTEXT_MPSIM) {
-    result = dispatch->aocl_mmd_host_alloc(
-        handles, devices.size(), size, alignment,
-        (aocl_mmd_mem_properties_t *)properties, error);
-    acl_delete_arr(handles);
-  } else {
-    result = dispatch->aocl_mmd_host_alloc(handles, devices.size(), size,
-                                           alignment, nullptr, error);
-    acl_delete_arr(handles);
-  }
+  result = dispatch->aocl_mmd_host_alloc(
+      handles, devices.size(), size, alignment,
+      (aocl_mmd_mem_properties_t *)properties, error);
+  acl_delete_arr(handles);
 
   if (error) {
     switch (*error) {

src/acl_usm.cpp

@@ -163,9 +163,18 @@ CL_API_ENTRY void *CL_API_CALL clHostMemAllocINTEL(
       UNLOCK_BAIL_INFO(CL_OUT_OF_HOST_MEMORY, context, "Out of host memory");
     }
 
+    int use_offline_only;
+    acl_get_offline_device_user_setting(&use_offline_only);
+    mem_properties_t *properties_ptr;
+    if (use_offline_only == ACL_CONTEXT_MPSIM) {
+      properties_ptr = mmd_properties.data();
+    } else {
+      properties_ptr = nullptr;
+    }
+
     int error = 0;
     void *mem = acl_get_hal()->host_alloc(devices, size, alignment,
-                                          mmd_properties.data(), &error);
+                                          properties_ptr, &error);
     if (error) {
       acl_free(usm_alloc);
       switch (error) {
@@ -449,9 +458,18 @@ clSharedMemAllocINTEL(cl_context context, cl_device_id device,
       UNLOCK_BAIL_INFO(CL_OUT_OF_HOST_MEMORY, context, "Out of host memory");
     }
 
+    int use_offline_only;
+    acl_get_offline_device_user_setting(&use_offline_only);
+    mem_properties_t *properties_ptr;
+    if (use_offline_only == ACL_CONTEXT_MPSIM) {
+      properties_ptr = mmd_properties.data();
+    } else {
+      properties_ptr = nullptr;
+    }
+
     int error;
     void *mem = acl_get_hal()->shared_alloc(device, size, alignment,
-                                            mmd_properties.data(), &error);
+                                            properties_ptr, &error);
     if (mem == NULL) {
       acl_free(usm_alloc);
       switch (error) {