From 817c6df46d8a19973ac0c0a2b4eaed5ddfb24c8c Mon Sep 17 00:00:00 2001
From: Wojciech Konior <wojciech.konior@intel.com>
Date: Tue, 25 Mar 2025 15:05:47 +0000
Subject: [PATCH] fix: unify sources from shared added to dll&tests

Related-To: NEO-4372

Signed-off-by: Wojciech Konior <wojciech.konior@intel.com>
---
 level_zero/CMakeLists.txt        | 35 +++++++++++++-------------------
 opencl/source/dll/CMakeLists.txt | 10 +--------
 shared/source/dll/CMakeLists.txt | 25 +++++++++++++++++++++++
 3 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 shared/source/dll/CMakeLists.txt

diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index c731e29619..2a5fe5661f 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -218,28 +218,21 @@ if(BUILD_WITH_L0)
 
   # Create our shared library/DLL
   configure_file(ze_intel_gpu_version.h.in ${NEO_BUILD_DIR}/ze_intel_gpu_version.h)
-  add_library(${TARGET_NAME_L0}
-              SHARED
-              ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-              ${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/device_dll.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/direct_submission_controller_enabled.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/unified_memory_reuse_cleaner_enabled.cpp
-              ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
-              ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
-              ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
-              ${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
-              ${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
-              ${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
-              ${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
-              ${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
-              ${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
-              ${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
+  set(L0_SHARED_LIB_DLLS
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
+      ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
+      ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
+      ${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
+      ${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
+      ${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
+      ${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
+      ${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
+      ${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
+      $<TARGET_OBJECTS:neo_shared_dlls_precompiled_objects>
   )
+
+  add_library(${TARGET_NAME_L0} SHARED ${L0_SHARED_LIB_DLLS})
   if(DEFINED AUB_STREAM_PROJECT_NAME)
     target_sources(${TARGET_NAME_L0}
                    PRIVATE
diff --git a/opencl/source/dll/CMakeLists.txt b/opencl/source/dll/CMakeLists.txt
index 9b27e18ba7..226448001a 100644
--- a/opencl/source/dll/CMakeLists.txt
+++ b/opencl/source/dll/CMakeLists.txt
@@ -13,16 +13,7 @@ endif()
 set(RUNTIME_SRCS_DLL_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_dll.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/device_dll.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/direct_submission_controller_enabled.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/unified_memory_reuse_cleaner_enabled.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
     ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
@@ -39,6 +30,7 @@ set(RUNTIME_SRCS_DLL_BASE
     ${GTPIN_INIT_FILE}
     ${HW_SRC_LINK}
     ${EXPORTS_FILENAME}
+    $<TARGET_OBJECTS:neo_shared_dlls_precompiled_objects>
 )
 
 append_sources_from_properties(RUNTIME_SRCS_DLL_BASE
diff --git a/shared/source/dll/CMakeLists.txt b/shared/source/dll/CMakeLists.txt
new file mode 100644
index 0000000000..dabc40373c
--- /dev/null
+++ b/shared/source/dll/CMakeLists.txt
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2025 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(NOT WIN32)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+endif()
+
+set(NEO_SHARED_DLLS
+    ${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}/device_dll.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/direct_submission_controller_enabled.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/get_devices.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_reuse_cleaner_enabled.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/options_dll.cpp
+)
+
+add_library(neo_shared_dlls_precompiled_objects OBJECT ${NEO_SHARED_DLLS})
+target_include_directories(neo_shared_dlls_precompiled_objects PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_RELEASE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+target_compile_definitions(neo_shared_dlls_precompiled_objects PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_RELEASE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
\ No newline at end of file