intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve Wddm Residency logging

Browse Source 
Related-To: NEO-4338

Change-Id: I5fefa1da6188befe27928b6bbfcc7bac89a6aef2
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2020-03-23 16:37:41 +01:00
committed by sys_ocldev
parent d96e462754
commit 4bc680477c
11 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shared/source/os_interface/windows/wddm/wddm.cpp
View File

@@ -347,11 +347,11 @@ bool Wddm::makeResident(const D3DKMT_HANDLE *handles, uint32_t count, bool cantT
status = getGdi()->makeResident(&makeResident);
if (status == STATUS_PENDING) {
perfLogResidencyMakeResident(residencyLogger.get(), true);
perfLogResidencyMakeResident(residencyLogger.get(), true, makeResident.PagingFenceValue);
updatePagingFenceValue(makeResident.PagingFenceValue);
success = true;
} else if (status == STATUS_SUCCESS) {
perfLogResidencyMakeResident(residencyLogger.get(), false);
perfLogResidencyMakeResident(residencyLogger.get(), false, makeResident.PagingFenceValue);
success = true;
} else {
DEBUG_BREAK_IF(true);
@@ -1000,11 +1000,11 @@ bool Wddm::configureDeviceAddressSpace() {
}
void Wddm::waitOnPagingFenceFromCpu() {
perfLogStartWaitTime(residencyLogger.get());
perfLogStartWaitTime(residencyLogger.get(), currentPagingFenceValue);
while (currentPagingFenceValue > *getPagingFenceAddress())
perfLogResidencyEnteredWait(residencyLogger.get());
perfLogResidencyWaitPagingeFenceLog(residencyLogger.get());
perfLogResidencyWaitPagingeFenceLog(residencyLogger.get(), *getPagingFenceAddress());
}
void Wddm::setGmmInputArg(void *args) {

39
shared/source/os_interface/windows/wddm/wddm_residency_logger.h
View File

@@ -37,24 +37,30 @@ class WddmResidencyLogger {
fPagingLog("residency for: handles %u size %zu\n", count, size);
}
void makeResidentLog(bool pendingMakeResident) {
void makeResidentLog(bool pendingMakeResident, UINT64 makeResidentPagingFence) {
this->pendingMakeResident = pendingMakeResident;
this->makeResidentPagingFence = makeResidentPagingFence;
makeResidentCall = true;
pendingTime = std::chrono::high_resolution_clock::now();
}
void startWaitTime() {
MOCKABLE_VIRTUAL void startWaitTime(UINT64 startWaitPagingFence) {
waitStartTime = std::chrono::high_resolution_clock::now();
this->startWaitPagingFence = startWaitPagingFence;
}
void enteredWait() {
enterWait = true;
}
void waitPagingeFenceLog() {
void waitPagingeFenceLog(UINT64 stopWaitPagingFence) {
endTime = std::chrono::high_resolution_clock::now();
int64_t timeDiff = 0;
fPagingLog("makeResidentPagingFence: %x startWaitPagingFence: %x stopWaitPagingFence: %lld\n",
makeResidentPagingFence,
startWaitPagingFence,
stopWaitPagingFence);
timeDiff = std::chrono::duration_cast<std::chrono::microseconds>(endTime - pendingTime).count();
fPagingLog("makeResidentCall: %x pending return: %x delta time makeResident: %lld\n",
@@ -67,6 +73,8 @@ class WddmResidencyLogger {
makeResidentCall = false;
enterWait = false;
makeResidentPagingFence = 0;
startWaitPagingFence = 0;
}
void trimRequired(UINT64 numBytesToTrim) {
@@ -81,19 +89,24 @@ class WddmResidencyLogger {
va_end(args);
}
bool pendingMakeResident = false;
bool enterWait = false;
bool makeResidentCall = false;
FILE *pagingLog = nullptr;
std::chrono::high_resolution_clock::time_point pendingTime;
std::chrono::high_resolution_clock::time_point waitStartTime;
std::chrono::high_resolution_clock::time_point endTime;
UINT64 makeResidentPagingFence = 0ull;
UINT64 startWaitPagingFence = 0ull;
FILE *pagingLog = nullptr;
bool pendingMakeResident = false;
bool enterWait = false;
bool makeResidentCall = false;
};
inline void perfLogResidencyMakeResident(WddmResidencyLogger *log, bool pendingMakeResident) {
inline void perfLogResidencyMakeResident(WddmResidencyLogger *log, bool pendingMakeResident, UINT64 makeResidentPagingFence) {
if (residencyLoggingAvailable) {
if (log) {
log->makeResidentLog(pendingMakeResident);
log->makeResidentLog(pendingMakeResident, makeResidentPagingFence);
}
}
}
@@ -106,10 +119,10 @@ inline void perfLogResidencyReportAllocations(WddmResidencyLogger *log, uint32_t
}
}
inline void perfLogStartWaitTime(WddmResidencyLogger *log) {
inline void perfLogStartWaitTime(WddmResidencyLogger *log, UINT64 startWaitPagingFence) {
if (residencyLoggingAvailable) {
if (log) {
log->startWaitTime();
log->startWaitTime(startWaitPagingFence);
}
}
}
@@ -122,10 +135,10 @@ inline void perfLogResidencyEnteredWait(WddmResidencyLogger *log) {
}
}
inline void perfLogResidencyWaitPagingeFenceLog(WddmResidencyLogger *log) {
inline void perfLogResidencyWaitPagingeFenceLog(WddmResidencyLogger *log, UINT64 stopWaitPagingFence) {
if (residencyLoggingAvailable) {
if (log) {
log->waitPagingeFenceLog();
log->waitPagingeFenceLog(stopWaitPagingFence);
}
}
}