Move headers to core

- hw_info
- hw_cmds
- kmd_notify_properties
- completion_stamp
- bxml_generator_glue

Related-To: NEO-3982
Change-Id: I3ed3ef81f42596f381e60c19250f6eb1296d47a4
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

core/command_stream/preemption.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption_mode.h"
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 #include "sku_info.h"
 

core/commands/CMakeLists.txt

@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-set(RUNTIME_SRCS_COMMANDS
+set(NEO_CORE_COMMANDS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/bxml_generator_glue.h
 )
 
-target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMANDS})
+set_property(GLOBAL PROPERTY NEO_CORE_COMMANDS ${NEO_CORE_COMMANDS})

core/commands/bxml_generator_glue.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include <cstdint>
+#include <cstring>
+
+// Macro helpers
+#ifndef STATIC_ASSERT
+#define STATIC_ASSERT(e) static_assert(e, #e)
+#endif
+
+#ifndef SIZE32
+#define SIZE32(x) (sizeof(x) / sizeof(uint32_t))
+#endif // SIZE32
+
+/*****************************************************************************\
+MACRO: BITFIELD_RANGE
+PURPOSE: Calculates the number of bits between the startbit and the endbit (0 based)
+\*****************************************************************************/
+#ifndef BITFIELD_RANGE
+#define BITFIELD_RANGE(startbit, endbit) ((endbit) - (startbit) + 1)
+#endif
+
+/*****************************************************************************\
+MACRO: BITFIELD_BIT
+PURPOSE: Definition declared for clarity when creating structs
+\*****************************************************************************/
+#ifndef BITFIELD_BIT
+#define BITFIELD_BIT(bit) 1
+#endif

core/compiler_interface/compiler_cache.cpp

@@ -10,8 +10,8 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/hash.h"
+#include "core/helpers/hw_info.h"
 #include "core/utilities/debug_settings_reader.h"
-#include "runtime/helpers/hw_info.h"
 
 #include "config.h"
 #include "os_inc.h"

core/compiler_interface/compiler_interface.cpp

@@ -9,8 +9,8 @@
 
 #include "core/compiler_interface/compiler_cache.h"
 #include "core/compiler_interface/compiler_interface.inl"
+#include "core/helpers/hw_info.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
 

core/gen11/hw_cmds_base.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/commands/bxml_generator_glue.h"
+#include "core/gen11/hw_info.h"
 #include "core/helpers/debug_helpers.h"
-#include "runtime/commands/bxml_generator_glue.h"
 
-#include "hw_info.h"
 #include "igfxfmid.h"
 
 #include <cstddef>

core/gen11/hw_cmds_ehl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen11/hw_cmds_base.h"
+#include "core/gen11/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen11/hw_cmds_icllp.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen11/hw_cmds_base.h"
+#include "core/gen11/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen11/hw_cmds_lkf.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen11/hw_cmds_base.h"
+#include "core/gen11/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen11/hw_info_ehl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "hw_info_gen11.h"
+#include "core/gen11/hw_info_gen11.h"
 
 namespace NEO {
 

core/gen11/hw_info_gen11.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 namespace NEO {
 

core/gen11/hw_info_lkf.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "hw_info_gen11.h"
+#include "core/gen11/hw_info_gen11.h"
 
 namespace NEO {
 

core/gen12lp/hw_cmds_base.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/commands/bxml_generator_glue.h"
+#include "core/gen12lp/hw_info.h"
 #include "core/helpers/debug_helpers.h"
-#include "runtime/commands/bxml_generator_glue.h"
-#include "runtime/gen12lp/hw_info.h"
 
 #include "igfxfmid.h"
 

core/gen12lp/hw_cmds_tgllp.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen12lp/hw_cmds_base.h"
+#include "core/gen12lp/hw_cmds_base.h"
 namespace NEO {
 
 struct TGLLP : public TGLLPFamily {

core/gen12lp/hw_info_gen12lp.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 namespace NEO {
 

core/gen8/hw_cmds.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/gen8/hw_cmds_base.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/commands/bxml_generator_glue.h"
+#include "core/gen8/hw_info.h"
 #include "core/helpers/debug_helpers.h"
-#include "runtime/commands/bxml_generator_glue.h"
 
-#include "hw_info.h"
 #include "igfxfmid.h"
 
 #include <cstddef>

core/gen8/hw_cmds_bdw.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen8/hw_cmds_base.h"
+#include "core/gen8/hw_cmds_base.h"
 
 #include <string>
 

core/gen8/hw_info.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/gen8/hw_info_gen8.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 namespace NEO {
 

core/gen9/hw_cmds.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/gen9/hw_cmds_base.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/commands/bxml_generator_glue.h"
+#include "core/gen9/hw_info.h"
 #include "core/helpers/debug_helpers.h"
-#include "runtime/commands/bxml_generator_glue.h"
 
-#include "hw_info.h"
 #include "igfxfmid.h"
 
 #include <cstddef>

core/gen9/hw_cmds_bxt.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen9/hw_cmds_base.h"
+#include "core/gen9/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen9/hw_cmds_cfl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen9/hw_cmds_base.h"
+#include "core/gen9/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen9/hw_cmds_glk.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen9/hw_cmds_base.h"
+#include "core/gen9/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen9/hw_cmds_kbl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen9/hw_cmds_base.h"
+#include "core/gen9/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen9/hw_cmds_skl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gen9/hw_cmds_base.h"
+#include "core/gen9/hw_cmds_base.h"
 
 namespace NEO {
 

core/gen9/hw_info.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/gen9/hw_info_gen9.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 namespace NEO {
 

core/helpers/CMakeLists.txt

@@ -10,6 +10,7 @@ set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/common_types.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h
@@ -18,13 +19,18 @@ set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/hash.h
   ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_bdw_plus.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.h
   ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h
   ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble.h

core/helpers/hw_cmds.h

@@ -7,14 +7,14 @@
 
 #pragma once
 #ifdef SUPPORT_GEN8
-#include "runtime/gen8/hw_cmds.h"
+#include "core/gen8/hw_cmds.h"
 #endif
 #ifdef SUPPORT_GEN9
-#include "runtime/gen9/hw_cmds.h"
+#include "core/gen9/hw_cmds.h"
 #endif
 #ifdef SUPPORT_GEN11
-#include "runtime/gen11/hw_cmds.h"
+#include "core/gen11/hw_cmds.h"
 #endif
 #ifdef SUPPORT_GEN12LP
-#include "runtime/gen12lp/hw_cmds.h"
+#include "core/gen12lp/hw_cmds.h"
 #endif

core/helpers/hw_helper.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "core/command_stream/linear_stream.h"
+#include "core/helpers/hw_cmds.h"
 #include "runtime/built_ins/sip.h"
 #include "runtime/gen_common/aub_mapper.h"
-#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/mem_obj/buffer.h"
 
 #include <cstdint>

core/helpers/hw_helper_base.inl

@@ -7,6 +7,7 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/hw_info.h"
 #include "core/helpers/preamble.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/memory_constants.h"
@@ -16,7 +17,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_interface.h"
 
 namespace NEO {

core/helpers/hw_info.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
-#include "runtime/gen_common/hw_cmds.h"
+#include "core/helpers/hw_cmds.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include <algorithm>

core/helpers/hw_info.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "core/command_stream/preemption_mode.h"
-#include "runtime/helpers/kmd_notify_properties.h"
+#include "core/helpers/kmd_notify_properties.h"
 
 #include "engine_node.h"
 #include "gtsysinfo.h"

core/helpers/kmd_notify_properties.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/kmd_notify_properties.h"
+#include "core/helpers/kmd_notify_properties.h"
 
 #include "runtime/os_interface/debug_settings_manager.h"
 

core/helpers/kmd_notify_properties.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/completion_stamp.h"
+#include "core/helpers/completion_stamp.h"
 
 #include <atomic>
 #include <chrono>

core/helpers/preamble_base.inl

@@ -8,9 +8,9 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/hw_cmds.h"
 #include "core/helpers/preamble.h"
 #include "runtime/device/device.h"
-#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/kernel/kernel.h"
 

core/unit_tests/compiler_interface/compiler_cache_tests.cpp

@@ -9,9 +9,9 @@
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hash.h"
+#include "core/helpers/hw_info.h"
 #include "core/helpers/string.h"
 #include "runtime/compiler_interface/default_cl_cache_config.h"
-#include "runtime/helpers/hw_info.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/global_environment.h"

core/unit_tests/compiler_interface/compiler_interface_tests.cpp

@@ -8,8 +8,8 @@
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/compiler_interface/compiler_interface.inl"
 #include "core/helpers/file_io.h"
+#include "core/helpers/hw_info.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/hw_info.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/global_environment.h"
 #include "unit_tests/helpers/test_files.h"

core/unit_tests/fixtures/preemption_fixture.cpp

@@ -8,11 +8,11 @@
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 
 #include "core/command_stream/preemption.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_queue/enqueue_kernel.h"
 #include "runtime/command_queue/enqueue_marker.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/scheduler/scheduler_kernel.h"
 #include "test.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"

core/unit_tests/os_interface/aub_memory_operations_handler_tests.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "core/helpers/hw_info.h"
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"

core/unit_tests/test_macros/test.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "runtime/gen_common/hw_cmds.h"
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_cmds.h"
+#include "core/helpers/hw_info.h"
 
 #include "gtest/gtest.h"
 #include "igfxfmid.h"

offline_compiler/CMakeLists.txt

@@ -27,7 +27,7 @@ set(CLOC_SRCS_LIB
   ${NEO_SOURCE_DIR}/offline_compiler/options.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
   ${NEO_SOURCE_DIR}/core/compiler_interface/create_main.cpp
-  ${NEO_SOURCE_DIR}/runtime/helpers/hw_info.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/hw_info.cpp
   ${NEO_SOURCE_DIR}/runtime/platform/extensions.cpp
   ${NEO_SOURCE_DIR}/runtime/platform/extensions.h
 )

offline_compiler/decoder/helper.cpp

@@ -7,8 +7,8 @@
 
 #include "helper.h"
 
+#include "core/helpers/hw_info.h"
 #include "core/os_interface/os_library.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_inc_base.h"
 
 #include "igfxfmid.h"

offline_compiler/decoder/iga_wrapper.cpp

@@ -7,8 +7,8 @@
 
 #include "iga_wrapper.h"
 
+#include "core/helpers/hw_info.h"
 #include "core/os_interface/os_library.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_inc_base.h"
 
 #include "helper.h"

offline_compiler/helper.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/hw_info.h"
 #include "core/utilities/debug_settings_reader_creator.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {

offline_compiler/offline_compiler.cpp

@@ -10,9 +10,9 @@
 #include "core/elf/writer.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/file_io.h"
+#include "core/helpers/hw_info.h"
 #include "core/helpers/string.h"
 #include "core/os_interface/os_library.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"

offline_compiler/options.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/helpers/options.h"
 
-#include "runtime/gen_common/hw_cmds.h"
+#include "core/helpers/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
 #include <cstddef>

runtime/api/api.cpp

@@ -9,6 +9,7 @@
 
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/hw_info.h"
 #include "core/helpers/kernel_helpers.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/utilities/stackvec.h"
@@ -25,7 +26,6 @@
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/mem_properties_parser_helper.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/helpers/options.h"

runtime/aub/aub_center.cpp

@@ -7,9 +7,9 @@
 
 #include "runtime/aub/aub_center.h"
 
+#include "core/helpers/hw_info.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 

runtime/aub/aub_helper.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/hw_info.h"
 #include "core/helpers/non_copyable_or_moveable.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/gen_common/aub_mapper_base.h"
-#include "runtime/helpers/hw_info.h"
 
 namespace NEO {
 

runtime/built_ins/sip.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 
 #include <cinttypes>
 #include <memory>

runtime/builtin_kernels_simulation/gen11/scheduler_simulation.cpp

@@ -7,11 +7,11 @@
 
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 
+#include "core/gen11/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
-#include "runtime/gen11/hw_cmds.h"
 
 #include "CL/cl.h"
 

runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation.cpp

@@ -7,11 +7,11 @@
 
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 
+#include "core/gen12lp/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
-#include "runtime/gen12lp/hw_cmds.h"
 
 #include "CL/cl.h"
 

runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp

@@ -7,11 +7,11 @@
 
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 
+#include "core/gen8/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
-#include "runtime/gen8/hw_cmds.h"
 
 #include "CL/cl.h"
 

runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp

@@ -7,11 +7,11 @@
 
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 
+#include "core/gen9/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
-#include "runtime/gen9/hw_cmds.h"
 
 #include "CL/cl.h"
 

runtime/command_stream/aub_command_stream_receiver.cpp

@@ -8,8 +8,8 @@
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 
 #include "core/helpers/debug_helpers.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_inc_base.h"

runtime/command_stream/command_stream_receiver.h

@@ -8,13 +8,13 @@
 #pragma once
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/completion_stamp.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/submissions_aggregator.h"
 #include "runtime/command_stream/thread_arbitration_policy.h"
 #include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/blit_commands_helper.h"
-#include "runtime/helpers/completion_stamp.h"
 #include "runtime/helpers/flat_batch_buffer_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/indirect_heap/indirect_heap.h"

runtime/command_stream/command_stream_receiver_hw.h

@@ -6,12 +6,12 @@
  */
 
 #pragma once
+#include "core/helpers/hw_cmds.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/dirty_state_helpers.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 
 namespace NEO {

runtime/command_stream/csr_definitions.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/hw_info.h"
 #include "core/helpers/pipeline_select_args.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/csr_deps.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/kernel/grf_config.h"
 

runtime/command_stream/tbx_command_stream_receiver.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
 
+#include "core/helpers/hw_info.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 
 #include <string>

runtime/commands/bxml_generator_glue.h

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2017, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#pragma once
-#include <cstdint>
-#include <cstring>
-
-// Macro helpers
-#ifndef STATIC_ASSERT
-#define STATIC_ASSERT(e) static_assert(e, #e)
-#endif
-
-#ifndef SIZE32
-#define SIZE32(x) (sizeof(x) / sizeof(uint32_t))
-#endif // SIZE32
-
-/*****************************************************************************\
-MACRO: BITFIELD_RANGE
-PURPOSE: Calculates the number of bits between the startbit and the endbit (0 based)
-\*****************************************************************************/
-#ifndef BITFIELD_RANGE
-#define BITFIELD_RANGE(startbit, endbit) ((endbit) - (startbit) + 1)
-#endif
-
-/*****************************************************************************\
-MACRO: BITFIELD_BIT
-PURPOSE: Definition declared for clarity when creating structs
-\*****************************************************************************/
-#ifndef BITFIELD_BIT
-#define BITFIELD_BIT(bit) 1
-#endif

runtime/compiler_interface/patchtokens_validator.inl

@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/helpers/hw_info.h"
 #include "runtime/compiler_interface/patchtokens_decoder.h"
-#include "runtime/helpers/hw_info.h"
 
 #include "igfxfmid.h"
 

runtime/core_files.cmake

@@ -9,6 +9,7 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/core_fil
 append_sources_from_properties(NEO_CORE_SOURCES
   NEO_CORE_COMMAND_CONTAINER
   NEO_CORE_COMMAND_STREAM
+  NEO_CORE_COMMANDS
   NEO_CORE_EXECUTION_ENVIRONMENT
   NEO_CORE_GMM_HELPER
   NEO_CORE_HELPERS

runtime/device/device.h

@@ -7,12 +7,12 @@
 
 #pragma once
 #include "core/helpers/common_types.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/device/device_info_map.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/engine_control.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/performance_counters.h"
 
 #include "engine_node.h"

runtime/device_queue/device_queue.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/helpers/hw_info.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/helpers/base_object.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 
 namespace NEO {

runtime/device_queue/device_queue_hw.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "core/command_stream/linear_stream.h"
+#include "core/helpers/hw_cmds.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"

runtime/dll/create_command_stream.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/hw_info.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/create_command_stream_impl.h"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
-#include "runtime/helpers/hw_info.h"
 
 namespace NEO {
 

runtime/dll/linux/drm_neo_create.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_helper.h"
-#include "runtime/gen_common/hw_cmds.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"

runtime/dll/options.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/helpers/options.h"
 
-#include "runtime/gen_common/hw_cmds.h"
+#include "core/helpers/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
 namespace NEO {

runtime/enable_gens.cmake

@@ -15,6 +15,9 @@ set(RUNTIME_SRCS_GENX_CPP_LINUX
 
 set(RUNTIME_SRCS_GENX_H_BASE
   aub_mapper.h
+)
+
+set(CORE_SRCS_GENX_H_BASE
   hw_cmds.h
   hw_info.h
 )
@@ -45,7 +48,13 @@ set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
 macro(macro_for_each_platform)
   string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
 
-  foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.h" "reg_configs.h")
+  foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.h")
+    if(EXISTS ${CORE_GENX_PREFIX}/${PLATFORM_FILE})
+      list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${CORE_GENX_PREFIX}/${PLATFORM_FILE})
+    endif()
+  endforeach()
+
+  foreach(PLATFORM_FILE "reg_configs.h")
     if(EXISTS ${GENX_PREFIX}/${PLATFORM_FILE})
       list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${PLATFORM_FILE})
     endif()
@@ -65,6 +74,9 @@ macro(macro_for_each_gen)
   foreach(SRC_IT ${RUNTIME_SRCS_GENX_H_BASE})
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT})
   endforeach()
+  foreach(SRC_IT ${CORE_SRCS_GENX_H_BASE})
+    list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${CORE_GENX_PREFIX}/${SRC_IT})
+  endforeach()
   foreach(SRC_IT "state_compute_mode_helper_${GEN_TYPE_LOWER}.cpp")
     if(EXISTS ${GENX_PREFIX}/${SRC_IT})
       list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT})

runtime/gen11/aub_mem_dump_gen11.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/completion_stamp.h"
 #include "core/helpers/hw_helper.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.inl"
 #include "runtime/aub_mem_dump/aub_mem_dump.inl"
-#include "runtime/helpers/completion_stamp.h"
 
 #include "aub_mapper.h"
 #include "config.h"

runtime/gen11/buffer_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/gen11/hw_cmds.h"
+#include "core/gen11/hw_cmds.h"
 #include "runtime/mem_obj/buffer_bdw_plus.inl"
 
 namespace NEO {

runtime/gen11/device_queue_gen11.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/gen11/hw_cmds.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/device_queue/device_queue_hw_bdw_plus.inl"
 #include "runtime/device_queue/device_queue_hw_profiling.inl"
 #include "runtime/gen11/device_enqueue.h"
-#include "runtime/gen11/hw_cmds.h"
 
 namespace NEO {
 typedef ICLFamily Family;

runtime/gen11/enable_family_full_gen11.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/gen11/hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/device_queue/device_queue_hw.h"
-#include "runtime/gen11/hw_cmds.h"
 
 #ifdef HAVE_INSTRUMENTATION
 #include "runtime/event/perf_counter.h"

runtime/gen11/enable_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/gen11/hw_cmds.h"
+#include "core/gen11/hw_cmds.h"
 #include "runtime/helpers/enable_product.inl"
 #include "runtime/os_interface/hw_info_config.h"
 

runtime/gen11/enable_hw_info_config_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/gen11/hw_cmds.h"
+#include "core/gen11/hw_cmds.h"
 #include "runtime/os_interface/hw_info_config.h"
 
 namespace NEO {

runtime/gen11/gpgpu_walker_gen11.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/gen11/hw_info.h"
 #include "runtime/command_queue/gpgpu_walker_bdw_plus.inl"
 #include "runtime/command_queue/hardware_interface_bdw_plus.inl"
-#include "runtime/gen11/hw_info.h"
 
 namespace NEO {
 

runtime/gen11/hardware_commands_helper_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/gen11/hw_cmds.h"
+#include "core/gen11/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/hardware_commands_helper.inl"
 #include "runtime/helpers/hardware_commands_helper_base.inl"

runtime/gen11/hw_info_ehl.inl

@@ -9,8 +9,6 @@
 #include "runtime/aub_mem_dump/aub_services.h"
 
 #include "engine_node.h"
-#include "hw_cmds_ehl.h"
-#include "hw_info_ehl.h"
 
 namespace NEO {
 

runtime/gen11/hw_info_icllp.inl

@@ -5,12 +5,11 @@
  *
  */
 
+#include "core/gen11/hw_cmds.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
-#include "runtime/gen11/hw_cmds.h"
 
 #include "engine_node.h"
-#include "hw_info_icllp.h"
 
 namespace NEO {
 

runtime/gen11/hw_info_lkf.inl

@@ -5,12 +5,11 @@
  *
  */
 
+#include "core/gen11/hw_cmds_lkf.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 
 #include "engine_node.h"
-#include "hw_cmds_lkf.h"
-#include "hw_info_lkf.h"
 
 namespace NEO {
 

runtime/gen11/image_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/gen11/hw_cmds_base.h"
+#include "core/gen11/hw_cmds_base.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/image.inl"
 

runtime/gen11/linux/hw_info_config_ehl.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
 
 namespace NEO {

runtime/gen11/linux/hw_info_config_icllp.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
 
 namespace NEO {

runtime/gen11/linux/hw_info_config_lkf.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/hw_info.h"
+#include "core/helpers/hw_info.h"
 #include "runtime/os_interface/hw_info_config.h"
 
 namespace NEO {