Repository navigation
drm/asahi: g16: Wave 7 — barrier elision, timestamp-free render microsequences, and 48 render pass slots - #2852
Open
DjDeveloperr wants to merge 3 commits into
Open
DjDeveloperr wants to merge 3 commits into
DjDeveloperr wants to merge 3 commits into
Conversation
Contributor
|
Review at 71daf4f. Review at 71daf4f (stacked on #2826 at f631683).
|
Previously prefix_render() unconditionally emitted a same-ring FS(N-1)->FS(N) barrier (fs_dep) on every pipelined early render pass, even when vdm_barrier was NONE or the render dependency had already retired or been satisfied by TA. Resolve the exact in-flight render wait stamp (fs_wait_render) in prefix_render() and plan_render_barriers(): - Keep the TA(N-1)->TA(N) prev_barrier (matching G15) whenever a prior render is in flight and plan.ta_fs_wait does not already serialize TA behind prev_fs (which dominates prev_ta via own_barrier): consecutive pipelined renders share one parameter-buffer / UMA epoch (RENDER_UMA_SLOT), so TA(N) must still wait on TA(N-1) before writing into the shared PB. - Emit cross-ring FS->TA (ta_fs_barrier) only when plan.ta_fs_wait names an in-flight FS stamp (legacy dependent renders, conservative early_tiling=false, or staged TA waits). - Emit FS->FS (fs_dep) only when plan.fs_render_wait names an in-flight FS dependency not already dominated by plan.ta_fs_wait. - Pre-check wait_stamp_for_with() for o2.wait_through[RENDER] in the multi-pass render batch fold loop so prefix_render() never defers after claiming a pass slot. Independent multi-pass renders drop fs_dep (from 3 hardware barrier records / 5 ring entries per pass to 2 barrier records / 4 ring entries) while preserving TA->TA serialization on the shared PB epoch, exact FS->FS coherence on dependent passes, and cross-VM / InitBM boundaries. Expand test-publication.py to cover independent multi-pass renders, dependent FRAGMENT_BARRIERS/STAGE_PREFIXES renders (including TA-dominated waits and older-FS waits), legacy renders, early_tiling=false, and cross-VM/InitBM boundaries. Signed-off-by: Diljit Singh <hey@djdev.me>
Every G16 render pass unconditionally emitted four firmware Timestamp microsequence opcodes (TA start, TA end, FS start, FS end) into the microsequence buffer and performed two write-combining scene reads at retirement even when userspace requested no timestamp outputs and G16 profiling (DebugFlags::Debug1) was disabled. Add compact timestamp-free TA/FS microsequence variants (SEQ_SIZE_NOTS, FINALIZE_NOTS, END_NOTS) that keep the WaitForIdle (1) opcode, rebase FINALIZE and its negative restart branch offset, place has_attachments at the rebased offset, and record exact per-pass timestamp emission in Flight::stage_ts_mask. When userspace requests no timestamp outputs and Debug1 profiling is off, encode the compact microsequences, write only the active microsequence length to WC memory, and skip the per-pass scene timestamp WC reads on retirement while keeping two safety and accounting invariants intact: - In retired_snapshot_at(), a recovery-suspect flight (recovery_suspect set) whose render pass omitted microsequence timestamps never retires as Retirement::Full; lacking stage-execution proof to distinguish a completed pass from a firmware-aborted pass that still advanced stamps, it retires as Retirement::Aborted (marking the flight doomed) after the 20 ms grace window. - Record Flight::published_ticks via counter_ticks() (24 MHz CNTPCT_EL0, matching firmware's timestamp clock domain) in stat_publish(), and in stat_retire() fall back to published_ticks..counter_ticks() through queue.usage::Lane whenever firmware timestamps were omitted so DRM fdinfo engine-time counters remain active and overlapping pipelined flights still account their exact union with zero WC reads. Verify both V25G83 and V26B123 compact microsequence layouts, timestamp-free retirement WC read counts, recovery-suspect abort handling, and fdinfo host-counter fallback/union accounting in the host selftests. Signed-off-by: Diljit Singh <hey@djdev.me>
…epoll Deep multi-pass render benchmarks (such as 11-pass render.postfx at depth 3, 7-pass compress.bw array at depth 5, and 4-pass render.shadow at depth 8) saturated the 32-slot pass cap (31 active + 1 displacement) and stalled between passes waiting for the 100 us resnap timer to free retired pass slots. - Raise hw::sizes::RENDER_SLOTS from 32 to 48 (47 in-flight passes + 1 displacement slot) and widen pass_busy/pass_mask/clean_mask/scrubbing in g16/slots.rs from u32 to u64. Both TA and FS work rings hold QUEUE_CAP = 256 entries (255 usable); at worst-case 4 ring entries per pipelined pass (MAX_RENDER_RING_ENTRIES = 4), 47 in-flight passes consume at most 188 entries (67 spare), bounded by compile-time assertion in hw.rs and clamped in params::render_flights() to (QUEUE_CAP - 1) / MAX_RENDER_RING_ENTRIES (63), well within AHEAD_RECORDS = 128, RING_SLOTS = 256, FLIGHTS = 32, and firmware recovery snapshot_entries = 448. - Split EXT_RENDER_TIERS in g16/resources.rs into four demand-grown tiers so 20-31 pass workloads do not pay for 48 slots upfront (per base slot = 25,184 KiB / 24.59 MiB; per ext slot = 3,680 KiB / 3.59 MiB): - Base (0..2, 2 slots): 50,368 KiB (49.19 MiB), ext 0 KiB - Tier 0 (2..8, +6 ext): +22,080 KiB (+21.56 MiB), ext 21.56 MiB - Tier 1 (8..18, +10 ext): +36,800 KiB (+35.94 MiB), ext 57.50 MiB - Tier 2 (18..32, +14 ext): +51,520 KiB (+50.31 MiB), ext 107.81 MiB - Tier 3 (32..48, +16 ext): +58,880 KiB (+57.50 MiB), ext 165.31 MiB - Add Engine::slot_wait and Firmware::blocked_on_slot_headroom() so poll_step() arms short_repoll (repoll_us) when pending work is specifically blocked on same-VM flight, pass/compute slot, or work-ring headroom, without arming short_repoll for cross-VM drains, InitBM/PB-unprimed waits, external sync fences, or CPU timestamp waits. Update host selftests in test-resources.py, test-publication.py, and test-poll-retire.py to verify 48 pass slots, all four demand-grown tier boundaries and exact byte footprints, blocked_on_slot_headroom() filtering, and slot_wait-gated short_repoll behavior. Signed-off-by: Diljit Singh <hey@djdev.me>
DjDeveloperr
force-pushed
the
djdev/g16-perf-wave7
branch
from
November 22, 2026 20:32
71daf4f to
abb9cd7
Compare
DjDeveloperr
force-pushed
the
djdev/g16-perf-wave6
branch
from
November 22, 2026 20:32
f631683 to
993edd6
Compare
Contributor
|
Re-checked at abb9cd7 against the 71daf4f review. Fixed:
New in this revision:
Still open: rows. Nothing is posted at abb9cd7, and all three commits changed. Needed at this head:
The J713 smoke row and the other-generation rows owed on #2826 still apply here. Assisted-by: LLM (Claude:Opus 5.5) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Three-commit G16 (M4 / T8132,
26B123firmware) Wave 7 series stacked directly on#2826(djdev/g16-perf-wave6atf63168347300c):720cbd169a5cfdrm/asahi: g16: elide redundant same-ring TA and independent FS barriersprefix_render()/plan_render_barriers(), removes unusedPassSlot::prev_barrier(same-ring TA→TA barriers), emitsta_fs_barrier/fs_deponly when needed and not already dominated, and pre-checkswait_stamp_for_with()in the batch fold loop. Independent multi-pass renders drop from 3 barrier records (5 ring entries) to 1 (own_barrier, 3 ring entries).124f9c4145d55drm/asahi: g16: omit render microsequence timestamps when unusedSEQ_SIZE_NOTS,FINALIZE_NOTS,END_NOTS) keepingWaitForIdle (1)and rebasedFINALIZE/has_attachmentsoffsets, tracks emission inFlight::stage_ts_mask, writes only active microsequence length to WC memory, and skips per-pass retirement timestamp WC reads when neither userspace timestamps norDebug1profiling are active.71daf4f3f7ea0drm/asahi: g16: raise render pass slots to 48 and tighten slot-wait repollhw::sizes::RENDER_SLOTSfrom 32 to 48 within the existing0x7020000000..0x7040000000client VA window (80 MiB spare), decouplesparams::render_flights()fromhw::sizes::FLIGHTS(up to 47 passes in flight across up to 32 flights), widens pass bitmasks to 64-bit, extends demand-grown Tier 2 to slots18..48(shallow/moderate VMs stay on Tier 0 / Tier 1 with zero Tier-2 backing), and armsengine.short_repollwhen pending work blocks on slot headroom.Verification (exact head
71daf4f3f7ea0836ffbf9f3c17791f8069362755)Host gates
run-host-tests.py:25 / 25PASS (includingcheck-abi-26b123.rs,test-stamp-wrap.py,test-publication.py,test-poll-retire.py,test-resources.py).scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES:0 errors, 0 warnings, 0 checks.Live hardware (
Apple M4 (G16G B0),J773g/T8132,7.3.0-ARCH-m4prod18,/opt/mesa-v10-tc)Vulkan CTS (
1,104Pass /233NotSupported /0Fail /0Crash /0Timeout /0GPU errors)vk-mustpass-short*timestamp*(strided of 1,094)dEQP-VK.query_pool.statistics_query.*(strided of 18,775)dEQP-VK.synchronization.op.single_queue.*(strided of 7,324)dEQP-VK.renderpasses.renderpass2.*(strided of 32,680)gpubench-vk(v18Wave 7 R2 vsv17Wave 6 R2f63168347300con identical/opt/mesa-v10-tc;0CRC/status fails across 44 rows)render.light(kind=tri):d=1273.82 -> 262.61 us(+4.27%),d=2209.73 -> 196.08 us(+6.96%),d=4173.13 -> 157.83 us(+9.70%),d=8138.27 -> 127.10 us(+8.79%),d=16132.56 -> 121.48 us(+9.12%).render.postfx(6 rows):+7.91%geomean (1080p msaa=4 d=21388.89 -> 1269.04 us+9.44%,1440p msaa=1/4 d=21428.57 -> 1322.75 us+8.00%).compress.bw(kind=array,res=1440p)(2 rows):+8.11%geomean (d=1+6.67%,d=4886.52 -> 809.06 us+9.57%).+1.68%geomean vsv17(0.8773×M4 Metal).overlap.passes(4 rows):1.1853×M4 Metal (+0.54%vsv17;render_render d=21.38 -> 1.44+4.24%).render.deferred(8 rows):+1.20%geomean vsv17(0.7149×M4 Metal).render_owners: fresh 3 retired 45 quarantined 0 reusable 47(48 slots),slot_sync 0,ct_sync 0,pass_sync 0,pb: bad 0,type0: fs2c 759 c2ta 7454.Real Deep Sleep S2R
apple-sleep: back from sleep, boot object resumes 0 -> 1,pcie-appleport 0 & 2 link restored,GPU firmware back in 5083 us,ZERO_S2R_ERRORS, post-wakevk-mustpass-short87 / 87PASS.Assisted-by: LLM (Gemini:4 Neon)