From acf5a37af483fccb567cf1bd8303ed5d73c532ed Mon Sep 17 00:00:00 2001
From: "Bernhart, Bryan" <bryan.bernhart@intel.com>
Date: Thu, 30 Mar 2023 12:43:57 -0700
Subject: [PATCH] Skip eviction checks when budget wasn't updated during tests.

---
 .../end2end/D3D12ResidencyManagerTests.cpp    | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/tests/end2end/D3D12ResidencyManagerTests.cpp b/src/tests/end2end/D3D12ResidencyManagerTests.cpp
index 0836e9772..f059ddec8 100644
--- a/src/tests/end2end/D3D12ResidencyManagerTests.cpp
+++ b/src/tests/end2end/D3D12ResidencyManagerTests.cpp
@@ -77,6 +77,11 @@ class D3D12ResidencyManagerTests : public D3D12TestBase, public ::testing::Test
                                                        : 0;
     }
 
+    DXGI_MEMORY_SEGMENT_GROUP GetMemorySegmentGroup(D3D12_HEAP_TYPE heapType) const {
+        D3D12_HEAP_PROPERTIES heapProperties = mDevice->GetCustomHeapProperties(0, heapType);
+        return ::GetMemorySegmentGroup(heapProperties.MemoryPoolPreference, mCaps->IsAdapterUMA());
+    }
+
     class CreateDescHeapCallbackContext {
       public:
         CreateDescHeapCallbackContext(ID3D12Device* device, D3D12_DESCRIPTOR_HEAP_DESC descHeapDesc)
@@ -496,6 +501,13 @@ TEST_F(D3D12ResidencyManagerTests, OverBudget) {
         allocationsAboveBudget.push_back(std::move(allocation));
     }
 
+    // Budget updates are not occuring frequently enough to detect going over budget will evict the
+    // same amount.
+    if (GetBudgetLeft(residencyManager.Get(),
+                      GetMemorySegmentGroup(bufferAllocationDesc.HeapType)) > 0) {
+        return;
+    }
+
     // Created allocations above the budget should become resident.
     for (auto& allocation : allocationsAboveBudget) {
         EXPECT_TRUE(allocation->GetMemory()->GetInfo().IsCachedForResidency);
@@ -526,11 +538,8 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetAsync) {
     ALLOCATION_DESC bufferAllocationDesc = {};
     bufferAllocationDesc.HeapType = D3D12_HEAP_TYPE_DEFAULT;
 
-    D3D12_HEAP_PROPERTIES heapProperties =
-        mDevice->GetCustomHeapProperties(0, bufferAllocationDesc.HeapType);
-
     const DXGI_MEMORY_SEGMENT_GROUP bufferMemorySegment =
-        GetMemorySegmentGroup(heapProperties.MemoryPoolPreference, mCaps->IsAdapterUMA());
+        GetMemorySegmentGroup(bufferAllocationDesc.HeapType);
 
     const uint64_t memoryUnderBudget = GetBudgetLeft(residencyManager.Get(), bufferMemorySegment);
 
@@ -632,6 +641,13 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetWithLockedHeaps) {
         EXPECT_EQ(allocation->GetMemory()->GetInfo().IsLocked, true);
     }
 
+    // Budget updates are not occuring frequently enough to detect going over budget will evict the
+    // same amount.
+    if (GetBudgetLeft(residencyManager.Get(),
+                      GetMemorySegmentGroup(bufferAllocationDesc.HeapType)) > 0) {
+        return;
+    }
+
     // Since locked heaps are ineligable for eviction and HEAP_FLAG_ALWAYS_IN_BUDGET is true,
     // CreateResource should always fail since there is not enough budget.
     ASSERT_FAILED(resourceAllocator->CreateResource(bufferAllocationDesc, bufferDesc,
@@ -681,6 +697,12 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetExecuteCommandList) {
         secondSetOfHeaps.push_back(std::move(allocation));
     }
 
+    // Budget updates are not occuring frequently enough to detect going over budget will evict the
+    // same amount.
+    if (GetBudgetLeft(residencyManager.Get(), GetMemorySegmentGroup(D3D12_HEAP_TYPE_DEFAULT)) > 0) {
+        return;
+    }
+
     // Page-in the first set of heaps using ExecuteCommandLists (and page-out the second set).
     ComPtr<IResidencyList> firstSetOfHeapsWorkingSet;
     ASSERT_SUCCEEDED(CreateResidencyList(&firstSetOfHeapsWorkingSet));
@@ -799,6 +821,12 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetImported) {
         EXPECT_TRUE(allocation->GetMemory()->GetInfo().IsCachedForResidency);
     }
 
+    // Budget updates are not occuring frequently enough to detect going over budget will evict the
+    // same amount.
+    if (GetBudgetLeft(residencyManager.Get(), GetMemorySegmentGroup(D3D12_HEAP_TYPE_DEFAULT)) > 0) {
+        return;
+    }
+
     // Created allocations below the budget should NOT become resident.
     for (auto& allocation : allocationsBelowBudget) {
         EXPECT_FALSE(allocation->GetMemory()->GetInfo().IsCachedForResidency);