From 8aa2eae965ab1d4a7c1d61fd74a0b8b7b95d6109 Mon Sep 17 00:00:00 2001 From: Pratik Bari Date: Tue, 29 Oct 2024 16:01:37 +0000 Subject: [PATCH] fix(sysman): Disabling Engine Handles for Group Engine Busyness The Group Engine Busyness Interface has been removed for the XeKmd Related-To: NEO-11931 Signed-off-by: Pratik Bari --- .../shared/linux/kmd_interface/CMakeLists.txt | 1 - .../kmd_interface/sysman_kmd_interface_xe.cpp | 3 +- .../sysman_kmd_interface_xe_pmu.cpp | 18 ---------- .../shared/linux/kmd_interface/CMakeLists.txt | 1 - .../test_sysman_kmd_interface_xe.cpp | 15 +++++++++ .../test_sysman_kmd_interface_xe_pmu.cpp | 33 ------------------- 6 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe_pmu.cpp delete mode 100644 level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe_pmu.cpp diff --git a/level_zero/sysman/source/shared/linux/kmd_interface/CMakeLists.txt b/level_zero/sysman/source/shared/linux/kmd_interface/CMakeLists.txt index 4992b17f0d..0110fc4124 100644 --- a/level_zero/sysman/source/shared/linux/kmd_interface/CMakeLists.txt +++ b/level_zero/sysman/source/shared/linux/kmd_interface/CMakeLists.txt @@ -11,7 +11,6 @@ if(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_interface_i915_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_interface_i915_upstream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_interface_xe.cpp - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/sysman_kmd_interface_xe_pmu.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_interface.h ) endif() \ No newline at end of file diff --git a/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe.cpp b/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe.cpp index 73b7485fb2..2fd56da1d0 100644 --- a/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe.cpp +++ b/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe.cpp @@ -94,8 +94,7 @@ std::string SysmanKmdInterfaceXe::getSysfsFilePathForPhysicalMemorySize(uint32_t } int64_t SysmanKmdInterfaceXe::getEngineActivityFd(zes_engine_group_t engineGroup, uint32_t engineInstance, uint32_t subDeviceId, PmuInterface *const &pPmuInterface) { - uint64_t config = getPmuEngineConfig(engineGroup, engineInstance, subDeviceId); - return pPmuInterface->pmuInterfaceOpen(config, -1, PERF_FORMAT_TOTAL_TIME_ENABLED); + return -1; } std::string SysmanKmdInterfaceXe::getHwmonName(uint32_t subDeviceId, bool isSubdevice) const { diff --git a/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe_pmu.cpp b/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe_pmu.cpp deleted file mode 100644 index f8a5ce1d9d..0000000000 --- a/level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface_xe_pmu.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2024 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "level_zero/sysman/source/shared/linux/kmd_interface/sysman_kmd_interface.h" - -namespace L0 { -namespace Sysman { - -uint64_t SysmanKmdInterfaceXe::getPmuEngineConfig(zes_engine_group_t engineGroup, uint32_t engineInstance, uint32_t subDeviceId) { - return UINT64_MAX; -} - -} // namespace Sysman -} // namespace L0 \ No newline at end of file diff --git a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/CMakeLists.txt b/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/CMakeLists.txt index aec9dfc00f..53a4b6bee9 100644 --- a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/CMakeLists.txt +++ b/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/CMakeLists.txt @@ -11,7 +11,6 @@ set(L0_SYSMAN_SHARED_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_kmd_interface_i915_prelim.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_kmd_interface_i915_upstream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_kmd_interface_xe.cpp - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/test_sysman_kmd_interface_xe_pmu.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysman_fixture_xe.h ) diff --git a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe.cpp b/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe.cpp index 892e62375d..4f2084f76b 100644 --- a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe.cpp +++ b/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe.cpp @@ -173,6 +173,21 @@ TEST_F(SysmanFixtureDeviceXe, GivenSysmanKmdInterfaceWhenCheckingWhetherClientIn EXPECT_TRUE(pSysmanKmdInterface->clientInfoAvailableInFdInfo()); } +TEST_F(SysmanFixtureDeviceXe, GivenGroupEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInValidFdIsReturned) { + auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); + + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_ALL, 0, 0, pPmuInterface.get()), 0); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_ALL, 0, 0, pPmuInterface.get()), 0); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COPY_ALL, 0, 0, pPmuInterface.get()), 0); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_RENDER_ALL, 0, 0, pPmuInterface.get()), 0); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_MEDIA_ALL, 0, 0, pPmuInterface.get()), 0); +} + +TEST_F(SysmanFixtureDeviceXe, GivenSingleEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInvalidFdIsReturned) { + auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_SINGLE, 0, 0, pPmuInterface.get()), 0); +} + } // namespace ult } // namespace Sysman } // namespace L0 \ No newline at end of file diff --git a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe_pmu.cpp b/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe_pmu.cpp deleted file mode 100644 index b23ed8eeb9..0000000000 --- a/level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/test_sysman_kmd_interface_xe_pmu.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2024 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "level_zero/sysman/test/unit_tests/sources/shared/linux/kmd_interface/mock_sysman_fixture_xe.h" - -#include "gtest/gtest.h" - -namespace L0 { -namespace Sysman { -namespace ult { - -TEST_F(SysmanFixtureDeviceXe, GivenGroupEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInValidFdIsReturned) { - auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); - - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_ALL, 0, 0, pPmuInterface.get()), 0); - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_ALL, 0, 0, pPmuInterface.get()), 0); - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COPY_ALL, 0, 0, pPmuInterface.get()), 0); - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_RENDER_ALL, 0, 0, pPmuInterface.get()), 0); - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_MEDIA_ALL, 0, 0, pPmuInterface.get()), 0); -} - -TEST_F(SysmanFixtureDeviceXe, GivenSingleEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInvalidFdIsReturned) { - auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); - EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_SINGLE, 0, 0, pPmuInterface.get()), 0); -} - -} // namespace ult -} // namespace Sysman -} // namespace L0 \ No newline at end of file