From 273a9211acd236c74e58dc5db17d3d65b62319c4 Mon Sep 17 00:00:00 2001
From: Bryan Bernhart <bryan.bernhart@intel.com>
Date: Sat, 16 Jul 2022 11:37:52 -0700
Subject: [PATCH] Hookup RESIDENCY_DESC::IsUMA to D3D12EventTraceReplay.

---
 src/gpgmm/d3d12/ResidencyManagerD3D12.cpp     |  4 ++--
 src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp    |  2 +-
 .../D3D12EventTraceReplay.cpp                 | 21 +++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp b/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
index 4212638d3..f0bd2ca85 100644
--- a/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
+++ b/src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
@@ -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).";
         }
@@ -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).";
 
diff --git a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
index 90cef4182..d613a7a65 100644
--- a/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
+++ b/src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
@@ -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;
diff --git a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp b/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
index 1068e2853..ef242ba79 100644
--- a/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
+++ b/src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
@@ -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);