diff --git a/level_zero/sysman/source/shared/linux/sysman_kmd_interface_xe.cpp b/level_zero/sysman/source/shared/linux/sysman_kmd_interface_xe.cpp index 2cd8e8098f..521d967f7c 100644 --- a/level_zero/sysman/source/shared/linux/sysman_kmd_interface_xe.cpp +++ b/level_zero/sysman/source/shared/linux/sysman_kmd_interface_xe.cpp @@ -83,7 +83,8 @@ std::string SysmanKmdInterfaceXe::getSysfsFilePathForPhysicalMemorySize(uint32_t } int64_t SysmanKmdInterfaceXe::getEngineActivityFd(zes_engine_group_t engineGroup, uint32_t engineInstance, uint32_t subDeviceId, PmuInterface *const &pPmuInterface) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; + constexpr int64_t fd = -1; + return fd; } std::string SysmanKmdInterfaceXe::getHwmonName(uint32_t subDeviceId, bool isSubdevice) const { diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_xe.cpp b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_xe.cpp index d47191ed2f..850a24ebf7 100644 --- a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_xe.cpp +++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine_xe.cpp @@ -18,8 +18,6 @@ namespace L0 { namespace Sysman { namespace ult { -constexpr uint32_t handleEngineCount = 10u; - class ZesEngineFixtureXe : public SysmanDeviceFixture { protected: L0::Sysman::SysmanDevice *device = nullptr; @@ -77,77 +75,20 @@ class ZesEngineFixtureXe : public SysmanDeviceFixture { } }; -TEST_F(ZesEngineFixtureXe, GivenComponentCountZeroWhenCallingzesDeviceEnumEngineGroupsThenNonZeroCountIsReturnedAndVerifyCallSucceeds) { +TEST_F(ZesEngineFixtureXe, GivenComponentCountZeroWhenCallingzesDeviceEnumEngineGroupsThenZeroCountIsReturnedAndVerifyCallSucceeds) { uint32_t count = 0; EXPECT_EQ(ZE_RESULT_SUCCESS, zesDeviceEnumEngineGroups(device->toHandle(), &count, NULL)); - EXPECT_EQ(count, handleEngineCount); + EXPECT_EQ(count, 0u); uint32_t testcount = count + 1; EXPECT_EQ(ZE_RESULT_SUCCESS, zesDeviceEnumEngineGroups(device->toHandle(), &testcount, NULL)); - EXPECT_EQ(testcount, count); + EXPECT_EQ(testcount, 0u); count = 0; std::vector handles(count, nullptr); EXPECT_EQ(zesDeviceEnumEngineGroups(device->toHandle(), &count, handles.data()), ZE_RESULT_SUCCESS); - EXPECT_EQ(count, handleEngineCount); -} - -TEST_F(ZesEngineFixtureXe, GivenValidEngineHandlesWhenCallingZesEngineGetPropertiesThenVerifyCallSucceeds) { - zes_engine_properties_t properties; - auto handle = getEngineHandles(handleEngineCount); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[0], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_ALL, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[1], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_MEDIA_ALL, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[2], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_COPY_ALL, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[3], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_RENDER_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[4], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_RENDER_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[5], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_MEDIA_DECODE_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[6], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_MEDIA_ENCODE_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[7], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_COPY_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[8], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_MEDIA_ENHANCEMENT_SINGLE, properties.type); - EXPECT_FALSE(properties.onSubdevice); - - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetProperties(handle[9], &properties)); - EXPECT_EQ(ZES_ENGINE_GROUP_RENDER_ALL, properties.type); - EXPECT_FALSE(properties.onSubdevice); -} - -TEST_F(ZesEngineFixtureXe, GivenValidEngineHandleAndIntegratedDeviceWhenCallingZesEngineGetActivityThenVerifyCallReturnsSuccess) { - zes_engine_stats_t stats = {}; - auto handles = getEngineHandles(handleEngineCount); - EXPECT_EQ(handleEngineCount, handles.size()); - - for (auto handle : handles) { - EXPECT_EQ(ZE_RESULT_SUCCESS, zesEngineGetActivity(handle, &stats)); - EXPECT_EQ(pPmuInterface->mockActiveTime / microSecondsToNanoSeconds, stats.activeTime); - EXPECT_EQ(pPmuInterface->mockTimestamp / microSecondsToNanoSeconds, stats.timestamp); - } + EXPECT_EQ(count, 0u); } TEST_F(ZesEngineFixtureXe, GivenValidEngineHandleWhenCallingZesEngineGetActivityAndperfEventOpenFailsThenVerifyEngineGetActivityReturnsFailure) { diff --git a/level_zero/sysman/test/unit_tests/sources/shared/linux/sysman_kmd_interface_tests_xe.cpp b/level_zero/sysman/test/unit_tests/sources/shared/linux/sysman_kmd_interface_tests_xe.cpp index 68f0615907..1f84c3a8b5 100644 --- a/level_zero/sysman/test/unit_tests/sources/shared/linux/sysman_kmd_interface_tests_xe.cpp +++ b/level_zero/sysman/test/unit_tests/sources/shared/linux/sysman_kmd_interface_tests_xe.cpp @@ -151,23 +151,23 @@ TEST_F(SysmanFixtureDeviceXe, GivenSysmanKmdInterfaceInstanceWhenCallingGetNativ EXPECT_EQ(SysmanKmdInterface::SysfsValueUnit::micro, pSysmanKmdInterface->getNativeUnit(SysfsName::sysfsNameDefaultPowerLimit)); } -TEST_F(SysmanFixtureDeviceXe, GivenGroupEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenUnsupportedFeatureIsReturned) { +TEST_F(SysmanFixtureDeviceXe, GivenGroupEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInvalidFdIsReturned) { VariableBackup mockReadLink(&NEO::SysCalls::sysCallsReadlink, &mockReadLinkSuccess); VariableBackup mockPread(&NEO::SysCalls::sysCallsPread, &mockReadSuccess); auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); - EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_ALL, 0, 0, pPmuInterface.get())); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_ALL, 0, 0, pPmuInterface.get()), 0); } -TEST_F(SysmanFixtureDeviceXe, GivenSingleEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenUnsupportedFeatureIsReturned) { +TEST_F(SysmanFixtureDeviceXe, GivenSingleEngineTypeAndSysmanKmdInterfaceInstanceWhenGetEngineActivityFdIsCalledThenInvalidFdIsReturned) { VariableBackup mockReadLink(&NEO::SysCalls::sysCallsReadlink, &mockReadLinkSuccess); VariableBackup mockPread(&NEO::SysCalls::sysCallsPread, &mockReadSuccess); auto pSysmanKmdInterface = pLinuxSysmanImp->pSysmanKmdInterface.get(); - EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_SINGLE, 0, 0, pPmuInterface.get())); + EXPECT_LT(pSysmanKmdInterface->getEngineActivityFd(ZES_ENGINE_GROUP_COMPUTE_SINGLE, 0, 0, pPmuInterface.get()), 0); } TEST_F(SysmanFixtureDeviceXe, GivenSysmanKmdInterfaceAndIsIntegratedDeviceInstanceWhenGetEventsIsCalledThenValidEventTypeIsReturned) {