Pass buffer location property only if the environment is simulation

Author: ericxu233

src/acl_usm.cpp

@@ -150,7 +150,11 @@ CL_API_ENTRY void *CL_API_CALL clHostMemAllocINTEL(
     {
       auto mmd_properties_it = mmd_properties.begin();
       if (mem_id) {
-        *mmd_properties_it++ = AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION;
+        int use_offline_only;
+        acl_get_offline_device_user_setting(&use_offline_only);
+        if (use_offline_only == ACL_CONTEXT_MPSIM) {
+          *mmd_properties_it++ = AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION;
+        }
         *mmd_properties_it++ = *mem_id;
       }
       *mmd_properties_it++ = 0;
@@ -163,18 +167,9 @@ 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,
-                                          properties_ptr, &error);
+                                          mmd_properties.data(), &error);
     if (error) {
       acl_free(usm_alloc);
       switch (error) {
@@ -445,7 +440,11 @@ clSharedMemAllocINTEL(cl_context context, cl_device_id device,
     {
       auto mmd_properties_it = mmd_properties.begin();
       if (mem_id) {
-        *mmd_properties_it++ = AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION;
+        int use_offline_only;
+        acl_get_offline_device_user_setting(&use_offline_only);
+        if (use_offline_only == ACL_CONTEXT_MPSIM) {
+          *mmd_properties_it++ = AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION;
+        }
         *mmd_properties_it++ = *mem_id;
       }
       *mmd_properties_it++ = 0;
@@ -458,18 +457,9 @@ 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,
-                                            properties_ptr, &error);
+                                            mmd_properties.data(), &error);
     if (mem == NULL) {
       acl_free(usm_alloc);
       switch (error) {