Remove OCL object from MemoryProperties 14/n

- Remove MemoryProperties from api layer
- Delete mem_obj_types & mem_obj_types_common
MemoryProperties is now fully replaced by MemoryPropertiesFlags

Related-To: NEO-3132
Change-Id: I114a887454a187571c22bfd371ef7bf11dd493fd
Signed-off-by: Gibala Krzysztof <krzysztof.gibala@intel.com>

runtime/api/api.cpp

@@ -589,11 +589,9 @@ cl_mem CL_API_CALL clCreateBuffer(cl_context context,
     cl_mem buffer = nullptr;
     ErrorCodeHelper err(errcodeRet, CL_SUCCESS);
 
-    MemoryProperties propertiesStruct;
-    propertiesStruct.flags = flags;
-
-    if (isFieldValid(propertiesStruct.flags, MemObjHelper::validFlagsForBuffer)) {
-        Buffer::validateInputAndCreateBuffer(context, MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0), flags, 0, size, hostPtr, retVal, buffer);
+    MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0);
+    if (isFieldValid(flags, MemObjHelper::validFlagsForBuffer)) {
+        Buffer::validateInputAndCreateBuffer(context, memoryProperties, flags, 0, size, hostPtr, retVal, buffer);
     } else {
         retVal = CL_INVALID_VALUE;
     }
@@ -766,9 +764,9 @@ cl_mem CL_API_CALL clCreateImage(cl_context context,
     retVal = validateObjects(WithCastToInternal(context, &pContext));
 
     if (retVal == CL_SUCCESS) {
-        MemoryProperties propertiesStruct(flags);
-        if (isFieldValid(propertiesStruct.flags, MemObjHelper::validFlagsForImage)) {
-            image = Image::validateAndCreateImage(pContext, MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0), flags, 0, imageFormat, imageDesc, hostPtr, retVal);
+        MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0);
+        if (isFieldValid(flags, MemObjHelper::validFlagsForImage)) {
+            image = Image::validateAndCreateImage(pContext, memoryProperties, flags, 0, imageFormat, imageDesc, hostPtr, retVal);
         } else {
             retVal = CL_INVALID_VALUE;
         }
@@ -855,8 +853,8 @@ cl_mem CL_API_CALL clCreateImage2D(cl_context context,
     retVal = validateObjects(WithCastToInternal(context, &pContext));
 
     if (retVal == CL_SUCCESS) {
-        MemoryProperties propertiesStruct(flags);
-        image2D = Image::validateAndCreateImage(pContext, MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(propertiesStruct.flags, propertiesStruct.flagsIntel), flags, 0, imageFormat, &imageDesc, hostPtr, retVal);
+        MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0);
+        image2D = Image::validateAndCreateImage(pContext, memoryProperties, flags, 0, imageFormat, &imageDesc, hostPtr, retVal);
     }
 
     ErrorCodeHelper err(errcodeRet, retVal);
@@ -906,8 +904,8 @@ cl_mem CL_API_CALL clCreateImage3D(cl_context context,
     retVal = validateObjects(WithCastToInternal(context, &pContext));
 
     if (retVal == CL_SUCCESS) {
-        MemoryProperties propertiesStruct(flags);
-        image3D = Image::validateAndCreateImage(pContext, MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0), flags, 0, imageFormat, &imageDesc, hostPtr, retVal);
+        MemoryPropertiesFlags memoryProperties = MemoryPropertiesFlagsParser::createMemoryPropertiesFlags(flags, 0);
+        image3D = Image::validateAndCreateImage(pContext, memoryProperties, flags, 0, imageFormat, &imageDesc, hostPtr, retVal);
     }
 
     ErrorCodeHelper err(errcodeRet, retVal);

runtime/helpers/mem_properties_parser_helper.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "common/helpers/bit_helpers.h"
+#include "public/cl_ext_private.h"
 #include "runtime/memory_manager/allocation_properties.h"
 
-#include "mem_obj_types.h"
 #include "memory_properties_flags.h"
 
 namespace NEO {

runtime/helpers/memory_properties_flags_helpers.h

@@ -6,7 +6,8 @@
  */
 
 #pragma once
-#include "mem_obj_types.h"
+#include "public/cl_ext_private.h"
+
 #include "memory_properties_flags.h"
 
 namespace NEO {

runtime/mem_obj/CMakeLists.txt

@@ -20,8 +20,6 @@ set(RUNTIME_SRCS_MEM_OBJ
   ${CMAKE_CURRENT_SOURCE_DIR}/map_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/mem_obj_types.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions/mem_obj_types_common.inl
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mem_obj_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_helper_common.inl

runtime/mem_obj/definitions/mem_obj_types.h

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2018-2019 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "runtime/mem_obj/definitions/mem_obj_types_common.inl"
-
-namespace NEO {
-
-struct MemoryProperties : MemoryPropertiesBase {
-    MemoryProperties() : MemoryPropertiesBase(0) {}
-    MemoryProperties(cl_mem_flags flags) : MemoryPropertiesBase(flags) {}
-};
-
-} // namespace NEO

runtime/mem_obj/definitions/mem_obj_types_common.inl

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2018-2019 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "public/cl_ext_private.h"
-
-namespace NEO {
-
-struct MemoryPropertiesBase {
-    MemoryPropertiesBase(cl_mem_flags flags) : flags(flags) {}
-    cl_mem_flags flags = 0;
-    cl_mem_flags_intel flagsIntel = 0;
-};
-
-} // namespace NEO

runtime/mem_obj/mem_obj.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "public/cl_ext_private.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/mipmap.h"
@@ -13,7 +14,6 @@
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/sharings/sharing.h"
 
-#include "mem_obj_types.h"
 #include "memory_properties_flags.h"
 
 #include <atomic>

runtime/mem_obj/mem_obj_helper.h

@@ -14,7 +14,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 
 #include "CL/cl.h"
-#include "mem_obj_types.h"
 #include "memory_properties_flags.h"
 
 namespace NEO {