Move command stream receiver files to shared

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

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,14 +12,14 @@ 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
     ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp
     ${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>