fix: add back NonUsm memory placement

Add back UsmMemoryPlacement::NonUsm without differentiating between
aligned / misaligned to not break sycl and mpi benchmarks.

Signed-off-by: Dominik Dabek <[email protected]>

Author: ddabek-i

source/framework/enum/usm_memory_placement.h

@@ -14,6 +14,7 @@ enum class UsmMemoryPlacement {
     Host,
     Device,
     Shared,
+    NonUsm,
     NonUsmMapped,
     NonUsmMisaligned,
     NonUsm4KBAligned,

source/framework/l0/utility/usm_helper.cpp

@@ -21,6 +21,9 @@ ze_result_t allocate(UsmMemoryPlacement placement, LevelZero &levelZero, size_t
         return zeMemAllocHost(levelZero.context, &hostAllocDesc, size, 0, buffer);
     case UsmMemoryPlacement::Shared:
         return zeMemAllocShared(levelZero.context, &deviceAllocDesc, &hostAllocDesc, size, 0, levelZero.device, buffer);
+    case UsmMemoryPlacement::NonUsm:
+        *buffer = malloc(size);
+        return ZE_RESULT_SUCCESS;
     case UsmMemoryPlacement::NonUsm4KBAligned:
         *buffer = Allocator::alloc4KBAligned(size);
         return ZE_RESULT_SUCCESS;
@@ -93,6 +96,9 @@ ze_result_t deallocate(UsmMemoryPlacement placement, LevelZero &levelZero, void
     case UsmMemoryPlacement::Host:
     case UsmMemoryPlacement::Shared:
         return zeMemFree(levelZero.context, buffer);
+    case UsmMemoryPlacement::NonUsm:
+        free(buffer);
+        return ret;
     case UsmMemoryPlacement::NonUsm4KBAligned:
     case UsmMemoryPlacement::NonUsm2MBAligned:
     case UsmMemoryPlacement::NonUsmImported4KBAligned:

source/framework/ocl/utility/buffer_contents_helper_ocl.cpp

@@ -31,6 +31,7 @@ cl_int BufferContentsHelperOcl::fillUsmBufferOrHostPtr(cl_command_queue queue, v
     case UsmMemoryPlacement::Host:
     case UsmMemoryPlacement::Shared:
         return fillUsmBuffer(queue, ptr, ptrSize, contents);
+    case UsmMemoryPlacement::NonUsm:
     case UsmMemoryPlacement::NonUsmMapped:
     case UsmMemoryPlacement::NonUsmMisaligned:
     case UsmMemoryPlacement::NonUsm4KBAligned:

source/framework/ocl/utility/usm_helper_ocl.cpp

@@ -32,6 +32,9 @@ cl_int UsmHelperOcl::allocate(Opencl &opencl,
     case UsmMemoryPlacement::Shared:
         outAlloc.ptr = outAlloc.usm.clSharedMemAllocINTEL(opencl.context, opencl.device, nullptr, bufferSize, 0, &retVal);
         break;
+    case UsmMemoryPlacement::NonUsm:
+        outAlloc.ptr = malloc(bufferSize);
+        break;
     case UsmMemoryPlacement::NonUsmMisaligned:
         outAlloc.ptr = Allocator::allocMisaligned(bufferSize, misalignedOffset);
         break;
@@ -66,6 +69,9 @@ cl_int UsmHelperOcl::deallocate(Alloc &alloc) {
     case UsmMemoryPlacement::Shared:
         retVal = alloc.usm.clMemFreeINTEL(alloc.context, alloc.ptr);
         break;
+    case UsmMemoryPlacement::NonUsm:
+        free(alloc.ptr);
+        break;
     case UsmMemoryPlacement::NonUsm4KBAligned:
     case UsmMemoryPlacement::NonUsm2MBAligned:
         Allocator::alignedFree(alloc.ptr);