Skip to content

Update residency budget after UpdateVideoMemorySegments. #326

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
May 13, 2022
Merged

Update residency budget after UpdateVideoMemorySegments. #326

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
35 changes: 21 additions & 14 deletions src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,25 @@ namespace gpgmm { namespace d3d12 {
// Set the initial video memory limits per segment.
ReturnIfFailed(residencyManager->UpdateVideoMemorySegments());

// D3D12 has non-zero memory usage even before any resources have been created, and this
// value can vary by OS enviroment. By adding this in addition to the artificial budget
// limit, we can create a predictable and reproducible budget.
if (descriptor.Budget > 0) {
DXGI_QUERY_VIDEO_MEMORY_INFO* localVideoMemorySegmentInfo =
residencyManager->GetVideoMemorySegmentInfo(DXGI_MEMORY_SEGMENT_GROUP_LOCAL);

localVideoMemorySegmentInfo->Budget =
localVideoMemorySegmentInfo->CurrentUsage + descriptor.Budget;
if (!descriptor.IsUMA) {
DXGI_QUERY_VIDEO_MEMORY_INFO* nonLocalVideoMemorySegmentInfo =
residencyManager->GetVideoMemorySegmentInfo(
DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL);

nonLocalVideoMemorySegmentInfo->Budget =
nonLocalVideoMemorySegmentInfo->CurrentUsage + descriptor.Budget;
}
}

*residencyManagerOut = residencyManager.release();

return S_OK;
Expand All @@ -61,7 +80,7 @@ namespace gpgmm { namespace d3d12 {
mFence(std::move(fence)),
mVideoMemoryBudget(descriptor.VideoMemoryBudget == 0 ? kDefaultVideoMemoryBudget
: descriptor.VideoMemoryBudget),
mBudget(descriptor.Budget),
mIsBudgetRestricted(descriptor.Budget > 0),
mEvictBatchSize(descriptor.EvictBatchSize == 0 ? kDefaultEvictBatchSize
: descriptor.EvictBatchSize),
mIsUMA(descriptor.IsUMA) {
Expand All @@ -70,18 +89,6 @@ namespace gpgmm { namespace d3d12 {
ASSERT(mDevice != nullptr);
ASSERT(mAdapter != nullptr);
ASSERT(mFence != nullptr);

// There is a non-zero memory usage even before any resources have been created, and this
// value can vary by enviroment. By adding this in addition to the artificial budget limit,
// we can create a predictable and reproducible budget.
if (mBudget > 0) {
mLocalVideoMemorySegment.Info.Budget =
mLocalVideoMemorySegment.Info.CurrentUsage + mBudget;
if (!descriptor.IsUMA) {
mNonLocalVideoMemorySegment.Info.Budget =
mNonLocalVideoMemorySegment.Info.CurrentUsage + mBudget;
}
}
}

ResidencyManager::~ResidencyManager() {
Expand Down Expand Up @@ -245,7 +252,7 @@ namespace gpgmm { namespace d3d12 {
queryVideoMemoryInfoOut.CurrentUsage - pVideoMemoryInfo->CurrentReservation;

// If we're restricting the budget, leave the budget as is.
if (mBudget == 0) {
if (!mIsBudgetRestricted) {
pVideoMemoryInfo->Budget = static_cast<uint64_t>(
(queryVideoMemoryInfoOut.Budget - pVideoMemoryInfo->CurrentReservation) *
mVideoMemoryBudget);
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResidencyManagerD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ namespace gpgmm { namespace d3d12 {
std::unique_ptr<Fence> mFence;

const float mVideoMemoryBudget;
const uint64_t mBudget;
const bool mIsBudgetRestricted;
const uint64_t mEvictBatchSize;
const bool mIsUMA;

Expand Down