mirror of
https://git.freebsd.org/ports.git
synced 2025-05-15 00:31:51 -04:00
1324bc28fd
Changes: https://github.com/intel/compute-runtime/compare/22.10.22597...22.11.22682 Reported by: GitHub (watch releases)
82 lines
3.5 KiB
Text
82 lines
3.5 KiB
Text
Limit PMU counters to Linux
|
|
|
|
In file included from level_zero/tools/source/sysman/linux/os_sysman_imp.cpp:8:
|
|
In file included from level_zero/tools/source/sysman/linux/os_sysman_imp.h:16:
|
|
level_zero/tools/source/sysman/linux/pmu/pmu_imp.h:12:10: fatal error: 'linux/perf_event.h' file not found
|
|
#include <linux/perf_event.h>
|
|
^~~~~~~~~~~~~~~~~~~~
|
|
|
|
--- level_zero/tools/source/sysman/engine/linux/CMakeLists.txt.orig 2022-03-09 15:02:18 UTC
|
|
+++ level_zero/tools/source/sysman/engine/linux/CMakeLists.txt
|
|
@@ -9,7 +9,7 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX
|
|
${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h
|
|
)
|
|
|
|
-if(NEO_ENABLE_i915_PRELIM_DETECTION)
|
|
+if(NEO_ENABLE_i915_PRELIM_DETECTION AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
list(APPEND L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX
|
|
${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp_prelim.cpp
|
|
)
|
|
--- level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp.orig 2021-03-24 20:23:19 UTC
|
|
+++ level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp
|
|
@@ -49,9 +49,11 @@ ze_result_t LinuxEngineImp::getActivity(zes_engine_sta
|
|
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
|
|
}
|
|
uint64_t data[2] = {};
|
|
+#ifdef __linux__
|
|
if (pPmuInterface->pmuRead(static_cast<int>(fd), data, sizeof(data)) < 0) {
|
|
return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
|
|
}
|
|
+#endif
|
|
// In data[], First u64 is "active time", And second u64 is "timestamp". Both in nanoseconds
|
|
pStats->activeTime = data[0] / microSecondsToNanoSeconds;
|
|
pStats->timestamp = data[1] / microSecondsToNanoSeconds;
|
|
@@ -66,9 +68,11 @@ ze_result_t LinuxEngineImp::getProperties(zes_engine_p
|
|
}
|
|
|
|
void LinuxEngineImp::init() {
|
|
+#ifdef __linux
|
|
auto i915EngineClass = engineToI915Map.find(engineGroup);
|
|
// I915_PMU_ENGINE_BUSY macro provides the perf type config which we want to listen to get the engine busyness.
|
|
fd = pPmuInterface->pmuInterfaceOpen(I915_PMU_ENGINE_BUSY(i915EngineClass->second, engineInstance), -1, PERF_FORMAT_TOTAL_TIME_ENABLED);
|
|
+#endif
|
|
}
|
|
|
|
LinuxEngineImp::LinuxEngineImp(OsSysman *pOsSysman, zes_engine_group_t type, uint32_t engineInstance) : engineGroup(type), engineInstance(engineInstance) {
|
|
--- level_zero/tools/source/sysman/linux/os_sysman_imp.cpp.orig 2021-11-20 20:51:51 UTC
|
|
+++ level_zero/tools/source/sysman/linux/os_sysman_imp.cpp
|
|
@@ -38,9 +38,11 @@ ze_result_t LinuxSysmanImp::init() {
|
|
}
|
|
DEBUG_BREAK_IF(nullptr == pSysfsAccess);
|
|
|
|
+#ifdef __linux__
|
|
pPmuInterface = PmuInterface::create(this);
|
|
|
|
DEBUG_BREAK_IF(nullptr == pPmuInterface);
|
|
+#endif
|
|
|
|
if (pFwUtilInterface == nullptr) {
|
|
createFwUtilInterface();
|
|
--- level_zero/tools/source/sysman/linux/os_sysman_imp.h.orig 2021-10-01 16:31:56 UTC
|
|
+++ level_zero/tools/source/sysman/linux/os_sysman_imp.h
|
|
@@ -14,7 +14,9 @@
|
|
#include "level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h"
|
|
#include "level_zero/tools/source/sysman/linux/fs_access.h"
|
|
#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
|
|
+#ifdef __linux__
|
|
#include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
|
|
+#endif
|
|
#include "level_zero/tools/source/sysman/sysman_imp.h"
|
|
|
|
#include <map>
|
|
--- level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt.orig 2020-09-11 07:53:58 UTC
|
|
+++ level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt
|
|
@@ -9,7 +9,7 @@ set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMU
|
|
${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/pmu.h
|
|
)
|
|
-if(UNIX)
|
|
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
target_sources(${L0_STATIC_LIB_NAME}
|
|
PRIVATE
|
|
${L0_SRCS_TOOLS_SYSMAN_LINUX_PMU}
|