mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-18 07:23:24 +09:00
[Perf] (MG_State, MG_Impl, MG_Backend): stop paying per draw and per upload for work already known
A per-draw CPU profile of a real Minecraft frame (perf on the render thread, which sits at 100% of one core on both backends) said the deficit is translation overhead, not the GPU, and named where it goes. This removes the largest items it found, on both backends and in the shared frontend they both feed. The single biggest one was not translation at all: IsBackendContextCurrentOnThisThread called eglGetCurrentContext on every invocation, and glvnd answers that with a getpid() fork check - a real syscall. The predicate sits two and three deep in every draw (the deferred-release drain, the global-UBO ring availability check, and the ring allocation), so it accounted for 16.3% of the render thread. EGL is still the ground truth, but re-verifying it once per thread per frame catches an external migration at the next frame boundary rather than the next call, which recovers the same bookkeeping. Texture uploads now carry a dirty region instead of a per-level flag. Minecraft animates atlas sprites with 16x16 glTexSubImage2D calls into a 1024x512 atlas and respecifies the lightmap every frame; a per-level flag turned each of those into a full-level re-upload - about 3.6 MB a frame of texels nobody changed. MipmapStorage accumulates the written box, Espryt uploads it with UNPACK_ROW_LENGTH striding into the level shadow, and Magma stages just that box. The box is a union, not a range list: repeated writes to one level widen it and it degrades to exactly the old whole-level upload, which is the honest worst case. glBufferData(NULL) is the orphaning idiom, and the backend was answering it by uploading the stale CPU shadow - turning a rename the driver does for free into a full synchronized upload. BufferObject now records that a NULL respecify leaves the store undefined, and the upload is skipped until content is actually written. The rest are smaller and of a kind: the deferred-release queue is probed without taking its mutex, the UBO ring waits on the frame fence that frees the space it needs instead of draining the whole pipeline with glFinish at the size cap, VAO binds go through a shadow so a draw's second bind of the same object does not reach the driver, the per-draw clean-texture probe short-circuits on the content version before rebuilding shape info, glUniform drops byte-identical writes (which otherwise dirty the whole UBO for the next draw), re-binding the texture or VAO a slot already holds no longer bumps the generation counters a backend fast path is keyed on, and the texture validators stopped taking shared_ptr by value. On Magma: descriptor-set reuse keeps four entries instead of one, because draws alternating between two programs - the chunk/entity ping-pong - thrashed a single slot into a full re-allocate and re-write every draw; a DynamicDraw buffer whose contents survive two frame boundaries is promoted to resident storage instead of being re-copied into the per-frame arena forever; and sampled-read barriers name only the shader stages whose device feature is enabled, which also removes a latent VUID violation (ALL_GRAPHICS names geometry and tessellation stages a device need not have). Measured with the Minecraft rig (render distance 32, p50 fps, same machine, single sample each): vanilla 1.21.1 Espryt 10.8 -> 36.3 and Magma 31.3 -> 44.6; 26.2 snapshot Magma 114.5 -> 210.5. Fabric+Sodium moved inside noise on Magma (854 -> 766) with the native baseline itself moving 838 -> 1031 between the two sessions, so treat that cell as unresolved rather than a regression measured. Unit tests 421/421. The CTS A/B was not run: these numbers and the test suite are the whole of the evidence, and a conformance regression would not have been caught here.
This commit is contained in:
@@ -202,9 +202,11 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
||||
for (auto& cacheEntryPair : frame.descriptorSetCacheByLayout) {
|
||||
cacheEntryPair.second.cursor = 0;
|
||||
}
|
||||
// The frame's descriptor sets are recycled above, so last frame's reuse target
|
||||
// is gone: start the per-draw descriptor-reuse cache fresh this frame.
|
||||
m_hasLastDescriptor = false;
|
||||
// The frame's descriptor sets are recycled above, so last frame's reuse targets
|
||||
// are gone: start the per-draw descriptor-reuse cache fresh this frame.
|
||||
for (auto& entry : m_descriptorReuseMemo) {
|
||||
entry.valid = false;
|
||||
}
|
||||
m_lastBindValid = false;
|
||||
// Re-fingerprint the bound sampler set fresh this frame so any GL object address
|
||||
// reuse cannot outlive a single frame (see SamplerResolveMemo).
|
||||
@@ -241,8 +243,10 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
||||
}
|
||||
if (purgedSets > 0) {
|
||||
// The per-draw reuse memo folds the layout handle into its signature; drop
|
||||
// it so a recycled handle value cannot revive a purged set mid-frame.
|
||||
m_hasLastDescriptor = false;
|
||||
// every entry so a recycled handle value cannot revive a purged set mid-frame.
|
||||
for (auto& entry : m_descriptorReuseMemo) {
|
||||
entry.valid = false;
|
||||
}
|
||||
MGLOG_D("UniformDescriptorBinder: freed %zu descriptor sets for destroyed layout", purgedSets);
|
||||
}
|
||||
}
|
||||
@@ -1358,13 +1362,13 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
||||
}
|
||||
}
|
||||
|
||||
// Reuse the previous draw's descriptor set when the resolved content is
|
||||
// Reuse a recent draw's descriptor set when the resolved content is
|
||||
// byte-identical (only the bind-time dynamic offsets differ). The signature
|
||||
// covers the descriptor-set layout + every write's binding/type/count + the
|
||||
// pointed-to buffer/image/texel-buffer infos (all value-initialized, so no
|
||||
// padding noise). Correctness: bindings are re-resolved every draw, so the
|
||||
// signature always reflects the current state and reuse happens only on an
|
||||
// exact match; the reused set is never re-acquired within a frame (the acquire
|
||||
// exact match; a reused set is never re-acquired within a frame (the acquire
|
||||
// cursor only advances), so its written contents survive; the layout is part of
|
||||
// the signature so reuse never crosses programs. Sampler overrides (blits)
|
||||
// bypass and invalidate the cache.
|
||||
@@ -1396,8 +1400,17 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
||||
mixWords(texelBufferViews.data(), texelBufferViews.size() * sizeof(VkBufferView));
|
||||
}
|
||||
|
||||
if (cacheable && m_hasLastDescriptor && signature == m_lastDescriptorSignature) {
|
||||
descriptorSet = m_lastBoundDescriptorSet;
|
||||
VkDescriptorSet reusedSet = VK_NULL_HANDLE;
|
||||
if (cacheable) {
|
||||
for (const auto& entry : m_descriptorReuseMemo) {
|
||||
if (entry.valid && entry.signature == signature) {
|
||||
reusedSet = entry.set;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (reusedSet != VK_NULL_HANDLE) {
|
||||
descriptorSet = reusedSet;
|
||||
} else {
|
||||
VkResult allocResult = AcquireDescriptorSet(frameIndex, programObj, descriptorSet);
|
||||
if (allocResult != VK_SUCCESS || descriptorSet == VK_NULL_HANDLE) {
|
||||
@@ -1411,9 +1424,15 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
||||
if (!writes.empty()) {
|
||||
vkUpdateDescriptorSets(m_device, static_cast<Uint32>(writes.size()), writes.data(), 0, nullptr);
|
||||
}
|
||||
m_lastBoundDescriptorSet = descriptorSet;
|
||||
m_lastDescriptorSignature = signature;
|
||||
m_hasLastDescriptor = cacheable;
|
||||
if (cacheable) {
|
||||
m_descriptorReuseMemo[m_descriptorReuseMemoNext] =
|
||||
DescriptorReuseEntry{signature, descriptorSet, true};
|
||||
m_descriptorReuseMemoNext = (m_descriptorReuseMemoNext + 1) % kDescriptorReuseMemoSize;
|
||||
} else {
|
||||
for (auto& entry : m_descriptorReuseMemo) {
|
||||
entry.valid = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Skip the driver call when this exact binding is already live on the
|
||||
|
||||
Reference in New Issue
Block a user