Metal: Residency sets and barriers - #46

Merged

DarioSamo merged 6 commits into

renderbag:mainfrom

squidbus:residency-sets

Aug 5, 2025

squidbus commented Aug 3, 2025 •

edited by DarioSamo

Loading

Contributor

Based on #25, plus:

Rebased on the latest changes.
Residency sets:
- Fixed location of useResidencySet and commit calls on residency set.
- Added locking on residency set write and commit since residency sets are not thread-safe according to documentation and validation.
- Fixed residency issues with GPU-addressable buffers.
Barriers:
- Moved fences to be per-command list and allocated as needed without a cap.
- Reduced unneeded encoded fence waits/updates.
- Fixed some bugs/typos.

I've tested this with UnleashedRecomp and MarathonRecomp and seem to be working okay with my changes added.

EDIT: Fixes #10 (not directly but makes it not necessary).

squidbus requested a review from dcvz

August 3, 2025 09:43

IsaacMarovitz mentioned this pull request

Metal: Residency Sets #25

Closed

1 task

squidbus force-pushed the residency-sets branch from 9f1a08c to c501f8e Compare

August 3, 2025 12:59

DarioSamo reviewed

View reviewed changes

plume_render_interface_types.h Outdated

squidbus force-pushed the residency-sets branch from 4c4063e to 736e045 Compare

August 3, 2025 14:36

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

DarioSamo reviewed

View reviewed changes

plume_metal.cpp Outdated

squidbus force-pushed the residency-sets branch from 234c89c to 2053cb4 Compare

August 3, 2025 22:00

squidbus changed the title ~~Metal: Residency sets and barriers~~ Metal: Residency sets

squidbus force-pushed the residency-sets branch 2 times, most recently from a2e0d7d to 8bbcc86 Compare

August 3, 2025 22:43

squidbus changed the title ~~Metal: Residency sets~~ Metal: Residency sets and barriers

squidbus force-pushed the residency-sets branch from 8bbcc86 to 164dfd4 Compare

August 3, 2025 22:47

DarioSamo approved these changes

View reviewed changes

squidbus and others added 2 commits

August 4, 2025 05:34


          Metal: Residency sets

6eb9dde

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>


          Metal: Manual barriers

2e983a4

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>

squidbus force-pushed the residency-sets branch from 164dfd4 to 2e983a4 Compare

August 4, 2025 12:34

dcvz commented Aug 4, 2025

Contributor

Getting this when using it via RT64 and Zelda:

IOGPUMetalCommandBufferStorageAddResidencySets:1201: failed assertion `IOGPUMetalCommandBufferStorageAddResidencySets: command buffer residency set limit of 32 exceeded'
Program ended with exit code: 6


          Metal: Use residency set only for large descriptor sets

5feef3a

Dealing with 32 set limit per command buffer

squidbus commented Aug 4, 2025

Contributor Author

Getting this when using it via RT64 and Zelda:

IOGPUMetalCommandBufferStorageAddResidencySets:1201: failed assertion `IOGPUMetalCommandBufferStorageAddResidencySets: command buffer residency set limit of 32 exceeded'
Program ended with exit code: 6

Updated to only use residency sets on large descriptor sets, to avoid hitting limit.

dcvz reviewed

View reviewed changes

plume_metal.cpp Outdated

dcvz approved these changes

View reviewed changes

dcvz left a comment

Contributor

LGTM 👍 works on Zelda and left one small comment


          Metal: Cache supportsResidencySets and fix up bufferDeviceAddress cap…

273da41

…ability.

DarioSamo reviewed

View reviewed changes

plume_metal.cpp

DarioSamo reviewed

View reviewed changes

plume_metal.cpp

DarioSamo requested changes

View reviewed changes

DarioSamo left a comment

Contributor

Spotted some race conditions that should be addressed.

DarioSamo reviewed

View reviewed changes

plume_metal.cpp

DarioSamo reviewed

View reviewed changes

plume_metal.cpp


          Metal: Lock accesses to gpuAddressableResources

f3b0f9a

squidbus force-pushed the residency-sets branch from d559303 to f3b0f9a Compare

August 5, 2025 00:40

squidbus commented Aug 5, 2025

Contributor Author

Addressed the locking concerns.

DarioSamo reviewed

View reviewed changes

plume_metal.h Outdated


          Metal: Add missing nullptr init

0e67d83

DarioSamo approved these changes

View reviewed changes

DarioSamo merged commit 77a6e10 into renderbag:main

10 checks passed

squidbus deleted the residency-sets branch

August 7, 2025 22:19

jessetbh pushed a commit to jessetbh/plume that referenced this pull request


          Metal: Residency sets and barriers (renderbag#46)

aec7a4f

* Metal: Residency sets

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>

* Metal: Manual barriers

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>

* Metal: Use residency set only for large descriptor sets

Dealing with 32 set limit per command buffer

* Metal: Cache supportsResidencySets and fix up bufferDeviceAddress capability.

* Metal: Lock accesses to gpuAddressableResources

* Metal: Add missing nullptr init

---------

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet