Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sysman for Windows: Fix Free memory from get state. 

KMD no longer tracks allocation, move to use OS functions.

Signed-off-by: Daniel Enriquez <daniel.enriquez.montanez@intel.com>
This commit is contained in:
Daniel Enriquez 2021-08-03 20:14:47 -07:00 committed by Compute-Runtime-Automation
parent 0de69b45a6
commit 2f0fcf4aee
3 changed files with 88 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
level_zero/tools/source/sysman/memory/windows/os_memory_imp.cpp
View File

@ -7,6 +7,35 @@
#include "sysman/memory/windows/os_memory_imp.h"
template <typename I>
std::string intToHex(I w, size_t hexLength = sizeof(I) << 1) {
static const char *digits = "0123456789ABCDEF";
std::string retString(hexLength, '0');
constexpr uint32_t intSize = sizeof(uint32_t);
for (size_t i = 0, j = (hexLength - 1) * intSize; i < hexLength; ++i, j -= intSize)
retString[i] = digits[(w >> j) & 0x0f];
return (std::string("0x") + retString);
}
std::wstring toWString(std::string str) {
std::wstring wsTmp(str.begin(), str.end());
return wsTmp;
}
std::wstring constructCounterStr(std::wstring object, std::wstring counter, LUID luid, uint32_t index) {
std::wstring fstr = L"\\";
fstr += object;
fstr += L"(luid_";
fstr += toWString(intToHex((long)luid.HighPart));
fstr += L"_";
fstr += toWString(intToHex((unsigned long)luid.LowPart));
fstr += L"_phys_";
fstr += std::to_wstring(index);
fstr += L")\\";
fstr += counter;
return fstr;
}
namespace L0 {
bool WddmMemoryImp::isMemoryModuleSupported() {
uint32_t value = 0;
@ -176,16 +205,24 @@ ze_result_t WddmMemoryImp::getState(zes_mem_state_t *pState) {
memcpy_s(&valueLarge, sizeof(uint64_t), response.dataBuffer, sizeof(uint64_t));
pState->size = valueLarge;
request.requestId = KmdSysman::Requests::Memory::CurrentFreeMemorySize;
status = pKmdSysManager->requestSingle(request, response);
if (status != ZE_RESULT_SUCCESS) {
return status;
if (!pdhInitialized) {
if (pdhOpenQuery && pdhOpenQuery(NULL, NULL, &gpuQuery) == ERROR_SUCCESS) {
pdhInitialized = true;
}
}
memcpy_s(&valueLarge, sizeof(uint64_t), response.dataBuffer, sizeof(uint64_t));
pState->free = valueLarge;
if (!pdhCounterAdded && pdhAddEnglishCounterW && pKmdSysManager->GetWddmAccess()) {
std::wstring counterStr = constructCounterStr(L"GPU Adapter Memory", L"Dedicated Usage", pKmdSysManager->GetWddmAccess()->getAdapterLuid(), 0);
pdhCounterAdded = (pdhAddEnglishCounterW(gpuQuery, counterStr.c_str(), NULL, &dedicatedUsage) == ERROR_SUCCESS);
}
if (pdhCounterAdded && pdhCollectQueryData && pdhGetFormattedCounterValue) {
PDH_FMT_COUNTERVALUE counterVal;
pdhCollectQueryData(gpuQuery);
pdhGetFormattedCounterValue(dedicatedUsage, PDH_FMT_LARGE, NULL, &counterVal);
valueLarge = counterVal.largeValue;
pState->free = pState->size - valueLarge;
}
return ZE_RESULT_SUCCESS;
}
@ -194,6 +231,25 @@ WddmMemoryImp::WddmMemoryImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_
WddmSysmanImp *pWddmSysmanImp = static_cast<WddmSysmanImp *>(pOsSysman);
pKmdSysManager = &pWddmSysmanImp->getKmdSysManager();
pDevice = pWddmSysmanImp->getDeviceHandle();
hGetProcPDH = LoadLibrary(L"C:\\Windows\\System32\\pdh.dll");
if (hGetProcPDH) {
pdhOpenQuery = reinterpret_cast<fn_PdhOpenQueryW>(GetProcAddress(hGetProcPDH, "PdhOpenQueryW"));
pdhAddEnglishCounterW = reinterpret_cast<fn_PdhAddEnglishCounterW>(GetProcAddress(hGetProcPDH, "PdhAddEnglishCounterW"));
pdhCollectQueryData = reinterpret_cast<fn_PdhCollectQueryData>(GetProcAddress(hGetProcPDH, "PdhCollectQueryData"));
pdhGetFormattedCounterValue = reinterpret_cast<fn_PdhGetFormattedCounterValue>(GetProcAddress(hGetProcPDH, "PdhGetFormattedCounterValue"));
pdhCloseQuery = reinterpret_cast<fn_PdhCloseQuery>(GetProcAddress(hGetProcPDH, "PdhCloseQuery"));
}
}
WddmMemoryImp::~WddmMemoryImp() {
if (pdhInitialized && pdhCloseQuery) {
pdhCloseQuery(gpuQuery);
}
if (hGetProcPDH) {
FreeLibrary(hGetProcPDH);
}
}
OsMemory *OsMemory::create(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) {

25
level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2020-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -7,12 +7,21 @@
#pragma once
#include "shared/source/helpers/non_copyable_or_moveable.h"
#include "shared/source/os_interface/windows/wddm/wddm.h"
#include "level_zero/tools/source/sysman/sysman_const.h"
#include "sysman/memory/os_memory.h"
#include "sysman/windows/os_sysman_imp.h"
#include <pdh.h>
typedef PDH_STATUS(__stdcall *fn_PdhOpenQueryW)(LPCWSTR szDataSource, DWORD_PTR dwUserData, PDH_HQUERY *phQuery);
typedef PDH_STATUS(__stdcall *fn_PdhAddEnglishCounterW)(PDH_HQUERY hQuery, LPCWSTR szFullCounterPath, DWORD_PTR dwUserData, PDH_HCOUNTER *phCounter);
typedef PDH_STATUS(__stdcall *fn_PdhCollectQueryData)(PDH_HQUERY hQuery);
typedef PDH_STATUS(__stdcall *fn_PdhGetFormattedCounterValue)(PDH_HCOUNTER hCounter, DWORD dwFormat, LPDWORD lpdwType, PPDH_FMT_COUNTERVALUE pValue);
typedef PDH_STATUS(__stdcall *fn_PdhCloseQuery)(PDH_HQUERY hQuery);
namespace L0 {
class KmdSysManager;
@ -24,13 +33,25 @@ class WddmMemoryImp : public OsMemory, NEO::NonCopyableOrMovableClass {
bool isMemoryModuleSupported() override;
WddmMemoryImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId);
WddmMemoryImp() = default;
~WddmMemoryImp() override = default;
~WddmMemoryImp();
protected:
KmdSysManager *pKmdSysManager = nullptr;
Device *pDevice = nullptr;
bool isSubdevice = false;
uint32_t subdeviceId = 0;
fn_PdhOpenQueryW pdhOpenQuery = nullptr;
fn_PdhAddEnglishCounterW pdhAddEnglishCounterW = nullptr;
fn_PdhCollectQueryData pdhCollectQueryData = nullptr;
fn_PdhGetFormattedCounterValue pdhGetFormattedCounterValue = nullptr;
fn_PdhCloseQuery pdhCloseQuery = nullptr;
bool pdhInitialized = false;
bool pdhCounterAdded = false;
PDH_HQUERY gpuQuery = nullptr;
PDH_HCOUNTER dedicatedUsage = nullptr;
HINSTANCE hGetProcPDH = nullptr;
};
} // namespace L0

1
level_zero/tools/source/sysman/windows/kmd_sys_manager.h
View File

@ -26,6 +26,7 @@ class KmdSysManager {
MOCKABLE_VIRTUAL ze_result_t requestSingle(KmdSysman::RequestProperty &In, KmdSysman::ResponseProperty &Out);
ze_result_t requestMultiple(std::vector<KmdSysman::RequestProperty> &vIn, std::vector<KmdSysman::ResponseProperty> &vOut);
NEO::Wddm *GetWddmAccess() { return pWddmAccess; }
private:
MOCKABLE_VIRTUAL bool escape(uint32_t escapeOp, uint64_t pDataIn, uint32_t dataInSize, uint64_t pDataOut, uint32_t dataOutSize);