Move performance counters to shared

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-19 06:24:51 +08:00 · 2021-09-24 09:02:44 +00:00
parent 6f0baaeab9
commit 69390c7eca
19 changed files with 20 additions and 17 deletions
--- a/opencl/source/event/event.h
+++ b/opencl/source/event/event.h
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/os_interface/os_time.h"
+#include "shared/source/os_interface/performance_counters.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/idlist.h"
 #include "shared/source/utilities/iflist.h"
@@ -17,7 +18,6 @@
 #include "opencl/source/event/hw_timestamps.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/task_information.h"
-#include "opencl/source/os_interface/performance_counters.h"

 #include <atomic>
 #include <cstdint>
--- a/opencl/source/os_interface/CMakeLists.txt
+++ b/opencl/source/os_interface/CMakeLists.txt
@@ -9,8 +9,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
    ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h
    ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.h
 )

 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_BASE})
--- a/opencl/source/os_interface/linux/CMakeLists.txt
+++ b/opencl/source/os_interface/linux/CMakeLists.txt
@@ -11,8 +11,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
    ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_linux.cpp
    ${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(UNIX)
--- a/opencl/source/os_interface/windows/CMakeLists.txt
+++ b/opencl/source/os_interface/windows/CMakeLists.txt
@@ -13,8 +13,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
    ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_win.cpp
    ${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
 )

 if(WIN32)
--- a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.h
+++ b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.h
@@ -6,7 +6,8 @@
 */

 #pragma once
-#include "opencl/source/os_interface/linux/performance_counters_linux.h"
+#include "shared/source/os_interface/linux/performance_counters_linux.h"
+
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"

 namespace NEO {
--- a/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/performance_counters_linux.h"
 #include "shared/source/os_interface/os_interface.h"

-#include "opencl/source/os_interface/linux/performance_counters_linux.h"
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"

 #include "gtest/gtest.h"
--- a/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp
+++ b/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp
@@ -5,7 +5,8 @@
 *
 */

-#include "opencl/source/os_interface/performance_counters.h"
+#include "shared/source/os_interface/performance_counters.h"
+
 #include "test.h"

 using namespace NEO;
--- a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h
+++ b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h
@@ -6,7 +6,8 @@
 */

 #pragma once
-#include "opencl/source/os_interface/windows/performance_counters_win.h"
+#include "shared/source/os_interface/windows/performance_counters_win.h"
+
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"

 namespace NEO {
--- a/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp
@@ -5,7 +5,8 @@
 *
 */

-#include "opencl/source/os_interface/windows/performance_counters_win.h"
+#include "shared/source/os_interface/windows/performance_counters_win.h"
+
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"

 #include "gtest/gtest.h"
--- a/shared/source/device/device.h
+++ b/shared/source/device/device.h
@@ -15,10 +15,9 @@
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/performance_counters.h"
 #include "shared/source/program/sync_buffer_handler.h"

-#include "opencl/source/os_interface/performance_counters.h"
-
 #include "engine_group_types.h"

 namespace NEO {
--- a/shared/source/os_interface/CMakeLists.txt
+++ b/shared/source/os_interface/CMakeLists.txt
@@ -36,6 +36,8 @@ set(NEO_CORE_OS_INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}/os_thread.h
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.h
    ${CMAKE_CURRENT_SOURCE_DIR}/print.h
    ${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
    ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls_common.h
--- a/shared/source/os_interface/linux/CMakeLists.txt
+++ b/shared/source/os_interface/linux/CMakeLists.txt
@@ -63,6 +63,8 @@ set(NEO_CORE_OS_INTERFACE_LINUX
    ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.h
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time_linux.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
    ${CMAKE_CURRENT_SOURCE_DIR}/pci_path.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/pci_path.h
    ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp
--- a/shared/source/os_interface/linux/performance_counters_linux.cpp
+++ b/shared/source/os_interface/linux/performance_counters_linux.cpp
--- a/shared/source/os_interface/linux/performance_counters_linux.h
+++ b/shared/source/os_interface/linux/performance_counters_linux.h
@@ -6,7 +6,7 @@
 */

 #pragma once
-#include "opencl/source/os_interface/performance_counters.h"
+#include "shared/source/os_interface/performance_counters.h"

 namespace NEO {

--- a/shared/source/os_interface/performance_counters.cpp
+++ b/shared/source/os_interface/performance_counters.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "opencl/source/os_interface/performance_counters.h"
+#include "shared/source/os_interface/performance_counters.h"

 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/os_interface/os_context.h"
--- a/shared/source/os_interface/performance_counters.h
+++ b/shared/source/os_interface/performance_counters.h
--- a/shared/source/os_interface/windows/CMakeLists.txt
+++ b/shared/source/os_interface/windows/CMakeLists.txt
@@ -31,6 +31,8 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.h
    ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h
    ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/trim_callback.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h
--- a/shared/source/os_interface/windows/performance_counters_win.cpp
+++ b/shared/source/os_interface/windows/performance_counters_win.cpp
--- a/shared/source/os_interface/windows/performance_counters_win.h
+++ b/shared/source/os_interface/windows/performance_counters_win.h
@@ -6,7 +6,7 @@
 */

 #pragma once
-#include "opencl/source/os_interface/performance_counters.h"
+#include "shared/source/os_interface/performance_counters.h"

 namespace NEO {