Skip to content
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

Several Residency Manager improvements/fixes from UE5/The Coalition #837

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Several Residency Manager improvements/fixes from UE5/The Coalition #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a8120
Several Residency Manager improvements/fixes from UE5/The Coalition
wallisc Jul 31, 2023
92c48f8
One character fix
wallisc Jul 31, 2023
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: 3 additions & 1 deletion Samples/Desktop/D3D12Residency/src/D3D12Residency.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,10 @@ void D3D12Residency::PopulateCommandList(std::shared_ptr<ManagedCommandList> pMa
DXGI_QUERY_VIDEO_MEMORY_INFO memoryInfo = {};
ThrowIfFailed(m_adapter->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memoryInfo));

UINT64 unused, EvictedMemoryInBytes;
m_residencyManager.QueryResidencyStats(unused, EvictedMemoryInBytes);
WCHAR message[200];
swprintf_s(message, L"Total Allocated: %llu MB | Budget: %llu MB | Using: %llu MB", m_totalAllocations >> 20, memoryInfo.Budget >> 20, memoryInfo.CurrentUsage >> 20);
swprintf_s(message, L"Total Allocated: %llu MB | Budget: %llu MB | Using: %llu MB | Evicted: %llu MB", m_totalAllocations >> 20, memoryInfo.Budget >> 20, memoryInfo.CurrentUsage >> 20, EvictedMemoryInBytes >> 20);
this->SetCustomWindowText(message);

auto commandList = pManagedCommandList->commandList;
Expand Down
41 changes: 37 additions & 4 deletions Samples/Desktop/D3D12Residency/src/d3dx12Residency.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ namespace D3DX12Residency
LRUCache() :
NumResidentObjects(0),
NumEvictedObjects(0),
EvictedSize(0),
ResidentSize(0)
{
Internal::InitializeListHead(&ResidentObjectListHead);
Expand All @@ -522,6 +523,7 @@ namespace D3DX12Residency
{
Internal::InsertHeadList(&EvictedObjectListHead, &pObject->ListEntry);
NumEvictedObjects++;
EvictedSize += pObject->Size;
}
}

Expand All @@ -536,6 +538,7 @@ namespace D3DX12Residency
else
{
NumEvictedObjects--;
EvictedSize -= pObject->Size;
}
}

Expand All @@ -561,6 +564,7 @@ namespace D3DX12Residency
NumEvictedObjects--;
NumResidentObjects++;
ResidentSize += pObject->Size;
EvictedSize -= pObject->Size;
}

void Evict(ManagedObject* pObject)
Expand All @@ -574,6 +578,7 @@ namespace D3DX12Residency
NumResidentObjects--;
ResidentSize -= pObject->Size;
NumEvictedObjects++;
EvictedSize += pObject->Size;
}

// Evict all of the resident objects used in sync points up to the specficied one (inclusive)
Expand Down Expand Up @@ -640,6 +645,7 @@ namespace D3DX12Residency
UINT32 NumEvictedObjects;

UINT64 ResidentSize;
UINT64 EvictedSize;
};

class ResidencyManagerInternal
Expand Down Expand Up @@ -896,6 +902,13 @@ namespace D3DX12Residency
return hr;
}

UINT64 LocalMemoryBudgetLimit = ~0ull;

void QueryResidencyStats(UINT64& ResidentMemoryInBytes, UINT64& EvictedMemoryInBytes)
{
ResidentMemoryInBytes = LRU.ResidentSize;
EvictedMemoryInBytes = LRU.EvictedSize;
}
private:
HRESULT GetFence(ID3D12CommandQueue *Queue, Internal::Fence *&QueueFence)
{
Expand Down Expand Up @@ -1198,6 +1211,10 @@ namespace D3DX12Residency
GetCurrentBudget(&LocalMemory, DXGI_MEMORY_SEGMENT_GROUP_LOCAL);

UINT64 EvictionGracePeriod = GetCurrentEvictionGracePeriod(&LocalMemory);
if (LocalMemoryBudgetLimit == 0)
{
EvictionGracePeriod = 0;
}
LRU.TrimAgedAllocations(FirstUncompletedSyncPoint, pEvictionList, NumObjectsToEvict, CurrentTime.QuadPart, EvictionGracePeriod);

if (NumObjectsToEvict)
Expand Down Expand Up @@ -1296,8 +1313,8 @@ namespace D3DX12Residency
if (Device3)
{
hr = Device3->EnqueueMakeResident(D3D12_RESIDENCY_FLAG_NONE,
NumObjectsInBatch,
&pMakeResidentList[BatchStart].pUnderlying,
NumObjects,
&pMakeResidentList[MakeResidentIndex].pUnderlying,
AsyncThreadFence.pFence,
AsyncThreadFence.FenceValue + 1);
if (SUCCEEDED(hr))
Expand Down Expand Up @@ -1329,7 +1346,9 @@ namespace D3DX12Residency
// Wait until the GPU is done
WaitForSyncPoint(GenerationToWaitFor);

LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);
LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident),
LocalMemoryBudgetLimit == 0 ? 0 : TotalBudget,
pEvictionList, NumObjectsToEvict, GenerationToWaitFor);

RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));
}
Expand Down Expand Up @@ -1406,6 +1425,10 @@ namespace D3DX12Residency
RESIDENCY_CHECK_RESULT(DeviceDownlevel->QueryVideoMemoryInfo(NodeIndex, Segment, InfoOut));
}
#endif
if (Segment == DXGI_MEMORY_SEGMENT_GROUP_LOCAL)
{
InfoOut->Budget = RESIDENCY_MIN(LocalMemoryBudgetLimit, InfoOut->Budget);
}
}

HRESULT EnqueueSyncPoint()
Expand Down Expand Up @@ -1613,8 +1636,18 @@ namespace D3DX12Residency
delete(pSet);
}

FORCEINLINE void QueryResidencyStats(UINT64& ResidentMemoryInBytes, UINT64& EvictedMemoryInBytes)
{
Manager.QueryResidencyStats(ResidentMemoryInBytes, EvictedMemoryInBytes);
}

void SetLocalMemoryBudgetLimit(UINT64 InLocalMemoryBudgetLimit)
{
Manager.LocalMemoryBudgetLimit = InLocalMemoryBudgetLimit;
}

private:
Internal::ResidencyManagerInternal Manager;
Internal::SyncManager SyncManager;
};
};
};