Skip to content

Align within resource to power-of-two by default when none specified in resource descriptor. #400

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
Jun 14, 2022
Merged

Align within resource to power-of-two by default when none specified in resource descriptor. #400

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
7 changes: 6 additions & 1 deletion src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ namespace gpgmm { namespace d3d12 {
return E_FAIL;
}

// Requested resource size should be already aligned with the fixed memory size required
// by the allocator.
ASSERT(allocator->GetMemorySize() == kInvalidSize ||
allocator->GetMemorySize() % request.Alignment == 0);

std::unique_ptr<MemoryAllocation> allocation = allocator->TryAllocateMemory(request);
if (allocation == nullptr) {
// NeverAllocate always fails, so suppress it.
Expand Down Expand Up @@ -813,7 +818,7 @@ namespace gpgmm { namespace d3d12 {
// Only constant buffers must be 256B aligned.
request.Alignment = (initialResourceState == D3D12_RESOURCE_STATE_GENERIC_READ)
? D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT
: 1;
: NextPowerOfTwo(newResourceDesc.Width);
} else {
request.Alignment = resourceDescriptor.Alignment;
}
Expand Down
41 changes: 26 additions & 15 deletions src/tests/end2end/D3D12ResourceAllocatorTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ TEST_F(D3D12ResourceAllocatorTests, CreateBufferWithin) {
ALLOCATION_DESC desc = {};
desc.Flags = ALLOCATION_FLAG_ALLOW_SUBALLOCATE_WITHIN_RESOURCE;

// Byte-aligned upload buffer within.
{
ALLOCATION_DESC smallBufferDesc = desc;
smallBufferDesc.HeapType = D3D12_HEAP_TYPE_UPLOAD;
Expand All @@ -416,13 +415,12 @@ TEST_F(D3D12ResourceAllocatorTests, CreateBufferWithin) {
EXPECT_EQ(smallBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallBuffer->GetSize(), 4u);
EXPECT_EQ(smallBuffer->GetOffsetFromResource(), 0u);
EXPECT_EQ(smallBuffer->GetAlignment(), 4u); // Must re-align.

EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedMemoryCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockUsage, smallBuffer->GetSize());
}

// Custom-aligned upload buffer within.
{
ALLOCATION_DESC smallBufferDesc = desc;
smallBufferDesc.HeapType = D3D12_HEAP_TYPE_UPLOAD;
Expand All @@ -435,44 +433,57 @@ TEST_F(D3D12ResourceAllocatorTests, CreateBufferWithin) {
EXPECT_EQ(smallBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallBuffer->GetSize(), 16u);
EXPECT_EQ(smallBuffer->GetOffsetFromResource(), 0u);
EXPECT_EQ(smallBuffer->GetAlignment(), 16u);

EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedMemoryCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockUsage, smallBuffer->GetSize());
}

// Constant upload buffer within.
{
ALLOCATION_DESC smallBufferDesc = desc;
smallBufferDesc.HeapType = D3D12_HEAP_TYPE_UPLOAD;

ComPtr<ResourceAllocation> smallBuffer;
ASSERT_SUCCEEDED(resourceAllocator->CreateResource(
smallBufferDesc, CreateBasicBufferDesc(4u, 0), D3D12_RESOURCE_STATE_GENERIC_READ,
nullptr, &smallBuffer));
smallBufferDesc, CreateBasicBufferDesc(4u), D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
&smallBuffer));
ASSERT_NE(smallBuffer, nullptr);
EXPECT_EQ(smallBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallBuffer->GetSize(), 256u);
EXPECT_EQ(smallBuffer->GetOffsetFromResource(), 0u);
EXPECT_EQ(smallBuffer->GetAlignment(), 256u); // Re-align

EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedMemoryCount, 1u);
EXPECT_EQ(resourceAllocator->GetInfo().UsedBlockUsage, smallBuffer->GetSize());
}

// Create a read-back buffer within.
{
ALLOCATION_DESC smallBufferDesc = desc;
smallBufferDesc.HeapType = D3D12_HEAP_TYPE_READBACK;

ComPtr<ResourceAllocation> smallerBuffer;
ComPtr<ResourceAllocation> smallBuffer;
ASSERT_SUCCEEDED(resourceAllocator->CreateResource(
smallBufferDesc, CreateBasicBufferDesc(4u), D3D12_RESOURCE_STATE_COPY_DEST, nullptr,
&smallerBuffer));
ASSERT_NE(smallerBuffer, nullptr);
EXPECT_EQ(smallerBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallerBuffer->GetSize(), 4u);
EXPECT_EQ(smallerBuffer->GetOffsetFromResource(), 0u);
&smallBuffer));
ASSERT_NE(smallBuffer, nullptr);
EXPECT_EQ(smallBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallBuffer->GetSize(), 4u);
EXPECT_EQ(smallBuffer->GetOffsetFromResource(), 0u);
EXPECT_EQ(smallBuffer->GetAlignment(), 4u);
}
{
ALLOCATION_DESC smallBufferDesc = desc;
smallBufferDesc.HeapType = D3D12_HEAP_TYPE_READBACK;

ComPtr<ResourceAllocation> smallBuffer;
ASSERT_SUCCEEDED(resourceAllocator->CreateResource(
smallBufferDesc, CreateBasicBufferDesc(3u), D3D12_RESOURCE_STATE_COPY_DEST, nullptr,
&smallBuffer));
ASSERT_NE(smallBuffer, nullptr);
EXPECT_EQ(smallBuffer->GetMethod(), gpgmm::AllocationMethod::kSubAllocatedWithin);
EXPECT_EQ(smallBuffer->GetSize(), 4u);
EXPECT_EQ(smallBuffer->GetOffsetFromResource(), 0u);
EXPECT_EQ(smallBuffer->GetAlignment(), 4u); // Re-align
}
}

Expand Down