Repository navigation
asahi: G17G on #194's M5 submission path, within the kernel's command limit - #207
Conversation
|
This now conflicts with aurora-wip 10161a7 (#194) in |
On integration/aurora the J813 (G17G) runs on the G17 kernel runtime (aurora-silicon/linux#1413), which reports DRM_ASAHI_FEATURE_RENDER_RESOURCES and _V2 for every M5 board. agx_m5_render_resources() then holds for G17G as well, so its renders send aurora-silicon#194's program storage lists and its compute goes as one command per dispatch in the render's submission. m5_split_prepass still took G17G, for the M5 runtime of older kernels, which takes one dispatch per submission. With both set: - the render command's CDM barrier was 0, so the render did not wait for the compute commands of its own submission; - the submission pointed the kernel at its output syncs for its input syncs. The split path clears in_sync_count after its per-dispatch submissions, but this path made none, so a batch with input syncs would have named its own unsignalled output syncobj as an input. Take the split path only where the kernel does not take mixed command arrays, and say in the comments that G17G takes the G17 runtime's lists where it runs on it. Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
On the G17 runtime a batch's compute goes as one command per recorded
dispatch, all in the render's submission. The kernel takes at most
max_commands_per_submission (64) render and compute commands in one
submission and refuses a longer one with EINVAL ("refused a submission
... at its command of type 1 ... barriers [0x0, 0x40]"). A batch records
as many dispatches as its draws and launches need, and every batch with
more was lost.
Send the leading dispatches in submissions of their own, as many as fit
in each, before the render's. Each repeats the compute storage list. Its
first command waits on the queue's earlier submissions (barrier 0) and
each other one on the command before it, so the chain stays in order.
The render's submission keeps the last dispatches. The chunks signal one
syncobj; a failure waits for the chunks already accepted before the
batch is retired.
J813 (G17G) on linux#1413, GLES31 at 4 jobs: 28561 pass / 8587 fail /
61 flakes before this change, 37352 / 0 / 0 with it.
Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
8cff908 to
da9a77f
Compare
|
Done, @RyanTheTide: rebased onto 10161a7, and force-pushed 8cff908 -> da9a77f. G17G now uses #194's list and helpers, V2 included, with no array or submit path of its own. On integration/aurora the J813 runs on the G17 runtime (linux#1413), which reports #194 alone was not enough on the J813, though. GLES2 (16956 / 0) and GLES3 (44409 / 0) were clean, but GLES31 failed by the thousand. The kernel refused submissions at their 64th command: #194 sends one compute command per dispatch, and the kernel takes at most 64 commands per submission, the same on every M5 board. G17G also still took On the J813, with both commits: GLES2 16956 / 0, GLES3 44409 / 0, GLES31 37352 / 0, with no refused submissions and no recoveries. |
|
Reviewed, and tested on an M5 Pro (G17S). Commit 2 changes the G17S/G17C submission path, and the M5 Pro hits the same 64-command limit. Review
Test, M5 Pro (integration/aurora-based kernel; native build of aurora-wip 7f7a7ff with this PR merged as GitHub would merge it; gallium + Vulkan asahi, LLVM 22, asserts on). Each run is the full 37,653-case GLES31 list, with GLES3 at every 10th case.
By group, pass counts before → after: compute 9 → 192, ssbo 62 → 2,046, atomic_counter 17 → 297, synchronization 4 → 103, tessellation 265 → 413, builtin_functions 2,250 → 2,876. GLES3 is identical case by case. Three cases went Pass → Fail in that run, in deqp-runner's failure-rerun groups: The one refused submit left comes from aurora-wip has since moved to be147e3. The real merge results (be147e3 + this PR, then + #219) build, pass CI: GitHub Actions doesn't run on this repository, so per the maintainers' rule for this repo the CI is:
Merging, then #219. |
Base: aurora-wip 10161a7, with #194. Branch thomas/j813-gallium-render-storage (da9a77f), 2 commits.
Rebased onto #194 as asked. The separate G17G storage array and submit path are gone. G17G uses #194's
m5_render_programs,agx_batch_note_m5_render_program(), the tile record and theSET_RENDER_RESOURCES(_V2)emission. For that part no G17G code is needed. On integration/aurora the J813 runs on the G17 kernel runtime (aurora-silicon/linux#1413), which reportsDRM_ASAHI_FEATURE_RENDER_RESOURCESand_V2for every M5 board. Soagx_m5_render_resources()already holds for G17G, and the records go out as V2.#194 alone was not enough on the J813, though. GLES2 and GLES3 passed, but GLES31 failed by the thousand. The two commits fix that:
m5_split_prepassstill took G17G, for the M5 runtime of older kernels, which takes one dispatch per submission.in_sync_count.max_commands_per_submission(64) render and compute commands in one submission. It refuses a longer one with EINVAL: "refused a submission ... at its command of type 1 ... barriers [0x0, 0x40]".Testing
J813 (G17G), kernel linux#1413 (7.3.0-aurora-j813-oni4s+), 4 jobs:
meson test --suite asahi: 126 / 126, on asahi: native Gallium GL on the M5 Pro and M5 Max (G17S, G17C) #194 alone and with both commits. The build has no new warnings.cc @Acelogic @DjDeveloperr @RyanTheTide @LiamRay10