mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-19 16:01:57 +09:00
[MG_Pipe, MG_Test, CI] (Disaggregated): P5e ID-116 - the section 7 allowlist is generated, not hand-kept
- ra landed a hand-kept 13-row copy of CONTRACT-P5E section 7 in .github/workflows/test.yml, and it was wrong in BOTH directions at once: it omitted GetFramebufferBindingSlot@ReadPixels (21 entries, the lane's largest survivor) and carried GetTextureObject@CopyImageSubData, which resource_copy_region's kWaitNone makes a genuine unbarriered read of client memory. Neither error is visible by reading the list. Both are obvious once the list is derived. - gen_pipe_field_ownership.py now joins the three tables ID-84 already states the rule in - kMGPipeFieldOwnership, kMGPipeWaitClasses (generated/PipeWire.inc) and kMGPipeClassFieldMask / kMGPipeVerbClass (generated/PipeFillPoints.inc) - and emits kMGPipeAdmittedPullMask plus MGPipeBarrierPullAdmitted(field, verb): 101 admitted pairs across 12 barriered verbs. - The three inputs are READ, never restated, so the allowlist moves with the code: retiring a verb's wait class narrows it with no edit anywhere, and a new BARRIER_PULLED row widens it only on verbs that wait. A verb with no stamp row admits nothing - only MGP_VERB_OP_LIST's ops can ever be the record a pull is reported against. - --print-admitted gives the CI shell the SAME table the C++ answers from, which is what makes the hand copy unnecessary rather than merely corrected. - Three new negative controls (each source renamed away must stop the script - a missing source yields a silently EMPTY allowlist, which reads as rigour and is blindness) and five derivation controls that move an input and read the allowlist back. - Red-once: dropping the wait-class conjunct from build_admitted fails the self-test by name - "3 admission-derivation control(s) did not hold: unbarriering ReadPixels' op removes every @ReadPixels pair; unbarriering ResourceCopyRegion removes every @CopyImageSubData pair; no pair is admitted on an unbarriered verb (DrawArrays)" - and the new unit case fails with "GetBoundVertexArray@DrawArrays is admitted on a verb no barriered op stamps".
This commit is contained in:
@@ -300,6 +300,132 @@ constexpr MGPipeVerb MGPipeVerbForWireOp(MGPWireOp op) {
|
||||
inline constexpr SizeT kMGPipeVerbBoundaryOpCount = 23;
|
||||
inline constexpr SizeT kMGPipeVerbBoundaryExemptCount = 3;
|
||||
|
||||
// ---- THE §7 ALLOWLIST, DERIVED RATHER THAN WRITTEN (ID-116) --------------------------
|
||||
//
|
||||
// CONTRACT-P5E §7 lists the barrier-pulled reads the phase ADMITS: debts that are real, ordered
|
||||
// and fresh because the client is parked behind the record, and that a LATER phase retires. It
|
||||
// was also kept by hand in .github/workflows/test.yml, and that copy was wrong in both
|
||||
// directions at once - it omitted GetFramebufferBindingSlot@ReadPixels, the largest survivor,
|
||||
// and carried GetTextureObject@CopyImageSubData, which nothing made safe.
|
||||
//
|
||||
// THE RULE IS ID-84 SAID IN TABLES THAT ALREADY EXIST. A <field>@<verb> pull is admitted iff
|
||||
//
|
||||
// 1. the field's ownership row is BARRIER-PULLED - it is a debt and not a defect;
|
||||
// 2. the verb's wire op is STATICALLY BARRIERED (kMGPipeWaitClasses[op] != kWaitNone), which
|
||||
// is exactly "the client is parked in its own wait for this record", so P5C's semantics
|
||||
// survive the flip for it; and
|
||||
// 3. the field is inside kMGPipeClassFieldMask[class of the verb] - a field outside the
|
||||
// verb's own may-read table was never filled for it, so a read there is stale by
|
||||
// construction whatever its ownership row says.
|
||||
//
|
||||
// Which makes the allowlist move with the code instead of beside it: retiring a verb's wait
|
||||
// class NARROWS it with no edit, and a new BARRIER_PULLED row widens it only on verbs that
|
||||
// wait. A verb with no stamp row admits nothing - the server stamps only MGP_VERB_OP_LIST's
|
||||
// ops, so no other verb can be the one a residual pull is reported against.
|
||||
inline constexpr MGPipeFieldMask kMGPipeAdmittedPullMask[kMGPipeVerbCount] = {
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawArrays
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElements
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsBaseVertex
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawArrays
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawElements
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawElementsBaseVertex
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawElementsIndirect
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawArraysIndirect
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawElementsIndirectCount
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MultiDrawArraysIndirectCount
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawRangeElementsBaseVertex
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawRangeElements
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsInstancedBaseVertexBaseInstance
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsInstancedBaseVertex
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsInstancedBaseInstance
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsInstanced
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawArraysInstancedBaseInstance
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawArraysInstanced
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawElementsIndirect
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DrawArraysIndirect
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // Clear
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearBufferfi
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearBufferfv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearBufferuiv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearBufferiv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearNamedFramebufferfv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearNamedFramebufferfi
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearNamedFramebufferiv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // ClearNamedFramebufferuiv
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BlitFramebuffer
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BlitNamedFramebuffer
|
||||
{{0x5800c02000300180ull, 0x0000000000000000ull}}, // CopyTexImage2D
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // CopyTexSubImage2D
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // CopyImageSubData
|
||||
{{0x5800c02000300180ull, 0x0000000000000000ull}}, // GenerateMipmap
|
||||
{{0x5800c02000300140ull, 0x0000000000000000ull}}, // ReadPixels
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // GetTexImage
|
||||
{{0x5800c02000300140ull, 0x0000000000000000ull}}, // GetTextureImage
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DispatchCompute
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DispatchComputeIndirect
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MemoryBarrier
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // MemoryBarrierByRegion
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BindImageTexture
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // GetIntegeri_v
|
||||
{{0x5800c02000300100ull, 0x0000000000000000ull}}, // ShaderStorageBlockBinding
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // FenceSync
|
||||
{{0x5800402000000100ull, 0x0000000000000000ull}}, // ClientWaitSync
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // WaitSync
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DeleteSync
|
||||
{{0x5800402000000100ull, 0x0000000000000000ull}}, // GetSyncStatus
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // IsTimerQuerySupported
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BeginTimeElapsedQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // EndTimeElapsedQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // QueryCounterTimestamp
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // IsQueryResultAvailable
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // GetQueryResult64
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DeleteBackendQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BeginOcclusionQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // EndOcclusionQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // BeginXfbPrimitivesQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // EndXfbPrimitivesQuery
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // PatchParameteri
|
||||
{{0x5808402000000180ull, 0x0000000000000000ull}}, // BeginTransformFeedback
|
||||
{{0x5808402000000180ull, 0x0000000000000000ull}}, // EndTransformFeedback
|
||||
{{0x5808402000000180ull, 0x0000000000000000ull}}, // PauseTransformFeedback
|
||||
{{0x5808402000000180ull, 0x0000000000000000ull}}, // ResumeTransformFeedback
|
||||
{{0x5808402000000180ull, 0x0000000000000000ull}}, // BindTransformFeedback
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // DeleteTransformFeedback
|
||||
{{0x0000000000000000ull, 0x0000000000000000ull}}, // GetGpuTimestampNs
|
||||
};
|
||||
|
||||
inline constexpr SizeT kMGPipeAdmittedPullPairCount = 101;
|
||||
|
||||
// THE PREDICATE THE STRICT KNOB ASKS (ID-117). A 69 x 128-bit table, so this costs a shift and
|
||||
// a test on the apply thread - the same shape MGPipeFieldMaskHas already has.
|
||||
constexpr Bool MGPipeBarrierPullAdmitted(MGPipeInputField field, MGPipeVerb verb) {
|
||||
const SizeT index = static_cast<SizeT>(verb);
|
||||
return index < kMGPipeVerbCount && MGPipeFieldMaskHas(kMGPipeAdmittedPullMask[index], field);
|
||||
}
|
||||
|
||||
// THE HAND-EDIT CONTROL, MGPipeEveryFieldIsClassified's shape and for its reason: the generator
|
||||
// cannot emit a bit that fails this, so it can only fire on an edited header - which is exactly
|
||||
// the edit the DO NOT EDIT banner cannot prevent on its own. An admitted bit that was not a
|
||||
// BARRIER-PULLED field of its verb's class would be the allowlist quietly forgiving a read that
|
||||
// is torn rather than merely unmigrated.
|
||||
constexpr Bool MGPipeEveryAdmittedPullIsADebtOfItsVerbsClass() {
|
||||
for (SizeT v = 0; v < kMGPipeVerbCount; ++v) {
|
||||
const MGPipeFieldMask& admitted = kMGPipeAdmittedPullMask[v];
|
||||
const MGPipeFieldMask& mayRead =
|
||||
kMGPipeClassFieldMask[static_cast<SizeT>(kMGPipeVerbClass[v])];
|
||||
for (SizeT f = 0; f < kMGPipeInputFieldCount; ++f) {
|
||||
const auto field = static_cast<MGPipeInputField>(f);
|
||||
if (!MGPipeFieldMaskHas(admitted, field)) continue;
|
||||
if (kMGPipeFieldOwnership[f] != MGPipeFieldOwnership::kBarrierPulled) return false;
|
||||
if (!MGPipeFieldMaskHas(mayRead, field)) return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
static_assert(MGPipeEveryAdmittedPullIsADebtOfItsVerbsClass(),
|
||||
"an admitted barrier pull is not a BARRIER-PULLED field of its verb's class "
|
||||
"(CONTRACT-P5E section 7, ID-84 / ID-116)");
|
||||
|
||||
// The class sizes, as constants a test can pin without recounting the table.
|
||||
inline constexpr SizeT kMGPipeRecordSuppliedFieldCount = 41;
|
||||
inline constexpr SizeT kMGPipeApplierDerivedFieldCount = 4;
|
||||
|
||||
Reference in New Issue
Block a user