Skip to content

Disable background budgets by default. #875

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
Aug 4, 2023
Merged

Disable background budgets by default. #875

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
9 changes: 4 additions & 5 deletions include/gpgmm_d3d12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,12 @@ namespace gpgmm::d3d12 {
*/
RESIDENCY_FLAG_NONE = 0x0,

/** \brief Disables background memory budget updates from OS notifications.
/** \brief Allow background budget updates from OS notifications.

By default, memory budget updates will be pushed by the OS using a background thread. If
the OS does not support push notifications or budget updates are not frequent enough, this
mechanism can be disabled where a pull-based method is used instead.
By default, budget updates will be queried by the residency manager
instead of pushed by OS notifications using a background thread.
*/
RESIDENCY_FLAG_DISABLE_BACKGROUND_BUDGET_UPDATES = 0x1,
RESIDENCY_FLAG_ALLOW_BACKGROUND_BUDGET_UPDATES = 0x1,

/** \brief Specifies if unified memory architecture (UMA) is always disabled.

Expand Down
12 changes: 7 additions & 5 deletions src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,13 @@ namespace gpgmm::d3d12 {
std::unique_ptr<ResidencyManager> residencyManager = std::unique_ptr<ResidencyManager>(
new ResidencyManager(descriptor, pDevice, pAdapter, std::move(caps)));

// Require automatic video memory budget updates.
if (!(descriptor.Flags & RESIDENCY_FLAG_DISABLE_BACKGROUND_BUDGET_UPDATES)) {
GPGMM_RETURN_IF_FAILED(residencyManager->StartBudgetNotificationUpdates(), pDevice);
DebugLog(residencyManager.get(), MessageId::kBudgetUpdated)
<< "OS based memory budget updates were successfully enabled.";
// Enable automatic video memory budget updates.
if (descriptor.Flags & RESIDENCY_FLAG_ALLOW_BACKGROUND_BUDGET_UPDATES) {
if (FAILED(residencyManager->StartBudgetNotificationUpdates())) {
WarnLog(residencyManager.get(), MessageId::kBudgetUpdated)
<< "RESIDENCY_FLAG_ALLOW_BACKGROUND_BUDGET_UPDATES was requested but failed to "
"start.";
}
}

// Set the initial video memory limits.
Expand Down
5 changes: 1 addition & 4 deletions src/tests/end2end/D3D12ResidencyManagerTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ class D3D12ResidencyManagerTests : public D3D12TestBase, public ::testing::Test
RESIDENCY_MANAGER_DESC CreateBasicResidencyDesc(uint64_t budget) const {
RESIDENCY_MANAGER_DESC residencyDesc = D3D12TestBase::CreateBasicResidencyDesc();

// Disable automatic budget updates, since it occurs uncontrollably by the OS.
residencyDesc.Flags |= RESIDENCY_FLAG_DISABLE_BACKGROUND_BUDGET_UPDATES;

// Specify a restricted budget, the OS budget fluctuates unpredicatbly.
residencyDesc.MaxBudgetInBytes = budget;

Expand Down Expand Up @@ -554,7 +551,7 @@ TEST_F(D3D12ResidencyManagerTests, OverBudget) {
TEST_F(D3D12ResidencyManagerTests, OverBudgetAsync) {
constexpr uint64_t kBudgetIsDeterminedByOS = 0;
RESIDENCY_MANAGER_DESC residencyDesc = CreateBasicResidencyDesc(kBudgetIsDeterminedByOS);
residencyDesc.Flags ^= RESIDENCY_FLAG_DISABLE_BACKGROUND_BUDGET_UPDATES;
residencyDesc.Flags |= RESIDENCY_FLAG_ALLOW_BACKGROUND_BUDGET_UPDATES;

ComPtr<IResidencyManager> residencyManager;
ASSERT_SUCCEEDED(
Expand Down