Skip to content

Hookup RESIDENCY_DESC::IsUMA to D3D12EventTraceReplay. #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2022
Merged

Hookup RESIDENCY_DESC::IsUMA to D3D12EventTraceReplay. #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ namespace gpgmm::d3d12 {
const uint32_t objectEvictCount = static_cast<uint32_t>(objectsToEvict.size());
ReturnIfFailed(mDevice->Evict(objectEvictCount, objectsToEvict.data()));

InfoEvent("GPU page-out", EventMessageId::BudgetExceeded)
DebugEvent("GPU page-out", EventMessageId::BudgetExceeded)
<< "Number of allocations: " << objectsToEvict.size() << " (" << evictedSizeInBytes
<< " bytes).";
}
Expand Down Expand Up @@ -658,7 +658,7 @@ namespace gpgmm::d3d12 {

ReturnIfFailed(EvictInternal(sizeToMakeResident, memorySegmentGroup, nullptr));

InfoEvent("GPU page-in", EventMessageId::BudgetExceeded)
DebugEvent("GPU page-in", EventMessageId::BudgetExceeded)
<< "Number of allocations: " << numberOfObjectsToMakeResident << " ("
<< sizeToMakeResident << " bytes).";

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ namespace gpgmm::d3d12 {
if (allocation == nullptr) {
// NeverAllocate always fails, so suppress it.
if (!request.NeverAllocate) {
InfoEvent(allocator->GetTypename(), EventMessageId::AllocatorFailed)
DebugEvent(allocator->GetTypename(), EventMessageId::AllocatorFailed)
<< "Failed to allocate memory for request";
}
return E_FAIL;
Expand Down
21 changes: 10 additions & 11 deletions src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,25 +299,24 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
const Json::Value& snapshot = event["args"]["snapshot"];
ASSERT_FALSE(snapshot.empty());

if (GetLogLevel() <= gpgmm::LogSeverity::Warning &&
mIsUMA != snapshot["IsUMA"].asBool() && iterationIndex == 0) {
gpgmm::WarningLog()
<< "Capture device does not match playback device (IsUMA: " +
std::to_string(snapshot["IsUMA"].asBool()) + " vs " +
std::to_string(mIsUMA) + ").";
GPGMM_SKIP_TEST_IF(envParams.IsSameCapsRequired);
}

RESIDENCY_DESC residencyDesc = {};
residencyDesc.Device = mDevice;
residencyDesc.Adapter = mAdapter;
residencyDesc.IsUMA = mIsUMA;
residencyDesc.IsUMA = snapshot["IsUMA"].asBool();
residencyDesc.VideoMemoryBudget = snapshot["VideoMemoryBudget"].asFloat();
residencyDesc.Budget = snapshot["Budget"].asUInt64();
residencyDesc.EvictBatchSize = snapshot["EvictBatchSize"].asUInt64();
residencyDesc.InitialFenceValue = snapshot["InitialFenceValue"].asUInt64();

if (GetLogLevel() <= gpgmm::LogSeverity::Warning &&
residencyDesc.IsUMA != snapshot["IsUMA"].asBool() &&
iterationIndex == 0) {
gpgmm::WarningLog()
<< "Capture device does not match playback device (IsUMA: " +
std::to_string(snapshot["IsUMA"].asBool()) + " vs " +
std::to_string(residencyDesc.IsUMA) + ").";
GPGMM_SKIP_TEST_IF(envParams.IsSameCapsRequired);
}

if (envParams.CaptureEventMask != 0) {
residencyDesc.RecordOptions.Flags |=
static_cast<EVENT_RECORD_FLAGS_TYPE>(envParams.CaptureEventMask);
Expand Down