Move command stream receiver files to shared

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

level_zero/CMakeLists.txt

@@ -213,6 +213,7 @@ if(BUILD_WITH_L0)
   add_library(${TARGET_NAME_L0}
               SHARED
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+              ${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
               ${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
               ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
               ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
@@ -225,7 +226,6 @@ if(BUILD_WITH_L0)
 
   target_sources(${TARGET_NAME_L0}
                  PRIVATE
-                 ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_command_stream.cpp
                  ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp
                  ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_memory_manager_${DRIVER_MODEL}.cpp
                  ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp

opencl/source/CMakeLists.txt

@@ -58,7 +58,6 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
                            ${NEO__IGC_INCLUDE_DIR}
                            ${THIRD_PARTY_DIR}
                            ${NEO__GMM_INCLUDE_DIR}
-                           ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/create_command_stream_receiver_${DRIVER_MODEL}
 )
 
 target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC

opencl/source/dll/CMakeLists.txt

@@ -12,7 +12,6 @@ endif()
 
 set(RUNTIME_SRCS_DLL_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/create_memory_manager_${DRIVER_MODEL}.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp
@@ -20,6 +19,7 @@ set(RUNTIME_SRCS_DLL_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_dll.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/get_devices.cpp
     ${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
+    ${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
     ${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
     ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
     ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp

opencl/source/enable_gens.cmake

@@ -5,12 +5,10 @@
 #
 
 set(RUNTIME_SRCS_GENX_CPP_WINDOWS
-    windows/command_stream_receiver
     windows/gmm_callbacks
 )
 
 set(RUNTIME_SRCS_GENX_CPP_LINUX
-    linux/command_stream_receiver
 )
 
 if(NOT DISABLE_WDDM_LINUX)
@@ -20,20 +18,16 @@ if(NOT DISABLE_WDDM_LINUX)
 endif()
 
 set(RUNTIME_SRCS_GENX_CPP_BASE
-    aub_command_stream_receiver
     aub_mem_dump
     buffer
     cl_hw_helper
     command_queue
-    command_stream_receiver_simulated_common_hw
-    create_device_command_stream_receiver
     experimental_command_buffer
     gpgpu_walker
     hardware_commands_helper
     hw_info
     image
     sampler
-    tbx_command_stream_receiver
 )
 
 macro(macro_for_each_platform)

opencl/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl

@@ -10,8 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
-
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 
 namespace NEO {
 

opencl/source/os_interface/CMakeLists.txt

@@ -6,7 +6,6 @@
 
 set(RUNTIME_SRCS_OS_INTERFACE_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_receiver_${DRIVER_MODEL}/create_command_stream_receiver.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.h

opencl/source/os_interface/linux/CMakeLists.txt

@@ -9,22 +9,12 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/api_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_linux.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_bdw_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
 )
 
-if(SUPPORT_XEHP_AND_LATER)
-  list(APPEND RUNTIME_SRCS_OS_INTERFACE_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_xehp_and_later.inl
-  )
-endif()
-
 if(UNIX)
   target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX})
 endif()

opencl/source/os_interface/windows/CMakeLists.txt

@@ -11,13 +11,10 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_win.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.inl
 )
 
 if(WIN32)

opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp

@@ -11,11 +11,11 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"

opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h

@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
-
 using namespace NEO;
 
 template <typename GfxFamily>

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

@@ -9,13 +9,13 @@
 #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/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.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/cl_device_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h"

opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
@@ -14,7 +15,6 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"
 #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h"

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

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/os_interface.h"
@@ -13,7 +14,6 @@
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h"
 #include "test.h"

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

@@ -15,6 +15,7 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/residency.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_context.h"
@@ -26,7 +27,6 @@
 
 #include "opencl/source/helpers/memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"

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

@@ -14,6 +14,7 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/residency.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_context.h"
@@ -24,7 +25,6 @@
 
 #include "opencl/source/helpers/memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"

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

@@ -9,6 +9,7 @@
 #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"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_gem_close_worker.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
@@ -16,7 +17,6 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 
 #include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h"
 #include "test.h"
 

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

@@ -21,6 +21,7 @@
 #include "shared/source/os_interface/linux/allocator_helper.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_context.h"
@@ -35,7 +36,6 @@
 #include "opencl/source/helpers/memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

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

@@ -19,6 +19,7 @@
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/os_context_win.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h"
 #include "shared/source/os_interface/windows/wddm_residency_controller.h"
@@ -35,7 +36,6 @@
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
 
 #include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"

opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp

@@ -7,11 +7,11 @@
 
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
 
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"

opencl/test/unit_test/windows/CMakeLists.txt

@@ -17,12 +17,12 @@ if(WIN32)
   add_executable(igdrcl_windows_dll_tests
                  ${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
                  ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-                 ${NEO_SOURCE_DIR}/opencl/source/dll/create_command_stream.cpp
                  ${NEO_SOURCE_DIR}/opencl/source/dll/get_devices.cpp
                  ${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
                  ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
                  ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
                  ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
+                 ${NEO_SOURCE_DIR}/shared/source/dll/create_command_stream.cpp
                  ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp

shared/source/CMakeLists.txt

@@ -39,6 +39,7 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
                              ${NEO__IGC_INCLUDE_DIR}
                              ${KHRONOS_HEADERS_DIR}
                              ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
+                             ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/create_command_stream_receiver_${DRIVER_MODEL}
                              ${CMAKE_CURRENT_SOURCE_DIR}/direct_submission/create_direct_submission_${DRIVER_MODEL}
   )
 

shared/source/enable_gens.cmake

@@ -12,20 +12,26 @@ set(CORE_SRCS_GENX_H_BASE
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
+    aub_command_stream_receiver
     command_encoder
     command_stream_receiver_hw
+    command_stream_receiver_simulated_common_hw
+    create_device_command_stream_receiver
     direct_submission
     hw_helper
     preamble
     preemption
     state_base_address
+    tbx_command_stream_receiver
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_WINDOWS
+    windows/command_stream_receiver
     windows/direct_submission
 )
 
 set(CORE_RUNTIME_SRCS_GENX_CPP_LINUX
+    linux/command_stream_receiver
     linux/direct_submission
 )
 

shared/source/gen11/linux/command_stream_receiver_gen11.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
 
 namespace NEO {
 

shared/source/gen11/windows/command_stream_receiver_gen11.cpp

@@ -6,9 +6,8 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 
 namespace NEO {
 

shared/source/gen12lp/linux/command_stream_receiver_gen12lp.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
 
 namespace NEO {
 

shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp

@@ -6,9 +6,8 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 
 namespace NEO {
 

shared/source/gen8/linux/command_stream_receiver_gen8.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
 
 namespace NEO {
 

shared/source/gen8/windows/command_stream_receiver_gen8.cpp

@@ -6,9 +6,8 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 
 namespace NEO {
 

shared/source/gen9/linux/command_stream_receiver_gen9.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream_bdw_and_later.inl"
 
 namespace NEO {
 

shared/source/gen9/windows/command_stream_receiver_gen9.cpp

@@ -6,9 +6,8 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 
 namespace NEO {
 

shared/source/os_interface/CMakeLists.txt

@@ -16,6 +16,7 @@ set(NEO_CORE_OS_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_receiver_${DRIVER_MODEL}/create_command_stream_receiver.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.h
     ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp

shared/source/os_interface/create_command_stream_receiver_drm/create_command_stream_receiver.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
 
 namespace NEO {
 

shared/source/os_interface/create_command_stream_receiver_drm_or_wddm/create_command_stream_receiver.inl

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
 #include "shared/source/os_interface/os_interface.h"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
 
 namespace NEO {
 

shared/source/os_interface/create_command_stream_receiver_wddm/create_command_stream_receiver.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
 
 namespace NEO {
 

shared/source/os_interface/linux/CMakeLists.txt

@@ -9,6 +9,7 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cache_info_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/device_time_drm.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device_time_drm.h
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_linux.cpp
@@ -19,6 +20,9 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.h
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_buffer_object_extended.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_bdw_and_later.inl
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}drm_debug.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.h
@@ -68,6 +72,11 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/system_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}system_info_impl.h
 )
+if(SUPPORT_XEHP_AND_LATER)
+  list(APPEND NEO_CORE_OS_INTERFACE_LINUX
+       ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_xehp_and_later.inl
+  )
+endif()
 
 if(DISABLE_WDDM_LINUX)
   list(APPEND NEO_CORE_OS_INTERFACE_LINUX

shared/source/os_interface/linux/device_command_stream.inl

@@ -9,8 +9,7 @@
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/api_specific_config.h"
-
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 
 namespace NEO {
 

shared/source/os_interface/linux/drm_command_stream.inl

@@ -18,6 +18,7 @@
 #include "shared/source/memory_manager/residency.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_engine_mapper.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
@@ -25,8 +26,6 @@
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
-
 #include <cstdlib>
 #include <cstring>
 

shared/source/os_interface/linux/drm_command_stream_bdw_and_later.inl

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/os_interface/linux/drm_allocation.h"
-
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 
 namespace NEO {
 

shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/os_interface/linux/drm_allocation.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
-
 namespace NEO {
 
 template <typename GfxFamily>

shared/source/os_interface/linux/drm_gem_close_worker.cpp

@@ -9,11 +9,10 @@
 
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/os_interface/linux/drm_command_stream.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/os_thread.h"
 
-#include "opencl/source/os_interface/linux/drm_command_stream.h"
-
 #include <atomic>
 #include <iostream>
 #include <queue>

shared/source/os_interface/windows/CMakeLists.txt

@@ -14,6 +14,7 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.h
     ${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h
@@ -32,6 +33,8 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trim_callback.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory_create_with_fallback.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory_dxgi.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/adapter_factory_dxgi.h

shared/source/os_interface/windows/device_command_stream.inl

@@ -12,8 +12,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/helpers/api_specific_config.h"
-
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 
 #include "hw_cmds.h"
 #pragma warning(pop)

shared/source/os_interface/windows/wddm_device_command_stream.inl

@@ -20,8 +20,7 @@
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
-
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 
 #include "hw_cmds.h"
 #pragma warning(pop)

shared/source/xe_hp_core/linux/command_stream_receiver_xe_hp_core.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/linux/device_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream.inl"
-#include "opencl/source/os_interface/linux/drm_command_stream_xehp_and_later.inl"
+#include "shared/source/os_interface/linux/device_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream.inl"
+#include "shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl"
 
 namespace NEO {
 

shared/source/xe_hp_core/windows/command_stream_receiver_xe_hp_core.cpp

@@ -6,9 +6,8 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
-
-#include "opencl/source/os_interface/windows/device_command_stream.inl"
-#include "opencl/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/os_interface/windows/device_command_stream.inl"
+#include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 
 namespace NEO {