Move enable_product.inl to shared

extract api agnostic validators to shared
remove not needed opencl includes from neo shared


Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

opencl/source/api/api.cpp

@@ -34,9 +34,9 @@
 #include "opencl/source/execution_environment/cl_execution_environment.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
 #include "opencl/source/helpers/queue_helpers.h"
-#include "opencl/source/helpers/validators.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/kernel/kernel_info_cl.h"
 #include "opencl/source/kernel/multi_device_kernel.h"

opencl/source/command_queue/gpgpu_walker_base.inl

@@ -23,9 +23,9 @@
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/user_event.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/helpers/queue_helpers.h"
-#include "opencl/source/helpers/validators.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 
 #include "pipe_control_args.h"

opencl/source/command_queue/resource_barrier.cpp

@@ -12,7 +12,7 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 
 namespace NEO {
 BarrierCommand::BarrierCommand(CommandQueue *commandQueue, const cl_resource_barrier_descriptor_intel *descriptors, uint32_t numDescriptors) : numSurfaces(numDescriptors) {

opencl/source/gtpin/gtpin_helpers.cpp

@@ -14,7 +14,7 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/buffer.h"
 
 #include "CL/cl.h"

opencl/source/helpers/CMakeLists.txt

@@ -21,12 +21,13 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_memory_properties_helpers_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_preemption_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_preemption_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_validators.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_validators.h
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_color.h
     ${CMAKE_CURRENT_SOURCE_DIR}/destructor_callbacks.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/enable_product.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/get_info_status_mapper.h
@@ -48,8 +49,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/task_information.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/task_information.h
     ${CMAKE_CURRENT_SOURCE_DIR}/task_information.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/validators.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/validators.h
 )
 
 if(SUPPORT_XEHP_AND_LATER)

opencl/source/helpers/cl_validators.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"

opencl/source/helpers/cl_validators.h

@@ -74,16 +74,6 @@ inline cl_int validateObjects(Type *object, Types... rest) {
     return CL_SUCCESS != retVal ? retVal : validateObjects(rest...);
 }
 
-template <typename T = void>
-bool areNotNullptr() {
-    return true;
-}
-
-template <typename T, typename... RT>
-bool areNotNullptr(T t, RT... rt) {
-    return (t != nullptr) && areNotNullptr<RT...>(rt...);
-}
-
 cl_int validateYuvOperation(const size_t *origin, const size_t *region);
 bool isPackedYuvImage(const cl_image_format *imageFormat);
 bool isNV12Image(const cl_image_format *imageFormat);

opencl/source/helpers/surface_formats.cpp

@@ -11,10 +11,9 @@
 #include "shared/source/helpers/array_count.h"
 
 #include "opencl/source/api/cl_types.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/image.h"
 
-#include "validators.h"
-
 namespace NEO {
 
 // clang-format off

opencl/source/mem_obj/buffer.cpp

@@ -29,7 +29,7 @@
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
 #include "opencl/source/os_interface/ocl_reg_path.h"
 

opencl/source/mem_obj/image.h

@@ -9,8 +9,8 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/image/image_surface_state.h"
 
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/surface_formats.h"
-#include "opencl/source/helpers/validators.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 

opencl/source/program/build.cpp

@@ -17,7 +17,7 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/program.h"
 

opencl/source/program/compile.cpp

@@ -15,7 +15,7 @@
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
 #include "opencl/source/cl_device/cl_device.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/platform/platform.h"
 
 #include "compiler_options.h"

opencl/source/program/get_info.cpp

@@ -13,8 +13,8 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/base_object.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
-#include "opencl/source/helpers/validators.h"
 
 #include "program.h"
 

opencl/source/program/link.cpp

@@ -17,7 +17,7 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/program.h"
 

opencl/source/sharings/gl/windows/cl_gl_api.cpp

@@ -16,7 +16,7 @@
 #include "opencl/source/context/context.h"
 #include "opencl/source/event/async_events_handler.h"
 #include "opencl/source/helpers/base_object.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/mem_obj/mem_obj.h"

opencl/test/unit_test/gtpin/gtpin_tests.cpp

@@ -29,7 +29,7 @@
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_init.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/validators.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/program/create.inl"

opencl/test/unit_test/helpers/validator_tests.cpp

@@ -6,11 +6,12 @@
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/validators.h"
 
 #include "opencl/source/api/cl_types.h"
 #include "opencl/source/helpers/base_object.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/error_mappers.h"
-#include "opencl/source/helpers/validators.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"

opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp

@@ -8,8 +8,8 @@
 #include "shared/source/helpers/aligned_memory.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/surface_formats.h"
-#include "opencl/source/helpers/validators.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"

shared/offline_compiler/source/offline_compiler.cpp

@@ -21,6 +21,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
+#include "shared/source/helpers/validators.h"
 #include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
 
@@ -53,16 +54,6 @@
 
 namespace NEO {
 
-template <typename T = void>
-bool areNotNullptr() {
-    return true;
-}
-
-template <typename T, typename... RT>
-bool areNotNullptr(T t, RT... rt) {
-    return (t != nullptr) && areNotNullptr<RT...>(rt...);
-}
-
 CIF::CIFMain *createMainNoSanitize(CIF::CreateCIFMainFunc_t createFunc);
 
 std::string convertToPascalCase(const std::string &inString) {

shared/source/compiler_interface/compiler_interface.inl

@@ -7,10 +7,9 @@
 
 #pragma once
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/validators.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "opencl/source/helpers/validators.h"
-
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "cif/common/cif.h"
 #include "cif/import/library_api.h"

shared/source/gen11/enable_gen11.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl"
+#include "shared/source/helpers/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/helpers/enable_product.inl"
-
 namespace NEO {
 
 #ifdef SUPPORT_ICLLP

shared/source/gen12lp/enable_gen12lp.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl"
+#include "shared/source/helpers/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/helpers/enable_product.inl"
-
 namespace NEO {
 
 #ifdef SUPPORT_TGLLP

shared/source/gen8/enable_gen8.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl"
+#include "shared/source/helpers/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/helpers/enable_product.inl"
-
 namespace NEO {
 
 #ifdef SUPPORT_BDW

shared/source/gen9/enable_gen9.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl"
+#include "shared/source/helpers/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/helpers/enable_product.inl"
-
 namespace NEO {
 
 #ifdef SUPPORT_BXT

shared/source/helpers/CMakeLists.txt

@@ -40,6 +40,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/enable_product.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_control.h
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}engine_node_helper_extra.cpp
@@ -122,6 +123,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/topology_map.h
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
     ${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/validators.h
     ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}engine_group_types.h

shared/source/helpers/validators.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include <utility>
+
+namespace NEO {
+template <typename T = void>
+bool areNotNullptr() {
+    return true;
+}
+
+template <typename T, typename... RT>
+bool areNotNullptr(T t, RT... rt) {
+    return (t != nullptr) && areNotNullptr<RT...>(rt...);
+}
+} // namespace NEO

shared/source/memory_manager/unified_memory_manager.cpp

@@ -13,8 +13,6 @@
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/mem_obj/mem_obj_helper.h"
-
 namespace NEO {
 
 void SVMAllocsManager::MapBasedAllocationTracker::insert(SvmAllocationData allocationsPair) {

shared/source/os_interface/linux/page_table_manager_functions.cpp

@@ -9,8 +9,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 
-#include "opencl/source/platform/platform.h"
-
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableFlags);

shared/source/os_interface/performance_counters.cpp

@@ -11,8 +11,6 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/utilities/tag_allocator.h"
 
-#include "opencl/source/command_queue/command_queue.h"
-
 using namespace MetricsLibraryApi;
 
 namespace NEO {

shared/source/xe_hp_core/enable_xe_hp_core.cpp

@@ -6,11 +6,10 @@
  */
 
 #include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl"
+#include "shared/source/helpers/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
-#include "opencl/source/helpers/enable_product.inl"
-
 namespace NEO {
 
 #ifdef SUPPORT_XE_HP_SDV