[refactoring, tools] Remove get_numa_id duplication (#1078)

intel · Sep 9, 2024 · 566e77f · 566e77f
1 parent 4a45a93
commit 566e77f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 20 deletions.
diff --git a/tools/benchmarks/CMakeLists.txt b/tools/benchmarks/CMakeLists.txt
@@ -21,6 +21,7 @@ add_executable(qpl_benchmarks
 
 target_link_libraries(qpl_benchmarks
     PRIVATE qpl
+    PRIVATE tool_common
     PRIVATE tool_hw_dispatcher
     PRIVATE benchmark
     "$<$<PLATFORM_ID:Linux>:stdc++fs>"
@@ -32,6 +33,7 @@ get_target_property(GBENCH_SOURCE_DIR benchmark SOURCE_DIR)
 target_include_directories(qpl_benchmarks
     PRIVATE $<BUILD_INTERFACE:${QPL_PROJECT_DIR}/include/> $<INSTALL_INTERFACE:include>
     PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/include
+    PRIVATE $<TARGET_PROPERTY:tool_common,INTERFACE_INCLUDE_DIRECTORIES>
     PRIVATE $<TARGET_PROPERTY:tool_hw_dispatcher,INTERFACE_INCLUDE_DIRECTORIES>
     PRIVATE ${GBENCH_SOURCE_DIR})
 

diff --git a/tools/utils/common/dispatcher_checks.hpp b/tools/utils/common/dispatcher_checks.hpp
@@ -7,9 +7,11 @@
 #ifndef QPL_TOOLS_UTILS_COMMON_DISPATCHER_CHECKS_HPP_
 #define QPL_TOOLS_UTILS_COMMON_DISPATCHER_CHECKS_HPP_
 
+// tool_hw_dispatcher
 #include "test_hw_dispatcher.hpp"
+
 // tool_common
-#include "system_info.hpp"
+#include "topology.hpp"
 
 namespace qpl::test {
 

diff --git a/tools/utils/common/opcfg_checks.hpp b/tools/utils/common/opcfg_checks.hpp
@@ -7,9 +7,11 @@
 #ifndef QPL_TOOLS_UTILS_COMMON_OPCFG_CHECKS_HPP_
 #define QPL_TOOLS_UTILS_COMMON_OPCFG_CHECKS_HPP_
 
+// tool_hw_dispatcher
 #include "test_hw_dispatcher.hpp"
+
 // tool_common
-#include "system_info.hpp"
+#include "topology.hpp"
 
 namespace qpl::test {
 

diff --git a/tools/utils/common/system_info.hpp b/tools/utils/common/system_info.hpp
@@ -192,24 +192,6 @@ static inline bool is_madv_pageout_available() {
     return is_version_ge_5_4;
 }
 
-/**
- * @brief Returns current numa_id, -1 on error
- *
-*/
-static inline int32_t get_numa_id() {
-#if defined(__linux__)
-    uint32_t tsc_aux = 0U;
-
-    __rdtscp(&tsc_aux);
-
-    // Linux encodes NUMA node into [32:12] of TSC_AUX
-    return static_cast<int32_t>(tsc_aux >> 12);
-#else
-    // Not supported in Windows yet
-    return -1;
-#endif
-}
-
 } // namespace qpl::test
 
 #endif // QPL_TOOLS_UTILS_COMMON_SYSTEM_INFO_HPP_
diff --git a/tools/utils/hw_dispatcher/topology.cpp → tools/utils/common/topology.cpp b/tools/utils/hw_dispatcher/topology.cpp → tools/utils/common/topology.cpp
diff --git a/tools/utils/hw_dispatcher/topology.hpp → tools/utils/common/topology.hpp b/tools/utils/hw_dispatcher/topology.hpp → tools/utils/common/topology.hpp
diff --git a/tools/utils/hw_dispatcher/CMakeLists.txt b/tools/utils/hw_dispatcher/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(tool_hw_dispatcher OBJECT ${TOOLS_HW_DISPATCH_SRC})
 
 target_include_directories(tool_hw_dispatcher
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        PRIVATE $<TARGET_PROPERTY:tool_common,INTERFACE_INCLUDE_DIRECTORIES>
         PRIVATE $<TARGET_PROPERTY:qpl,INTERFACE_INCLUDE_DIRECTORIES>)
 
 set_target_properties(tool_hw_dispatcher PROPERTIES

diff --git a/tools/utils/hw_dispatcher/test_hw_device.cpp b/tools/utils/hw_dispatcher/test_hw_device.cpp
@@ -16,6 +16,8 @@
 #include <queue>
 
 #include "test_hw_device.hpp"
+
+// tool_common
 #include "topology.hpp"
 
 constexpr uint8_t  accelerator_name[]      = "iax";                         /**< Accelerator name */