Skip to content

Use GPGMM_TRY_ASSIGN on TrySubAllocateMemory. #928

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 29, 2023
Merged

Use GPGMM_TRY_ASSIGN on TrySubAllocateMemory. #928

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
17 changes: 5 additions & 12 deletions src/gpgmm/common/BuddyMemoryAllocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace gpgmm {
GPGMM_TRY_ASSIGN(
TrySubAllocateMemory(
&mBuddyBlockAllocator, allocationSize, request.Alignment, request.NeverAllocate,
[&](const auto& block) -> ResultOrError<MemoryBase*> {
[&](const auto& block) -> ResultOrError<std::unique_ptr<MemoryAllocationBase>> {
const uint64_t memoryIndex = GetMemoryIndex(block->Offset);
std::unique_ptr<MemoryAllocationBase> memoryAllocation =
mUsedPool.AcquireFromPool(memoryIndex);
Expand All @@ -72,21 +72,14 @@ namespace gpgmm {
MemoryAllocationRequest newRequest = request;
newRequest.SizeInBytes = mMemorySize;
newRequest.Alignment = mMemoryAlignment;

ResultOrError<std::unique_ptr<MemoryAllocationBase>>
memoryAllocationResult =
GetNextInChain()->TryAllocateMemory(newRequest);
if (!memoryAllocationResult.IsSuccess()) {
return memoryAllocationResult.GetErrorCode();
}

memoryAllocation = memoryAllocationResult.AcquireResult();
GPGMM_TRY_ASSIGN(GetNextInChain()->TryAllocateMemory(newRequest),
memoryAllocation);
}

MemoryBase* memory = memoryAllocation->GetMemory();
const MemoryAllocationBase buddyAllocation = *memoryAllocation;
mUsedPool.ReturnToPool(std::move(memoryAllocation), memoryIndex);

return memory;
return std::make_unique<MemoryAllocationBase>(buddyAllocation);
}),
subAllocation);

Expand Down
11 changes: 6 additions & 5 deletions src/gpgmm/common/MemoryAllocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ namespace gpgmm {
return {};
}

ResultOrError<MemoryBase*> result = GetOrCreateMemory(block);
ResultOrError<std::unique_ptr<MemoryAllocationBase>> result = GetOrCreateMemory(block);
if (!result.IsSuccess()) {
// NeverAllocate always fails, so suppress it.
if (!neverAllocate) {
Expand All @@ -240,16 +240,17 @@ namespace gpgmm {
return result.GetErrorCode();
}

MemoryBase* memory = result.AcquireResult();
ASSERT(memory != nullptr);
std::unique_ptr<MemoryAllocationBase> memoryAllocation = result.AcquireResult();
ASSERT(memoryAllocation->GetMemory() != nullptr);

memory->Ref();
memoryAllocation->GetMemory()->Ref();

// Caller is be responsible in fully initializing the memory allocation.
// This is because TrySubAllocateMemory() does not necessarily know how to map the
// final sub-allocated block to created memory.
return std::make_unique<MemoryAllocationBase>(
nullptr, memory, kInvalidOffset, AllocationMethod::kUndefined, block, requestSize);
nullptr, memoryAllocation->GetMemory(), kInvalidOffset,
AllocationMethod::kUndefined, block, requestSize);
}

void InsertIntoChain(std::unique_ptr<MemoryAllocatorBase> next);
Expand Down
30 changes: 11 additions & 19 deletions src/gpgmm/common/SlabMemoryAllocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,33 +266,28 @@ namespace gpgmm {
GPGMM_TRY_ASSIGN(
TrySubAllocateMemory(
&pFreeSlab->Allocator, mBlockSize, request.Alignment, request.NeverAllocate,
[&](const auto& block) -> ResultOrError<MemoryBase*> {
[&](const auto& block) -> ResultOrError<std::unique_ptr<MemoryAllocationBase>> {
// Re-use memory from the free slab.
if (pFreeSlab->Allocation.GetMemory() != nullptr) {
return pFreeSlab->Allocation.GetMemory();
return std::make_unique<MemoryAllocationBase>(pFreeSlab->Allocation);
}

// Or use pre-fetched memory if possible. Else, throw it away and create a new
// slab.
if (mNextSlabAllocationEvent != nullptr) {
// Resolve the pending pre-fetched allocation.
mNextSlabAllocationEvent->Wait();
ResultOrError<std::unique_ptr<MemoryAllocationBase>>
memoryAllocationResult = mNextSlabAllocationEvent->AcquireAllocation();
if (!memoryAllocationResult.IsSuccess()) {
return memoryAllocationResult.GetErrorCode();
}

std::unique_ptr<MemoryAllocationBase> prefetchedSlabAllocation =
memoryAllocationResult.AcquireResult();
std::unique_ptr<MemoryAllocationBase> prefetchedSlabAllocation;
GPGMM_TRY_ASSIGN(mNextSlabAllocationEvent->AcquireAllocation(),
prefetchedSlabAllocation);
mNextSlabAllocationEvent.reset();

// Assign pre-fetched memory to the slab.
if (prefetchedSlabAllocation != nullptr &&
prefetchedSlabAllocation->GetSize() == slabSize) {
pFreeSlab->Allocation = *prefetchedSlabAllocation;
mStats.PrefetchedMemoryMissesEliminated++;
return pFreeSlab->Allocation.GetMemory();
return std::make_unique<MemoryAllocationBase>(pFreeSlab->Allocation);
}

if (prefetchedSlabAllocation != nullptr) {
Expand All @@ -304,7 +299,6 @@ namespace gpgmm {
}

mStats.PrefetchedMemoryMisses++;

mMemoryAllocator->DeallocateMemory(std::move(prefetchedSlabAllocation));
}

Expand All @@ -313,15 +307,13 @@ namespace gpgmm {
newSlabRequest.SizeInBytes = slabSize;
newSlabRequest.Alignment = mSlabAlignment;

ResultOrError<std::unique_ptr<MemoryAllocationBase>> slabAllocationResult =
mMemoryAllocator->TryAllocateMemory(newSlabRequest);
if (!slabAllocationResult.IsSuccess()) {
return slabAllocationResult.GetErrorCode();
}
std::unique_ptr<MemoryAllocationBase> slabAllocation;
GPGMM_TRY_ASSIGN(mMemoryAllocator->TryAllocateMemory(newSlabRequest),
slabAllocation);

pFreeSlab->Allocation = *slabAllocationResult.AcquireResult();
pFreeSlab->Allocation = *slabAllocation;

return pFreeSlab->Allocation.GetMemory();
return std::make_unique<MemoryAllocationBase>(pFreeSlab->Allocation);
}),
subAllocation);

Expand Down