Move CSR to shared [1/n]

Related-To: NEO-4344

Change-Id: I356b46bdfac7c943b95ee6dc41d3416bd880f9cb
Signed-off-by: Konstanty Misiak <konstanty.misiak@intel.com>

CMakeLists.txt

@@ -793,6 +793,7 @@ include_directories(${NEO_CORE_DIRECTORY}/built_ins/builtinops${BRANCH_DIR_SUFFI
 include_directories(${NEO_CORE_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_CORE_DIRECTORY}/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/memory_manager/definitions${BRANCH_DIR_SUFFIX})
@@ -800,7 +801,6 @@ include_directories(${NEO_CORE_DIRECTORY}/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_CORE_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/command_queue/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/command_stream/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/opencl/source/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 

opencl/source/command_stream/CMakeLists.txt

@@ -22,7 +22,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM
   ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw.h
   ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_bdw_plus.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h

opencl/source/dll/create_command_stream.cpp

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

opencl/source/enable_gens.cmake

@@ -22,7 +22,6 @@ set(RUNTIME_SRCS_GENX_CPP_BASE
   aub_mem_dump
   buffer
   command_queue
-  command_stream_receiver_hw
   command_stream_receiver_simulated_common_hw
   experimental_command_buffer
   gpgpu_walker

opencl/source/gen_common/CMakeLists.txt

@@ -8,7 +8,6 @@ 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
-  ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h
 )
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GEN_COMMON})

opencl/source/os_interface/linux/CMakeLists.txt

@@ -8,8 +8,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_linux.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl

opencl/source/os_interface/linux/device_command_stream.inl

@@ -5,8 +5,9 @@
  *
  */
 
+#include "shared/source/command_stream/device_command_stream.h"
+
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/os_interface/linux/drm_command_stream.h"
 
 namespace NEO {

opencl/source/os_interface/linux/drm_command_stream.h

@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/os_interface/linux/drm_gem_close_worker.h"
 
-#include "opencl/source/command_stream/device_command_stream.h"
-
 #include "drm/i915_drm.h"
 
 #include <vector>

opencl/source/os_interface/windows/CMakeLists.txt

@@ -10,8 +10,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_win.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h

opencl/source/os_interface/windows/device_command_stream.inl

@@ -9,10 +9,10 @@
 // Current order must be preserved due to two versions of igfxfmid.h
 #pragma warning(push)
 #pragma warning(disable : 4005)
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/helpers/hw_cmds.h"
 
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #pragma warning(pop)
 

opencl/source/os_interface/windows/wddm_device_command_stream.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "opencl/source/command_stream/device_command_stream.h"
+#include "shared/source/command_stream/device_command_stream.h"
 
 struct COMMAND_BUFFER_HEADER_REC;
 

opencl/test/unit_test/gen11/coherency_tests_gen11.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/hw_helper.h"
 
-#include "opencl/source/gen11/reg_configs.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
-#include "opencl/source/gen11/reg_configs.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp

@@ -5,8 +5,9 @@
  *
  */
 
+#include "shared/source/gen9/reg_configs.h"
+
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/gen9/reg_configs.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"

opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/os_interface/linux/os_interface.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/os_interface/linux/device_command_stream.inl"
 #include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"

opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
@@ -13,7 +14,6 @@
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/linux/os_interface.h"
 
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "drm_memory_manager_tests.h"
 
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
@@ -26,7 +27,6 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/memory_properties_flags_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/flush_stamp.h"
@@ -23,7 +24,6 @@
 
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "opencl/source/command_stream/device_command_stream.h"
 #include "opencl/source/helpers/built_ins_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/os_interface/windows/wddm_device_command_stream.h"

shared/source/CMakeLists.txt

@@ -77,6 +77,7 @@ append_sources_from_properties(CORE_SOURCES
     NEO_CORE_DIRECT_SUBMISSION
     NEO_CORE_DIRECT_SUBMISSION_DISPATCHERS
     NEO_CORE_EXECUTION_ENVIRONMENT
+    NEO_CORE_GEN_COMMON
     NEO_CORE_GMM_HELPER
     NEO_CORE_HELPERS
     NEO_CORE_IMAGE

shared/source/command_stream/CMakeLists.txt

@@ -17,6 +17,7 @@ set(NEO_CORE_COMMAND_STREAM
   ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.h
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_hw_ext.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h
   ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.h
   ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.inl

shared/source/enable_gens.cmake

@@ -12,6 +12,7 @@ set(CORE_SRCS_GENX_H_BASE
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
   command_encoder
+  command_stream_receiver_hw
   preamble
   preemption
 )

shared/source/gen11/command_encoder_gen11.cpp

@@ -9,8 +9,8 @@
 #include "shared/source/command_container/command_encoder.inl"
 #include "shared/source/command_container/command_encoder_base.inl"
 #include "shared/source/gen11/hw_cmds_base.h"
+#include "shared/source/gen11/reg_configs.h"
 
-#include "opencl/source/gen11/reg_configs.h"
 namespace NEO {
 
 using Family = ICLFamily;

shared/source/gen11/command_stream_receiver_hw_gen11.cpp

@@ -6,12 +6,11 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl"
 
-#include "opencl/source/command_stream/device_command_stream.h"
-#include "opencl/source/gen11/reg_configs.h"
-
 namespace NEO {
 typedef ICLFamily Family;
 static auto gfxCore = IGFX_GEN11_CORE;

shared/source/gen12lp/command_encoder_gen12lp.cpp

@@ -9,8 +9,7 @@
 #include "shared/source/command_container/command_encoder.inl"
 #include "shared/source/command_container/command_encoder_base.inl"
 #include "shared/source/gen12lp/hw_cmds_base.h"
-
-#include "opencl/source/gen12lp/reg_configs.h"
+#include "shared/source/gen12lp/reg_configs.h"
 
 namespace NEO {
 

shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp

@@ -11,11 +11,9 @@ using Family = NEO::TGLLPFamily;
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl"
 #include "shared/source/command_stream/command_stream_receiver_hw_tgllp_plus.inl"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl"
 
-#include "opencl/source/command_stream/device_command_stream.h"
-#include "opencl/source/gen12lp/helpers_gen12lp.h"
-
 namespace NEO {
 static auto gfxCore = IGFX_GEN12LP_CORE;
 

shared/source/gen8/command_encoder_gen8.cpp

@@ -9,8 +9,7 @@
 #include "shared/source/command_container/command_encoder.inl"
 #include "shared/source/command_container/command_encoder_base.inl"
 #include "shared/source/gen8/hw_cmds_base.h"
-
-#include "opencl/source/gen8/reg_configs.h"
+#include "shared/source/gen8/reg_configs.h"
 
 namespace NEO {
 

shared/source/gen8/command_stream_receiver_hw_gen8.cpp

@@ -6,11 +6,10 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl"
 
-#include "opencl/source/command_stream/device_command_stream.h"
-
 namespace NEO {
 typedef BDWFamily Family;
 static auto gfxCore = IGFX_GEN8_CORE;

shared/source/gen9/command_encoder_gen9.cpp

@@ -9,8 +9,7 @@
 #include "shared/source/command_container/command_encoder.inl"
 #include "shared/source/command_container/command_encoder_base.inl"
 #include "shared/source/gen9/hw_cmds_base.h"
-
-#include "opencl/source/gen9/reg_configs.h"
+#include "shared/source/gen9/reg_configs.h"
 
 namespace NEO {
 

shared/source/gen9/command_stream_receiver_hw_gen9.cpp

@@ -6,11 +6,10 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_plus.inl"
+#include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_plus.inl"
 
-#include "opencl/source/command_stream/device_command_stream.h"
-
 namespace NEO {
 typedef SKLFamily Family;
 static auto gfxCore = IGFX_GEN9_CORE;

shared/source/gen_common/CMakeLists.txt

@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_GEN_COMMON
+    ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_GEN_COMMON ${NEO_CORE_GEN_COMMON})

shared/source/gen_common/reg_configs/reg_configs_common.h

@@ -7,16 +7,16 @@
 
 #pragma once
 #ifdef SUPPORT_GEN8
-#include "opencl/source/gen8/reg_configs.h"
+#include "shared/source/gen8/reg_configs.h"
 #endif
 #ifdef SUPPORT_GEN9
-#include "opencl/source/gen9/reg_configs.h"
+#include "shared/source/gen9/reg_configs.h"
 #endif
 #ifdef SUPPORT_GEN11
-#include "opencl/source/gen11/reg_configs.h"
+#include "shared/source/gen11/reg_configs.h"
 #endif
 #ifdef SUPPORT_GEN12LP
-#include "opencl/source/gen12lp/reg_configs.h"
+#include "shared/source/gen12lp/reg_configs.h"
 #endif
 #include <cstdint>
 

shared/test/unit_test/gen8/test_preamble_gen8.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/command_stream/thread_arbitration_policy.h"
+#include "shared/source/gen8/reg_configs.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/unit_test/preamble/preamble_fixture.h"
 
-#include "opencl/source/gen8/reg_configs.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;

shared/test/unit_test/gen9/skl/test_preamble_skl.cpp

@@ -7,11 +7,11 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/thread_arbitration_policy.h"
+#include "shared/source/gen9/reg_configs.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/preamble/preamble_fixture.h"
 
-#include "opencl/source/gen9/reg_configs.h"
 #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 
 using namespace NEO;

shared/test/unit_test/preamble/preamble_tests.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/utilities/stackvec.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
-#include "opencl/source/gen11/reg_configs.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"