includes refactor

Change-Id: I4dd85112b20b26fe1ecc95b8098cb160548db1d4
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

CMakeLists.txt

@@ -843,7 +843,7 @@ include_directories(${NEO_SHARED_DIRECTORY}/built_ins/builtinops${BRANCH_DIR_SUF
 include_directories(${NEO_SHARED_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SHARED_DIRECTORY}/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SHARED_DIRECTORY}/gen_common${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/helpers/definitions${BRANCH_DIR_SUFFIX})

level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/linear_stream.h"
-#include "shared/source/gen_common/reg_configs/reg_configs_common.h"
+#include "shared/source/gen_common/reg_configs_common.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/os_interface/os_context.h"

level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/linear_stream.h"
-#include "shared/source/gen_common/reg_configs/reg_configs_common.h"
+#include "shared/source/gen_common/reg_configs_common.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"

opencl/source/command_stream/aub_command_stream_receiver_hw.h

@@ -11,11 +11,11 @@
 
 #include "opencl/source/aub/aub_center.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
-#include "opencl/source/gen_common/aub_mapper.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/source/memory_manager/page_table.h"
 #include "opencl/source/memory_manager/physical_address_allocator.h"
 
+#include "aub_mapper.h"
 #include "command_stream_receiver_simulated_hw.h"
 
 namespace NEO {

opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h

@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 
-#include "opencl/source/gen_common/aub_mapper.h"
 #include "opencl/source/memory_manager/memory_banks.h"
 
+#include "aub_mapper.h"
 #include "third_party/aub_stream/headers/hardware_context.h"
 
 namespace aub_stream {

opencl/source/command_stream/tbx_command_stream_receiver_hw.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
-#include "opencl/source/gen_common/aub_mapper.h"
 #include "opencl/source/memory_manager/address_mapper.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/source/memory_manager/page_table.h"
 
+#include "aub_mapper.h"
 #include "command_stream_receiver_simulated_hw.h"
 
 #include <set>

opencl/source/enable_gens.cmake

@@ -13,10 +13,6 @@ set(RUNTIME_SRCS_GENX_CPP_LINUX
     linux/command_stream_receiver
 )
 
-set(RUNTIME_SRCS_GENX_H_BASE
-    aub_mapper.h
-)
-
 set(RUNTIME_SRCS_GENX_CPP_BASE
     aub_command_stream_receiver
     aub_mem_dump

opencl/source/gen11/aub_mem_dump_gen11.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/aub_mapper.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 
@@ -12,7 +13,6 @@
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
 
-#include "aub_mapper.h"
 #include "config.h"
 
 namespace AubMemDump {

opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/aub_mapper.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 
@@ -12,7 +13,6 @@
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
 
-#include "aub_mapper.h"
 #include "config.h"
 #include "reg_configs_common.h"
 

opencl/source/gen8/aub_mem_dump_gen8.cpp

@@ -5,14 +5,13 @@
  *
  */
 
+#include "shared/source/gen8/aub_mapper.h"
 #include "shared/source/helpers/hw_helper.h"
 
 #include "opencl/source/aub/aub_helper_bdw_plus.inl"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
 
-#include "aub_mapper.h"
-
 namespace AubMemDump {
 
 enum {

opencl/source/gen9/aub_mem_dump_gen9.cpp

@@ -5,14 +5,13 @@
  *
  */
 
+#include "shared/source/gen9/aub_mapper.h"
 #include "shared/source/helpers/hw_helper.h"
 
 #include "opencl/source/aub/aub_helper_bdw_plus.inl"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.inl"
 
-#include "aub_mapper.h"
-
 namespace AubMemDump {
 
 enum {

opencl/source/gen_common/CMakeLists.txt

@@ -6,8 +6,9 @@
 
 set(RUNTIME_SRCS_GEN_COMMON
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h
 )
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GEN_COMMON})
+
+add_subdirectories()

opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h

@@ -12,9 +12,10 @@
 
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "opencl/source/gen_common/aub_mapper.h"
 #include "test.h"
 
+#include "aub_mapper.h"
+
 namespace Os {
 extern const char *fileSeparator;
 }

shared/source/enable_gens.cmake

@@ -8,6 +8,7 @@ set(CORE_SRCS_GENX_H_BASE
     hw_cmds.h
     hw_info.h
     hw_cmds_base.h
+    aub_mapper.h
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_BASE

shared/source/gen11/hw_helper_gen11.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/aub_mapper.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_bdw_plus.inl"
 

shared/source/gen12lp/hw_helper_gen12lp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/aub_mapper.h"
 #include "shared/source/gen12lp/hw_cmds.h"
 
 using Family = NEO::TGLLPFamily;

shared/source/gen8/hw_helper_gen8.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen8/aub_mapper.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_bdw_plus.inl"

shared/source/gen9/hw_helper_gen9.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/aub_mapper.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_bdw_plus.inl"
 

shared/source/gen_common/CMakeLists.txt

@@ -5,7 +5,8 @@
 #
 
 set(NEO_CORE_GEN_COMMON
-    ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/aub_mapper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/reg_configs_common.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_GEN_COMMON ${NEO_CORE_GEN_COMMON})

shared/source/gen_common/aub_mapper.h

@@ -7,14 +7,14 @@
 
 #pragma once
 #ifdef SUPPORT_GEN8
-#include "opencl/source/gen8/aub_mapper.h"
+#include "shared/source/gen8/aub_mapper.h"
 #endif
 #ifdef SUPPORT_GEN9
-#include "opencl/source/gen9/aub_mapper.h"
+#include "shared/source/gen9/aub_mapper.h"
 #endif
 #ifdef SUPPORT_GEN11
-#include "opencl/source/gen11/aub_mapper.h"
+#include "shared/source/gen11/aub_mapper.h"
 #endif
 #ifdef SUPPORT_GEN12LP
-#include "opencl/source/gen12lp/aub_mapper.h"
+#include "shared/source/gen12lp/aub_mapper.h"
 #endif

shared/source/helpers/hw_helper.h

@@ -12,7 +12,6 @@
 #include "shared/source/helpers/aux_translation.h"
 
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
-#include "opencl/source/gen_common/aub_mapper.h"
 #include "opencl/source/mem_obj/buffer.h"
 
 #include "hw_cmds.h"

shared/test/unit_test/preamble/preamble_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/gen_common/reg_configs/reg_configs_common.h"
+#include "shared/source/gen_common/reg_configs_common.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/utilities/stackvec.h"