mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-20 08:21:56 +09:00
Merge branch 'p5b/r2' into p5b/integrate-codex
This commit is contained in:
@@ -19,10 +19,21 @@
|
||||
|
||||
#include <MG_Remote/Client/ClientSession.h>
|
||||
#include <MG_Remote/Client/EmitTables.h>
|
||||
#include <MG_Remote/Server/ServerLoop.h>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#define MGITEST_SPLIT_RUNTIME_PEEK_LIVE 1
|
||||
#endif
|
||||
|
||||
namespace MGITest {
|
||||
void DelaySplitRetirementForTesting(bool enabled) {
|
||||
#if defined(MGITEST_SPLIT_RUNTIME_PEEK_LIVE)
|
||||
MobileGL::MG_Remote::Server::ServerLoopInstance().SetBeforeRetireHookForTesting(
|
||||
enabled ? +[] { std::this_thread::sleep_for(std::chrono::milliseconds(30)); } : nullptr);
|
||||
#else
|
||||
(void)enabled;
|
||||
#endif
|
||||
}
|
||||
|
||||
SplitRuntimeState PeekSplitRuntime() {
|
||||
SplitRuntimeState state;
|
||||
|
||||
@@ -91,9 +91,8 @@ namespace MGITest {
|
||||
// than asserted: a uniform record stride over a power-of-two ring lands on the
|
||||
// boundary exactly and never straddles it.
|
||||
//
|
||||
// stageReclaimWaits: SEG_STAGE allocations that only fitted after the encoder reclaimed
|
||||
// what the server had retired - P5's one real producer wait (see PipeWireCodec.h for
|
||||
// why the command ring has none while the verb barrier is armed).
|
||||
// stageReclaimWaits: allocations blocked after immediate reclamation failed;
|
||||
// already-retired bytes reclaimed lazily do not count as a wait.
|
||||
unsigned long long maxRecordBytes = 0;
|
||||
unsigned long long maxRecordBytesCap = 0;
|
||||
unsigned long long cmdWraps = 0;
|
||||
@@ -103,6 +102,8 @@ namespace MGITest {
|
||||
};
|
||||
|
||||
SplitRuntimeState PeekSplitRuntime();
|
||||
// Scheduling-only perturbation; never changes a watermark or counter.
|
||||
void DelaySplitRetirementForTesting(bool enabled);
|
||||
|
||||
// Empty when this process is a real split run that can be asserted about; otherwise the
|
||||
// reason to GTEST_SKIP() with, naming the first fact that is not true and the package that
|
||||
|
||||
@@ -134,6 +134,9 @@ namespace MGITest::WireLedger {
|
||||
"kSmallRingLaneCmdByteTarget, which is sized for the 1 MiB ring this lane "
|
||||
"declares (MGL_ITEST_GLES_SPLIT_SMALL_RING_ENVIRONMENT); a larger ring needs a "
|
||||
"larger workload and is not what this lane is for";
|
||||
EXPECT_GE(state.stageReclaimWaits, 1u)
|
||||
<< where << ": exit gate E3(e) - producer NEVER WAITED for staging retirement; "
|
||||
"lazy reclamation of already-retired bytes is not back-pressure";
|
||||
::testing::Test::RecordProperty("ring_wraps", static_cast<int>(state.cmdWraps));
|
||||
::testing::Test::RecordProperty("ring_wrap_pads", static_cast<int>(state.cmdWrapPads));
|
||||
::testing::Test::RecordProperty("ring_waits", static_cast<int>(state.stageReclaimWaits));
|
||||
|
||||
@@ -68,6 +68,14 @@ def main():
|
||||
for n in selected for c in by_name[n])
|
||||
if not_failed:
|
||||
raise ValueError(f"{label} control: {not_failed} selected entries did not fail")
|
||||
elif mode == "assertion":
|
||||
cases = ET.parse(sys.argv[4]).getroot().findall(".//testcase")
|
||||
by_name = {case.get("name"): case for case in cases}
|
||||
for name in selected:
|
||||
case = by_name.get(name)
|
||||
output = "" if case is None else " ".join(" ".join(case.itertext()).split())
|
||||
if not re.search(sys.argv[5], output):
|
||||
raise ValueError(f"E3(a) FAILED: {name} red lacks its persistent-map push diagnostic")
|
||||
elif mode == "evidence":
|
||||
missing = []
|
||||
label = sys.argv[5] if len(sys.argv) > 5 else ""
|
||||
|
||||
@@ -264,6 +264,21 @@ void main() { oColor = vec4(vColor, 1.0); }
|
||||
// the lane is that IT is the arm with a ring the workload can fill.
|
||||
if (SplitLane::IsSmallRingLane()) {
|
||||
const unsigned long long driven = DriveUntilSmallRingOverruns();
|
||||
// Ordinary uploads, each fitting by itself, jointly exceed the lane's 1 MiB
|
||||
// staging segment. Delay only scheduling between applied and retired: the
|
||||
// production allocator, not this test, must observe capacity and wait.
|
||||
GLuint pressureBuffer = 0;
|
||||
glGenBuffers(1, &pressureBuffer);
|
||||
glBindBuffer(GL_COPY_WRITE_BUFFER, pressureBuffer);
|
||||
std::vector<unsigned char> upload(768 * 1024, 0x5a);
|
||||
glBufferData(GL_COPY_WRITE_BUFFER, upload.size(), nullptr, GL_DYNAMIC_DRAW);
|
||||
DelaySplitRetirementForTesting(true);
|
||||
glBufferSubData(GL_COPY_WRITE_BUFFER, 0, upload.size(), upload.data());
|
||||
upload[0] = 0xa5;
|
||||
glBufferSubData(GL_COPY_WRITE_BUFFER, 0, upload.size(), upload.data());
|
||||
DelaySplitRetirementForTesting(false);
|
||||
glBindBuffer(GL_COPY_WRITE_BUFFER, 0);
|
||||
glDeleteBuffers(1, &pressureBuffer);
|
||||
Gl().EndFrame();
|
||||
WireLedger::ExpectSmallRingWrappedAtLeastOnce(
|
||||
"TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", driven);
|
||||
|
||||
Reference in New Issue
Block a user