Skip to content

Fix replay failures due to wrong creation-snapshot sequence by ResourceAllocator. #630

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
Sep 17, 2022
Merged

Fix replay failures due to wrong creation-snapshot sequence by ResourceAllocator. #630

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
10 changes: 9 additions & 1 deletion src/gpgmm/d3d12/JSONSerializerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ namespace gpgmm::d3d12 {
dict.AddItem("Flags", desc.Flags);
dict.AddItem("RecordOptions", Serialize(desc.RecordOptions));
dict.AddItem("ResourceHeapTier", desc.ResourceHeapTier);
dict.AddItem("SubAllocationAlgorithm", desc.SubAllocationAlgorithm);
dict.AddItem("PoolAlgorithm", desc.PoolAlgorithm);
dict.AddItem("PreferredResourceHeapSize", desc.PreferredResourceHeapSize);
dict.AddItem("MaxResourceHeapSize", desc.MaxResourceHeapSize);
dict.AddItem("MemoryFragmentationLimit", desc.MemoryFragmentationLimit);
dict.AddItem("MemoryGrowthFactor", desc.MemoryGrowthFactor);
return dict;
}

Expand Down Expand Up @@ -166,7 +169,9 @@ namespace gpgmm::d3d12 {
dict.AddItem("Alignment", desc.Alignment);
dict.AddItem("Flags", desc.Flags);
dict.AddItem("MemorySegmentGroup", desc.MemorySegmentGroup);
dict.AddItem("DebugName", desc.DebugName);
if (!desc.DebugName.empty()) {
dict.AddItem("DebugName", desc.DebugName);
}
return dict;
}

Expand Down Expand Up @@ -247,7 +252,10 @@ namespace gpgmm::d3d12 {
JSONDict JSONSerializer::Serialize(const RESIDENCY_DESC& desc) {
JSONDict dict;
dict.AddItem("IsUMA", desc.IsUMA);
dict.AddItem("Flags", desc.Flags);
dict.AddItem("RecordOptions", Serialize(desc.RecordOptions));
dict.AddItem("MaxPctOfVideoMemoryToBudget", desc.MaxPctOfVideoMemoryToBudget);
dict.AddItem("MinPctOfBudgetToReserve", desc.MinPctOfBudgetToReserve);
dict.AddItem("MaxBudgetInBytes", desc.MaxBudgetInBytes);
dict.AddItem("EvictSizeInBytes", desc.EvictSizeInBytes);
dict.AddItem("InitialFenceValue", desc.InitialFenceValue);
Expand Down
8 changes: 5 additions & 3 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,13 @@ namespace gpgmm::d3d12 {
"management was not enabled.";
}

GPGMM_TRACE_EVENT_OBJECT_SNAPSHOT(*ppResourceAllocatorOut, newDescriptor);
std::unique_ptr<ResourceAllocator> resourceAllocator = std::unique_ptr<ResourceAllocator>(
new ResourceAllocator(newDescriptor, pResidencyManager, std::move(caps)));

GPGMM_TRACE_EVENT_OBJECT_SNAPSHOT(resourceAllocator.get(), newDescriptor);

if (ppResourceAllocatorOut != nullptr) {
*ppResourceAllocatorOut =
new ResourceAllocator(newDescriptor, pResidencyManager, std::move(caps));
*ppResourceAllocatorOut = resourceAllocator.release();
}

return S_OK;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/capture_replay_tests/D3D12EventTraceReplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class D3D12EventTraceReplay : public D3D12TestBase, public CaptureReplayTestWith
RESIDENCY_DESC residencyDesc = {};
residencyDesc.Device = mDevice;
residencyDesc.Adapter = mAdapter;
residencyDesc.IsUMA = snapshot["IsUMA"].asBool();
residencyDesc.IsUMA = mIsUMA;
residencyDesc.MaxPctOfVideoMemoryToBudget =
snapshot["MaxPctOfVideoMemoryToBudget"].asFloat();
residencyDesc.MaxBudgetInBytes = snapshot["MaxBudgetInBytes"].asUInt64();
Expand Down