Skip to content

Make non-uma devices compatible with the metal backend #15

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

Draft
tanmaysachan wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Make non-uma devices compatible with the metal backend #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eb35bf
Add sync on all barriers, check uma for resource options
tanmaysachan Mar 21, 2025
279bc6f
didModifyRange on unmap if written to
tanmaysachan Mar 21, 2025
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: 26 additions & 9 deletions plume_metal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,14 +762,16 @@ namespace plume {
}
}

MTL::ResourceOptions mapResourceOption(RenderHeapType heapType) {
MTL::ResourceOptions mapResourceOption(RenderHeapType heapType, bool hasUma) {
switch (heapType) {
case RenderHeapType::DEFAULT:
return MTL::ResourceStorageModePrivate;
case RenderHeapType::UPLOAD:
return MTL::ResourceStorageModeShared;
case RenderHeapType::READBACK:
return MTL::ResourceStorageModeShared;
if (hasUma) {
return MTL::ResourceStorageModeShared;
}
return MTL::ResourceStorageModeManaged;
default:
assert(false && "Unknown heap type.");
return MTL::ResourceStorageModePrivate;
Expand Down Expand Up @@ -1047,7 +1049,7 @@ namespace plume {
this->desc = desc;
this->device = device;

this->mtl = device->mtl->newBuffer(desc.size, mapResourceOption(desc.heapType));
this->mtl = device->mtl->newBuffer(desc.size, mapResourceOption(desc.heapType, device->getCapabilities().uma));
}

MetalBuffer::~MetalBuffer() {
Expand All @@ -1059,7 +1061,9 @@ namespace plume {
}

void MetalBuffer::unmap(uint32_t subresource, const RenderRange* writtenRange) {
// Do nothing.
if (mtl->resourceOptions() == MTL::StorageModeManaged) {
mtl->didModifyRange(NS::Range(writtenRange->begin, writtenRange->end));
}
}

std::unique_ptr<RenderBufferFormattedView> MetalBuffer::createBufferFormattedView(RenderFormat format) {
Expand Down Expand Up @@ -1092,7 +1096,7 @@ namespace plume {
// Configure texture properties
const MTL::PixelFormat pixelFormat = mapPixelFormat(format);
const MTL::TextureUsage usage = mapTextureUsageFromBufferFlags(buffer->desc.flags);
const MTL::ResourceOptions options = mapResourceOption(buffer->desc.heapType);
const MTL::ResourceOptions options = mapResourceOption(buffer->desc.heapType, buffer->device->getCapabilities().uma);

// Create texture with configured descriptor and alignment
MTL::TextureDescriptor *descriptor = MTL::TextureDescriptor::textureBufferDescriptor(pixelFormat, width, options, usage);
Expand Down Expand Up @@ -1489,9 +1493,10 @@ namespace plume {

uint64_t requiredSize = setLayout->argumentEncoder->encodedLength();
requiredSize = alignUp(requiredSize, 256);
MTL::ResourceOptions storageMode = device->getCapabilities().uma ? MTL::ResourceStorageModeShared : MTL::ResourceStorageModeManaged;

argumentBuffer = {
.mtl = device->mtl->newBuffer(requiredSize, MTL::ResourceStorageModeManaged),
.mtl = device->mtl->newBuffer(requiredSize, storageMode),
.argumentEncoder = setLayout->argumentEncoder,
.offset = 0,
};
Expand Down Expand Up @@ -1969,8 +1974,20 @@ namespace plume {
return;
}

// End render passes on all barriers
endActiveRenderEncoder();
// Sync resources with the blit encoder
checkActiveBlitEncoder();

for (uint32_t i = 0; i < bufferBarriersCount; i++) {
const RenderBufferBarrier &barrier = bufferBarriers[i];
MTL::Resource *resource = static_cast<const MetalBuffer *>(barrier.buffer)->mtl;
activeBlitEncoder->synchronizeResource(resource);
}

for (uint32_t i = 0; i < textureBarriersCount; i++) {
const RenderTextureBarrier &barrier = textureBarriers[i];
MTL::Resource *resource = static_cast<const MetalTexture *>(barrier.texture)->mtl;
activeBlitEncoder->synchronizeResource(resource);
}
}

void MetalCommandList::dispatch(const uint32_t threadGroupCountX, const uint32_t threadGroupCountY, const uint32_t threadGroupCountZ) {
Expand Down