mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-09-11 21:58:31 +09:00
[Feat] (Bench, Pipe): run the blend-toggle case in CI, give G7 a negative control, and record the two campaign devices
- DriverBenchStateToggle runs mc_state_toggle as its own ctest entry. The case has been in kBenchCases since P0 and nothing executed it, so nothing would have noticed it rotting - and it is the exact enable/draw/disable/draw shape the microbenchmark P2 owes the GO/NO-GO measures. About 1.2 s inside an existing three-minute job. - scripts/g7_negative_control.sh breaks the pipeline/dynamic split on purpose: it inserts two boundaries so ColorMasks becomes a dynamic chunk of its own, which keeps the partition sorted, non-overlapping and complete - so it still COMPILES - while making glColorMask bump m_pipelineStateVersion without moving the pipeline-subset hash. A non-zero ctest is the pass. - Everything that could make that control lie is refused rather than reported: a missing SetterConsistency test exits 2 instead of reading "no tests matched" as a failure; a tree that is already red or already broken exits 2; a patched table that does not compile exits 2, since a build break would prove the static_asserts work rather than that the test still checks; and the restore is from byte-for-byte copies (never from git, so a dirty tree is given back intact), followed by a rebuild and a re-run that must be green. --verify-patch-only exercises the mechanism where the test does not exist yet and says explicitly that it is not a pass. - Profiles for the two campaign devices, and the guard that stops them being trusted early. Both carry PROFILE_VERIFIED=0 and every device-specific field is TODO_VERIFY_ON_DEVICE rather than a guess: the harness pins through MediaTek nodes and 35d0befa is a Qualcomm part, where `su -c 'echo ... > /proc/ppm/...'` fails with a zero exit and the run would report numbers it believes were pinned. bench.sh and session.sh now refuse an unverified profile unless --allow-unverified-profile is passed, which warns that the run is not comparable with a pinned one. The README records what earns PROFILE_VERIFIED=1.
This commit is contained in:
@@ -13,3 +13,22 @@ target_link_libraries(DriverBench PRIVATE dl)
|
|||||||
|
|
||||||
add_test(NAME DriverBench COMMAND DriverBench draw_tiny)
|
add_test(NAME DriverBench COMMAND DriverBench draw_tiny)
|
||||||
set_tests_properties(DriverBench PROPERTIES LABELS benchmark)
|
set_tests_properties(DriverBench PROPERTIES LABELS benchmark)
|
||||||
|
|
||||||
|
# The Blaze3D blend toggle, as its own entry.
|
||||||
|
#
|
||||||
|
# mc_state_toggle is glEnable(GL_BLEND) / glBlendFuncSeparate / glDrawElements /
|
||||||
|
# glDisable(GL_BLEND) / glDrawElements, 46 times - the measured vanilla-frame rate, and the exact
|
||||||
|
# shape ROADMAP.md writes down as the microbenchmark P2 owes the GO/NO-GO. It is the workload the
|
||||||
|
# whole "push at validate, not in the setter" decision was made for: a per-setter design pays for
|
||||||
|
# every toggle, and a CSO that is minted twice and then reused pays for none of them.
|
||||||
|
#
|
||||||
|
# The case has existed in kBenchCases since P0 and nothing ran it, so nothing noticed if it broke.
|
||||||
|
# Exposing it costs about 1.2 s inside an existing three-minute job, and it means the number the
|
||||||
|
# P2 report quotes comes from a case CI has been executing all along rather than from a code path
|
||||||
|
# whose first run is the day it is measured.
|
||||||
|
#
|
||||||
|
# Like the entry above, this runs against whatever $DRIVERBENCH_EGL_LIB names (the system driver
|
||||||
|
# when unset) - the ctest entry is a "does this case still run" gate, not the measurement. The
|
||||||
|
# measurement is run_driver_bench.sh against each of {native, espryt, magma}.
|
||||||
|
add_test(NAME DriverBenchStateToggle COMMAND DriverBench mc_state_toggle)
|
||||||
|
set_tests_properties(DriverBenchStateToggle PROPERTIES LABELS benchmark)
|
||||||
|
|||||||
Executable
+242
@@ -0,0 +1,242 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# G7's negative control: break the pipeline/dynamic split on purpose and prove the
|
||||||
|
# setter-consistency test says so.
|
||||||
|
#
|
||||||
|
# WHAT G7 CLAIMS. MG_Pipe/MGPipeRenderStateSpans.h partitions RenderStateParameters into a
|
||||||
|
# pipeline half and a dynamic half by one rule - a byte is pipeline if and only if some public
|
||||||
|
# RenderState setter that calls BumpVersions() writes it - and
|
||||||
|
# MG_Test/Pipe/RenderStateSpansTest.cpp walks EVERY setter asserting that the pipeline-subset
|
||||||
|
# hash moves exactly when GetPipelineStateVersion() moves.
|
||||||
|
#
|
||||||
|
# WHY A CONTROL IS NEEDED AT ALL. That test is green on a correct table, and it would also be
|
||||||
|
# green on a table it had stopped looking at: a walk that silently drove no setters, a hash that
|
||||||
|
# stopped depending on the chunks, an assertion someone loosened. Green tells you nothing about
|
||||||
|
# whether the test can still fail. This script makes it fail, for the one reason it exists to
|
||||||
|
# catch, and reports a NON-zero ctest as the pass.
|
||||||
|
#
|
||||||
|
# THE BREAK. ColorMasks is moved out of pipeline chunk P1 into a dynamic chunk of its own, by
|
||||||
|
# inserting two boundaries - at ColorMasks and at FramebufferSrgbEnabled - into the boundary
|
||||||
|
# table. That is deliberately a break the compiler CANNOT catch on its own: the chunks still
|
||||||
|
# ascend, still do not overlap and still cover [0, sizeof(RenderStateParameters)) exactly, so
|
||||||
|
# every structural static_assert in the header still holds. What breaks is the meaning:
|
||||||
|
# glColorMask bumps m_pipelineStateVersion but no longer moves the pipeline-subset hash, and
|
||||||
|
# SetterConsistency has to name SetColorMask.
|
||||||
|
#
|
||||||
|
# The four measurement pins (7 / 8 chunks, 396 / 772 bytes) are relaxed by the same patch,
|
||||||
|
# because they pin the SHIPPED table rather than the invariant - leaving them would turn this
|
||||||
|
# into a build break, which proves the assertions compile rather than that the test still checks.
|
||||||
|
#
|
||||||
|
# WHY IT IS NOT A CI LANE. It rebuilds the library twice. It is run by hand, and by the
|
||||||
|
# integrator at the P2 five-part gate.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# scripts/g7_negative_control.sh <build-dir> [--verify-patch-only]
|
||||||
|
#
|
||||||
|
# <build-dir> a configured build directory carrying the push-only unit tests
|
||||||
|
# (MGPipeRenderStateSpans.cpp is compiled only under MOBILEGL_PIPE_PUSH,
|
||||||
|
# so a pull build has neither the table nor the test)
|
||||||
|
# --verify-patch-only apply the patch, rebuild, report whether it still compiles, and
|
||||||
|
# revert - WITHOUT requiring the test to exist. This is the mechanism
|
||||||
|
# check, not the control; it never reports the control as passed.
|
||||||
|
#
|
||||||
|
# Exit codes: 0 the control tripped (or, under --verify-patch-only, the patch compiled);
|
||||||
|
# 1 the control did NOT trip - the test stayed green on a demoted member, which is
|
||||||
|
# the finding, not an error in this script;
|
||||||
|
# 2 the script could not run the control at all (bad arguments, missing test,
|
||||||
|
# a build that was already broken, a failed restore).
|
||||||
|
set -u -o pipefail
|
||||||
|
|
||||||
|
BUILD_DIR=""
|
||||||
|
PATCH_ONLY=0
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case "$1" in
|
||||||
|
--verify-patch-only) PATCH_ONLY=1; shift ;;
|
||||||
|
-*) echo "unknown arg: $1" >&2; exit 2 ;;
|
||||||
|
*) BUILD_DIR=$1; shift ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
[ -n "$BUILD_DIR" ] || { echo "usage: $0 <build-dir> [--verify-patch-only]" >&2; exit 2; }
|
||||||
|
|
||||||
|
REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
cd "$REPO_ROOT" || exit 2
|
||||||
|
[ -f "$BUILD_DIR/CMakeCache.txt" ] || { echo "$BUILD_DIR is not a configured build directory" >&2; exit 2; }
|
||||||
|
|
||||||
|
HEADER=MobileGL/MG_Pipe/MGPipeRenderStateSpans.h
|
||||||
|
SOURCE=MobileGL/MG_Pipe/MGPipeRenderStateSpans.cpp
|
||||||
|
TEST_NAME='RenderStateSpans\.SetterConsistency'
|
||||||
|
LOG_DIR=$(mktemp -d)
|
||||||
|
BACKUP_DIR="$LOG_DIR/orig"
|
||||||
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
|
||||||
|
say() { echo "[g7] $*" >&2; }
|
||||||
|
|
||||||
|
restore() {
|
||||||
|
# Restore from the byte-for-byte copies taken before the patch, never from git: a developer
|
||||||
|
# running this on a dirty tree must get their tree back, not HEAD.
|
||||||
|
if [ -f "$BACKUP_DIR/header" ]; then cp -f "$BACKUP_DIR/header" "$HEADER"; fi
|
||||||
|
if [ -f "$BACKUP_DIR/source" ]; then cp -f "$BACKUP_DIR/source" "$SOURCE"; fi
|
||||||
|
}
|
||||||
|
trap 'restore' EXIT
|
||||||
|
|
||||||
|
cp -f "$HEADER" "$BACKUP_DIR/header" || exit 2
|
||||||
|
cp -f "$SOURCE" "$BACKUP_DIR/source" || exit 2
|
||||||
|
|
||||||
|
# --- 0. the control has to have something to control -----------------------------------------
|
||||||
|
# A missing test is NOT a pass. Without this the script would patch, watch ctest match no tests,
|
||||||
|
# read that as "the test failed" and report the control as tripped - a green that means the
|
||||||
|
# opposite of what it says.
|
||||||
|
if [ "$PATCH_ONLY" = 0 ]; then
|
||||||
|
matched=$(ctest --test-dir "$BUILD_DIR" -N -R "$TEST_NAME" 2>/dev/null | grep -cE '^ *Test *#[0-9]+:')
|
||||||
|
if [ "${matched:-0}" -eq 0 ]; then
|
||||||
|
say "no test matches $TEST_NAME in $BUILD_DIR."
|
||||||
|
say "That test is P2 package A's (MG_Test/Pipe/RenderStateSpansTest.cpp, commit c2 on p2/spans);"
|
||||||
|
say "until it exists this control has nothing to trip and cannot report a pass. Re-run against a"
|
||||||
|
say "tree that carries it, or use --verify-patch-only to exercise the patch mechanism alone."
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
say "$matched matching test(s) before the patch"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 1. the tree must be green BEFORE the break ----------------------------------------------
|
||||||
|
# Otherwise a red after the patch says nothing: it could have been red already.
|
||||||
|
say "building $BUILD_DIR as it is"
|
||||||
|
if ! cmake --build "$BUILD_DIR" -j "$(nproc)" > "$LOG_DIR/build-before.log" 2>&1; then
|
||||||
|
say "the build is already broken before any patch - see $LOG_DIR/build-before.log"
|
||||||
|
tail -20 "$LOG_DIR/build-before.log" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
if [ "$PATCH_ONLY" = 0 ]; then
|
||||||
|
if ! ctest --test-dir "$BUILD_DIR" -R "$TEST_NAME" --no-tests=error --output-on-failure \
|
||||||
|
> "$LOG_DIR/ctest-before.log" 2>&1; then
|
||||||
|
say "$TEST_NAME is already red before the patch - fix that first, the control proves nothing here"
|
||||||
|
tail -30 "$LOG_DIR/ctest-before.log" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
say "$TEST_NAME is green before the patch"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 2. demote ColorMasks --------------------------------------------------------------------
|
||||||
|
say "demoting ColorMasks out of the pipeline half"
|
||||||
|
python3 - "$HEADER" "$SOURCE" <<'PY' || exit 2
|
||||||
|
import sys
|
||||||
|
|
||||||
|
header_path, source_path = sys.argv[1], sys.argv[2]
|
||||||
|
|
||||||
|
|
||||||
|
def patch(path, pairs):
|
||||||
|
text = open(path, encoding='utf-8').read()
|
||||||
|
for old, new in pairs:
|
||||||
|
if text.count(old) != 1:
|
||||||
|
sys.stderr.write("[g7] cannot patch %s: %d matches for %r\n"
|
||||||
|
% (path, text.count(old), old[:70]))
|
||||||
|
sys.stderr.write("[g7] the chunk table has been rewritten since this control was "
|
||||||
|
"written; update the control, do not delete it.\n")
|
||||||
|
sys.exit(1)
|
||||||
|
text = text.replace(old, new)
|
||||||
|
open(path, 'w', encoding='utf-8', newline='\n').write(text)
|
||||||
|
|
||||||
|
|
||||||
|
# Two extra boundaries split pipeline chunk P1 into
|
||||||
|
# [BlendStates, ColorMasks) pipeline (odd index, unchanged parity)
|
||||||
|
# [ColorMasks, FramebufferSrgb) DYNAMIC - the demotion
|
||||||
|
# [FramebufferSrgb, ClearColor) pipeline
|
||||||
|
# Adding exactly TWO boundaries keeps every later chunk's index parity, so the alternating
|
||||||
|
# pipeline/dynamic rule still assigns every other chunk the half it had.
|
||||||
|
patch(header_path, [
|
||||||
|
("inline constexpr SizeT kMGPipeRenderStateChunkCount = 15;",
|
||||||
|
"inline constexpr SizeT kMGPipeRenderStateChunkCount = 17; // G7 NEGATIVE CONTROL"),
|
||||||
|
(""" offsetof(RenderStateParameters, BlendStates),""",
|
||||||
|
""" offsetof(RenderStateParameters, BlendStates),
|
||||||
|
// G7 NEGATIVE CONTROL: ColorMasks demoted to a dynamic chunk of its own.
|
||||||
|
offsetof(RenderStateParameters, ColorMasks),
|
||||||
|
offsetof(RenderStateParameters, FramebufferSrgbEnabled),"""),
|
||||||
|
("static_assert(kMGPipePipelineChunkCount == 7);",
|
||||||
|
"static_assert(kMGPipePipelineChunkCount == 8); // G7 NEGATIVE CONTROL"),
|
||||||
|
("static_assert(kMGPipeDynamicChunkCount == 8);",
|
||||||
|
"static_assert(kMGPipeDynamicChunkCount == 9); // G7 NEGATIVE CONTROL"),
|
||||||
|
('static_assert(kMGPipePipelineChunkBytes == 396, "the pipeline subset is 396 bytes");',
|
||||||
|
'static_assert(kMGPipePipelineChunkBytes == 364, "G7 NEGATIVE CONTROL: 396 - 32 for ColorMasks");'),
|
||||||
|
('static_assert(kMGPipeDynamicChunkBytes == 772, "the dynamic subset is 772 bytes");',
|
||||||
|
'static_assert(kMGPipeDynamicChunkBytes == 804, "G7 NEGATIVE CONTROL: 772 + 32 for ColorMasks");'),
|
||||||
|
])
|
||||||
|
|
||||||
|
patch(source_path, [
|
||||||
|
(""" MGPipeRenderStateChunkAt(GlobalPipelineChunk(6)),
|
||||||
|
};""",
|
||||||
|
""" MGPipeRenderStateChunkAt(GlobalPipelineChunk(6)),
|
||||||
|
MGPipeRenderStateChunkAt(GlobalPipelineChunk(7)), // G7 NEGATIVE CONTROL
|
||||||
|
};"""),
|
||||||
|
(""" MGPipeRenderStateChunkAt(GlobalDynamicChunk(6)), MGPipeRenderStateChunkAt(GlobalDynamicChunk(7)),
|
||||||
|
};""",
|
||||||
|
""" MGPipeRenderStateChunkAt(GlobalDynamicChunk(6)), MGPipeRenderStateChunkAt(GlobalDynamicChunk(7)),
|
||||||
|
MGPipeRenderStateChunkAt(GlobalDynamicChunk(8)), // G7 NEGATIVE CONTROL
|
||||||
|
};"""),
|
||||||
|
])
|
||||||
|
print("[g7] patched the chunk table")
|
||||||
|
PY
|
||||||
|
|
||||||
|
# --- 3. it must still COMPILE ----------------------------------------------------------------
|
||||||
|
# A build break here would mean the control proved the static_asserts work, not that the test
|
||||||
|
# still checks anything.
|
||||||
|
say "rebuilding with the demoted member"
|
||||||
|
if ! cmake --build "$BUILD_DIR" -j "$(nproc)" > "$LOG_DIR/build-after.log" 2>&1; then
|
||||||
|
say "the patched table did not compile - the control cannot distinguish 'the test failed' from"
|
||||||
|
say "'nothing was built'. See $LOG_DIR/build-after.log"
|
||||||
|
grep -m10 -E 'error:' "$LOG_DIR/build-after.log" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
say "the patched table still compiles, so the partition is still complete"
|
||||||
|
|
||||||
|
if [ "$PATCH_ONLY" = 1 ]; then
|
||||||
|
# Restore AND rebuild before returning. Leaving the build directory holding a library built
|
||||||
|
# from the deliberately-broken table would be the nastiest thing this script could do: the
|
||||||
|
# sources would look clean, and the next `ctest` in that directory would be measuring the
|
||||||
|
# break.
|
||||||
|
restore
|
||||||
|
trap - EXIT
|
||||||
|
if ! cmake --build "$BUILD_DIR" -j "$(nproc)" > "$LOG_DIR/build-restored.log" 2>&1; then
|
||||||
|
say "the tree did NOT rebuild after the restore - see $LOG_DIR/build-restored.log"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
say "--verify-patch-only: the patch applies, compiles and reverts, and $BUILD_DIR is rebuilt from"
|
||||||
|
say "the restored sources. This is the MECHANISM check; it does NOT report the control as passed."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 4. the test must now be RED -------------------------------------------------------------
|
||||||
|
say "running $TEST_NAME against the broken table"
|
||||||
|
if ctest --test-dir "$BUILD_DIR" -R "$TEST_NAME" --no-tests=error --output-on-failure \
|
||||||
|
> "$LOG_DIR/ctest-after.log" 2>&1; then
|
||||||
|
say "NEGATIVE CONTROL DID NOT TRIP: $TEST_NAME is still green with ColorMasks demoted to the"
|
||||||
|
say "dynamic half. glColorMask bumps m_pipelineStateVersion and no longer moves the pipeline"
|
||||||
|
say "subset hash, so the G7 invariant is violated and the test did not notice. The test is not"
|
||||||
|
say "checking what it claims to check."
|
||||||
|
cp -f "$LOG_DIR/ctest-after.log" ./g7-negative-control-failure.log
|
||||||
|
say "ctest output kept at ./g7-negative-control-failure.log"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if grep -q 'SetColorMask' "$LOG_DIR/ctest-after.log"; then
|
||||||
|
say "negative control tripped, naming SetColorMask"
|
||||||
|
else
|
||||||
|
say "negative control tripped, but its output does not name SetColorMask - the test failed for"
|
||||||
|
say "some other reason, so read $LOG_DIR/ctest-after.log before trusting it"
|
||||||
|
grep -m20 -E 'Failure|error|Expected|Actual' "$LOG_DIR/ctest-after.log" >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 5. put it back, and prove it went back --------------------------------------------------
|
||||||
|
restore
|
||||||
|
trap - EXIT
|
||||||
|
say "restored; rebuilding"
|
||||||
|
if ! cmake --build "$BUILD_DIR" -j "$(nproc)" > "$LOG_DIR/build-restored.log" 2>&1; then
|
||||||
|
say "the tree did NOT rebuild after the restore - see $LOG_DIR/build-restored.log"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
if ! ctest --test-dir "$BUILD_DIR" -R "$TEST_NAME" --no-tests=error \
|
||||||
|
> "$LOG_DIR/ctest-restored.log" 2>&1; then
|
||||||
|
say "the tree did NOT go back to green after the restore - see $LOG_DIR/ctest-restored.log"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
say "negative control tripped and the tree is green again"
|
||||||
|
exit 0
|
||||||
@@ -30,6 +30,25 @@ frequency-pin integrity.
|
|||||||
5. Root required (frequency pinning, GPU busy sampling).
|
5. Root required (frequency pinning, GPU busy sampling).
|
||||||
6. Write a device profile under `devices/` (see `devices/odinlite.env`).
|
6. Write a device profile under `devices/` (see `devices/odinlite.env`).
|
||||||
|
|
||||||
|
A profile carries `PROFILE_VERIFIED=1` only once its sysfs nodes and OPPs have been read
|
||||||
|
off *that* device and one pinned window has been checked against them
|
||||||
|
(`big_cur`/`little_cur`/`gpu_cur_khz` in the result JSON must match the pins). Until then
|
||||||
|
it says `PROFILE_VERIFIED=0` and `bench.sh` / `session.sh` refuse to run against it unless
|
||||||
|
`--allow-unverified-profile` is passed, which labels the run unpinned in the warning.
|
||||||
|
|
||||||
|
That refusal exists because the pin path is silent when it is wrong: the harness writes
|
||||||
|
through `/proc/ppm/policy/hard_userlimit_*` and `/proc/gpufreq/gpufreq_opp_freq`, which are
|
||||||
|
MediaTek nodes, and `su -c 'echo ... > /proc/...'` against a device that has neither fails
|
||||||
|
without a non-zero exit. The run then reports numbers it believes were taken under a pin.
|
||||||
|
|
||||||
|
## Devices
|
||||||
|
|
||||||
|
| profile | device | verified |
|
||||||
|
|---|---|---|
|
||||||
|
| `devices/odinlite.env` | AYN Odin Lite, MT6877 / Mali-G68 | yes |
|
||||||
|
| `devices/xiaomi-adreno830.env` | Xiaomi, Snapdragon 8 Elite / Adreno 830 (`35d0befa`) | **no** - Qualcomm pin path not yet taught to `bench.sh` |
|
||||||
|
| `devices/oppo-mali.env` | Oppo / ColorOS, MediaTek + Mali (`3B159D009VZ00000`) | **no** - OPPs and thermal zone not yet read off the device |
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
# Usage:
|
# Usage:
|
||||||
# bench.sh --device devices/odinlite.env --backend magma [--samples 30]
|
# bench.sh --device devices/odinlite.env --backend magma [--samples 30]
|
||||||
# [--warmup 180] [--label mylabel] [--no-pin]
|
# [--warmup 180] [--label mylabel] [--no-pin]
|
||||||
|
# [--allow-unverified-profile]
|
||||||
# backend: magma | espryt | mobileglues (reference)
|
# backend: magma | espryt | mobileglues (reference)
|
||||||
#
|
#
|
||||||
# Output: one JSON line on stdout (also appended to results/results.jsonl) with
|
# Output: one JSON line on stdout (also appended to results/results.jsonl) with
|
||||||
@@ -37,6 +38,7 @@ SAMPLES=30
|
|||||||
WARMUP=180
|
WARMUP=180
|
||||||
LABEL=""
|
LABEL=""
|
||||||
DO_PIN=1
|
DO_PIN=1
|
||||||
|
ALLOW_UNVERIFIED_PROFILE=0
|
||||||
WORLD_LOAD_TIMEOUT=420
|
WORLD_LOAD_TIMEOUT=420
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
@@ -47,6 +49,7 @@ while [ $# -gt 0 ]; do
|
|||||||
--warmup) WARMUP=$2; shift 2 ;;
|
--warmup) WARMUP=$2; shift 2 ;;
|
||||||
--label) LABEL=$2; shift 2 ;;
|
--label) LABEL=$2; shift 2 ;;
|
||||||
--no-pin) DO_PIN=0; shift ;;
|
--no-pin) DO_PIN=0; shift ;;
|
||||||
|
--allow-unverified-profile) ALLOW_UNVERIFIED_PROFILE=1; shift ;;
|
||||||
*) echo "unknown arg: $1" >&2; exit 2 ;;
|
*) echo "unknown arg: $1" >&2; exit 2 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -55,6 +58,32 @@ done
|
|||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
. "$DEVICE_ENV"
|
. "$DEVICE_ENV"
|
||||||
|
|
||||||
|
# A device profile that has not been read off its device yet is refused here rather than acted
|
||||||
|
# on. The failure it prevents is silent and expensive: the pin path below is MediaTek-specific
|
||||||
|
# (/proc/ppm, /proc/gpufreq), `su -c 'echo ... > /proc/...'` fails without a non-zero exit, and a
|
||||||
|
# run against a profile whose nodes do not exist reports numbers it believes were taken under a
|
||||||
|
# frequency pin. The pin-integrity fields sampled at window end are the only clue, and they are
|
||||||
|
# read after the run rather than before it.
|
||||||
|
#
|
||||||
|
# PROFILE_VERIFIED=1 means: somebody read the cpufreq policies, the GPU OPP and the thermal zone
|
||||||
|
# TYPE off THIS device, ran one pinned window, and checked big_cur/little_cur/gpu_cur_khz in the
|
||||||
|
# result JSON against the pins. Nothing else earns it.
|
||||||
|
require_verified_profile() {
|
||||||
|
if [ "${PROFILE_VERIFIED:-1}" = "1" ]; then return 0; fi
|
||||||
|
if [ "$ALLOW_UNVERIFIED_PROFILE" = "1" ]; then
|
||||||
|
echo "[warn] $DEVICE_ENV declares PROFILE_VERIFIED=0 and --allow-unverified-profile was passed:" >&2
|
||||||
|
echo "[warn] the frequency pins and the thermal gate in it are UNCONFIRMED, so any number this" >&2
|
||||||
|
echo "[warn] run produces is not comparable with a pinned one." >&2
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "$DEVICE_ENV declares PROFILE_VERIFIED=0: its sysfs nodes and OPPs have not been read off" >&2
|
||||||
|
echo "the device, so pinning would fail silently and the run would look pinned but not be." >&2
|
||||||
|
echo "Fill in the TODO_VERIFY_ON_DEVICE fields, confirm one pinned window, set PROFILE_VERIFIED=1 -" >&2
|
||||||
|
echo "or pass --allow-unverified-profile to measure anyway and label the result unpinned." >&2
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
require_verified_profile
|
||||||
|
|
||||||
case "$BACKEND" in
|
case "$BACKEND" in
|
||||||
espryt) RENDERER=$RENDERER_ESPRYT ;;
|
espryt) RENDERER=$RENDERER_ESPRYT ;;
|
||||||
magma) RENDERER=$RENDERER_MAGMA ;;
|
magma) RENDERER=$RENDERER_MAGMA ;;
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
# Device profile: Oppo / ColorOS, Mali GPU, adb serial 3B159D009VZ00000.
|
||||||
|
#
|
||||||
|
# The second of the two devices the disaggregation campaign is measured on (the other is
|
||||||
|
# devices/xiaomi-adreno830.env). Same purpose: keep the pinning and thermal protocol in the
|
||||||
|
# repository rather than in one operator's shell history.
|
||||||
|
#
|
||||||
|
# ============================ NOT YET DEVICE-VERIFIED ============================
|
||||||
|
# PROFILE_VERIFIED=0, and bench.sh / session.sh / profile.sh refuse to run against it unless
|
||||||
|
# --allow-unverified-profile is passed. This part is a MediaTek SoC, so unlike the Adreno
|
||||||
|
# profile the harness's existing /proc/ppm + /proc/gpufreq pin path is probably the right one -
|
||||||
|
# but "probably" is exactly the state a measurement profile must not ship in. The cluster
|
||||||
|
# indices, the available OPPs, the top GPU OPP and the thermal zone TYPE all differ between
|
||||||
|
# MediaTek generations, and odinlite.env's values are for an MT6877, not for this device.
|
||||||
|
#
|
||||||
|
# To promote it: read the four TODO fields off the device
|
||||||
|
# (`cat /sys/devices/system/cpu/cpufreq/policy*/scaling_available_frequencies`,
|
||||||
|
# `cat /proc/gpufreq/gpufreq_opp_dump`, `for tz in /sys/class/thermal/thermal_zone*; do
|
||||||
|
# echo "$tz $(cat $tz/type)"; done`), run one pinned window, check big_cur/little_cur/gpu_cur_khz
|
||||||
|
# in the result JSON against the pins, then set PROFILE_VERIFIED=1.
|
||||||
|
#
|
||||||
|
# ColorOS traps that belong with this device, and cost a run each when forgotten:
|
||||||
|
# * the first install of a not-yet-installed package blocks on
|
||||||
|
# com.oplus.appdetail InstallGuideActivity until "continue install" is tapped
|
||||||
|
# (`input tap 353 2349` on the 1272x2772 panel);
|
||||||
|
# * a foreign-signed APK has to be uninstalled before a rebuild will install;
|
||||||
|
# * pass MSYS_NO_PATHCONV=1 on every adb invocation from Git Bash, or a /data/... argument is
|
||||||
|
# rewritten into a Windows path.
|
||||||
|
# =================================================================================
|
||||||
|
PROFILE_VERIFIED=0
|
||||||
|
PIN_STYLE=ppm
|
||||||
|
|
||||||
|
DEVICE_SERIAL=3B159D009VZ00000
|
||||||
|
|
||||||
|
# Campaign protocol constants (perf-test-protocol): big 1.96 GHz, little 1.55 GHz, GPU at its
|
||||||
|
# top OPP, 40 C start gate. As above, the kHz values are the protocol's targets and the nearest
|
||||||
|
# actual OPP has to be confirmed on the device.
|
||||||
|
CPU_BIG_POLICY=TODO_VERIFY_ON_DEVICE
|
||||||
|
CPU_BIG_FREQ=1958000
|
||||||
|
CPU_LITTLE_POLICY=TODO_VERIFY_ON_DEVICE
|
||||||
|
CPU_LITTLE_FREQ=1550000
|
||||||
|
|
||||||
|
# MediaTek legacy gpufreq, same node family as odinlite. The top OPP is device-specific.
|
||||||
|
GPU_PIN_KHZ=
|
||||||
|
GPU_UTIL_NODE=/sys/kernel/ged/hal/gpu_utilization
|
||||||
|
GPU_CURFREQ_NODE=/sys/kernel/ged/hal/current_freqency
|
||||||
|
|
||||||
|
THERMAL_ZONE_TYPE=TODO_VERIFY_ON_DEVICE
|
||||||
|
THERMAL_START_MAX_MC=40000
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# Device profile: Xiaomi, Snapdragon 8 Elite (Adreno 830), adb serial 35d0befa.
|
||||||
|
#
|
||||||
|
# One of the two devices the disaggregation campaign is measured on (the other is
|
||||||
|
# devices/oppo-mali.env). It exists so that the pinning and thermal protocol the campaign
|
||||||
|
# actually runs is written down in the repository instead of living in one operator's shell
|
||||||
|
# history, and so that a `--device` argument names something reviewable.
|
||||||
|
#
|
||||||
|
# ============================ NOT YET DEVICE-VERIFIED ============================
|
||||||
|
# PROFILE_VERIFIED=0 below, and bench.sh / session.sh / profile.sh REFUSE to run against a
|
||||||
|
# profile that says so unless --allow-unverified-profile is passed. Two of the values here are
|
||||||
|
# protocol constants that are known (the campaign pins big 1.96 GHz / little 1.55 GHz and gates
|
||||||
|
# at 40 C), but the sysfs node names and the exact available OPPs are NOT: this is a Qualcomm
|
||||||
|
# part and the harness was written against MediaTek, where the pin goes through
|
||||||
|
# /proc/ppm/policy/hard_userlimit_* and the GPU through /proc/gpufreq/gpufreq_opp_freq. Neither
|
||||||
|
# path exists on this SoC - Adreno pins through /sys/class/kgsl/kgsl-3d0/devfreq/{min,max}_freq
|
||||||
|
# and its cpufreq policies are not policy6/policy0.
|
||||||
|
#
|
||||||
|
# A profile that quietly wrote MediaTek paths on this device would be the worst outcome
|
||||||
|
# available: `su -c 'echo ... > /proc/ppm/...'` fails silently, bench.sh would report a run it
|
||||||
|
# believes was pinned, and the pin-integrity fields it samples at window end would be the only
|
||||||
|
# clue. So the unknown fields are left EMPTY and marked, rather than guessed, and the refusal is
|
||||||
|
# the mechanism that keeps them from being used before somebody has read them off the device.
|
||||||
|
#
|
||||||
|
# To promote this profile: fill in the four TODO fields from the device
|
||||||
|
# (`cat /sys/devices/system/cpu/cpufreq/policy*/scaling_available_frequencies`,
|
||||||
|
# `ls /sys/class/kgsl/kgsl-3d0/devfreq/`, `for tz in /sys/class/thermal/thermal_zone*; do
|
||||||
|
# echo "$tz $(cat $tz/type)"; done`), teach bench.sh the Qualcomm pin path, run one pinned
|
||||||
|
# window, check big_cur/little_cur/gpu_cur_khz in the result JSON against the pins, and only
|
||||||
|
# then set PROFILE_VERIFIED=1 in the same commit as the bench.sh change.
|
||||||
|
# =================================================================================
|
||||||
|
PROFILE_VERIFIED=0
|
||||||
|
PIN_STYLE=qualcomm-kgsl
|
||||||
|
|
||||||
|
DEVICE_SERIAL=35d0befa
|
||||||
|
|
||||||
|
# Campaign protocol constants (perf-test-protocol): big 1.96 GHz, little 1.55 GHz, GPU at its
|
||||||
|
# top OPP, and a 40 C start gate. The kHz values are the protocol's targets; the nearest actual
|
||||||
|
# OPP has to be read off the device before they are used, because a cpufreq write that names a
|
||||||
|
# frequency the policy does not offer is rounded silently.
|
||||||
|
CPU_BIG_POLICY=TODO_VERIFY_ON_DEVICE
|
||||||
|
CPU_BIG_FREQ=1958400
|
||||||
|
CPU_LITTLE_POLICY=TODO_VERIFY_ON_DEVICE
|
||||||
|
CPU_LITTLE_FREQ=1555200
|
||||||
|
|
||||||
|
# Adreno pins through the kgsl devfreq knobs, not /proc/gpufreq. Left empty deliberately: see
|
||||||
|
# the block above.
|
||||||
|
GPU_PIN_KHZ=
|
||||||
|
GPU_UTIL_NODE=/sys/class/kgsl/kgsl-3d0/gpubusy
|
||||||
|
GPU_CURFREQ_NODE=/sys/class/kgsl/kgsl-3d0/gpuclk
|
||||||
|
|
||||||
|
# Thermal gate: 40 C, the campaign's threshold. The zone TYPE differs per SoC and bench.sh
|
||||||
|
# matches on it by name, so it has to be read off the device.
|
||||||
|
THERMAL_ZONE_TYPE=TODO_VERIFY_ON_DEVICE
|
||||||
|
THERMAL_START_MAX_MC=40000
|
||||||
@@ -7,6 +7,7 @@
|
|||||||
#
|
#
|
||||||
# Usage: session.sh --device devices/odinlite.env [--backend magma|espryt|mobileglues]
|
# Usage: session.sh --device devices/odinlite.env [--backend magma|espryt|mobileglues]
|
||||||
# [--settle 150] [--retries 3] [--no-pin]
|
# [--settle 150] [--retries 3] [--no-pin]
|
||||||
|
# [--allow-unverified-profile]
|
||||||
# Exits 0 with the game in-world (after settle seconds), 1 otherwise.
|
# Exits 0 with the game in-world (after settle seconds), 1 otherwise.
|
||||||
# NOTE: leaves the game running AND the frequency pins active (that is the
|
# NOTE: leaves the game running AND the frequency pins active (that is the
|
||||||
# point of a session). When done: am force-stop the game and unpin via
|
# point of a session). When done: am force-stop the game and unpin via
|
||||||
@@ -24,7 +25,7 @@ RENDERER_ESPRYT=5e273ee2-baca-4c81-8e48-b63feefb9ba8
|
|||||||
RENDERER_MAGMA=2be0dc10-1eef-4ce2-b512-b266dd33fd9e
|
RENDERER_MAGMA=2be0dc10-1eef-4ce2-b512-b266dd33fd9e
|
||||||
RENDERER_MOBILEGLUES=com.fcl.plugin.mobileglues
|
RENDERER_MOBILEGLUES=com.fcl.plugin.mobileglues
|
||||||
|
|
||||||
DEVICE_ENV="" BACKEND="" SETTLE=150 RETRIES=3 DO_PIN=1
|
DEVICE_ENV="" BACKEND="" SETTLE=150 RETRIES=3 DO_PIN=1 ALLOW_UNVERIFIED_PROFILE=0
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
--device) DEVICE_ENV=$2; shift 2 ;;
|
--device) DEVICE_ENV=$2; shift 2 ;;
|
||||||
@@ -32,12 +33,39 @@ while [ $# -gt 0 ]; do
|
|||||||
--settle) SETTLE=$2; shift 2 ;;
|
--settle) SETTLE=$2; shift 2 ;;
|
||||||
--retries) RETRIES=$2; shift 2 ;;
|
--retries) RETRIES=$2; shift 2 ;;
|
||||||
--no-pin) DO_PIN=0; shift ;;
|
--no-pin) DO_PIN=0; shift ;;
|
||||||
|
--allow-unverified-profile) ALLOW_UNVERIFIED_PROFILE=1; shift ;;
|
||||||
*) echo "unknown arg: $1" >&2; exit 2 ;;
|
*) echo "unknown arg: $1" >&2; exit 2 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
[ -n "$DEVICE_ENV" ] || { echo "need --device" >&2; exit 2; }
|
[ -n "$DEVICE_ENV" ] || { echo "need --device" >&2; exit 2; }
|
||||||
# shellcheck disable=SC1090
|
# shellcheck disable=SC1090
|
||||||
. "$DEVICE_ENV"
|
. "$DEVICE_ENV"
|
||||||
|
|
||||||
|
# A device profile that has not been read off its device yet is refused here rather than acted
|
||||||
|
# on. The failure it prevents is silent and expensive: the pin path below is MediaTek-specific
|
||||||
|
# (/proc/ppm, /proc/gpufreq), `su -c 'echo ... > /proc/...'` fails without a non-zero exit, and a
|
||||||
|
# run against a profile whose nodes do not exist reports numbers it believes were taken under a
|
||||||
|
# frequency pin. The pin-integrity fields sampled at window end are the only clue, and they are
|
||||||
|
# read after the run rather than before it.
|
||||||
|
#
|
||||||
|
# PROFILE_VERIFIED=1 means: somebody read the cpufreq policies, the GPU OPP and the thermal zone
|
||||||
|
# TYPE off THIS device, ran one pinned window, and checked big_cur/little_cur/gpu_cur_khz in the
|
||||||
|
# result JSON against the pins. Nothing else earns it.
|
||||||
|
require_verified_profile() {
|
||||||
|
if [ "${PROFILE_VERIFIED:-1}" = "1" ]; then return 0; fi
|
||||||
|
if [ "$ALLOW_UNVERIFIED_PROFILE" = "1" ]; then
|
||||||
|
echo "[warn] $DEVICE_ENV declares PROFILE_VERIFIED=0 and --allow-unverified-profile was passed:" >&2
|
||||||
|
echo "[warn] the frequency pins and the thermal gate in it are UNCONFIRMED, so any number this" >&2
|
||||||
|
echo "[warn] run produces is not comparable with a pinned one." >&2
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "$DEVICE_ENV declares PROFILE_VERIFIED=0: its sysfs nodes and OPPs have not been read off" >&2
|
||||||
|
echo "the device, so pinning would fail silently and the run would look pinned but not be." >&2
|
||||||
|
echo "Fill in the TODO_VERIFY_ON_DEVICE fields, confirm one pinned window, set PROFILE_VERIFIED=1 -" >&2
|
||||||
|
echo "or pass --allow-unverified-profile to measure anyway and label the result unpinned." >&2
|
||||||
|
exit 2
|
||||||
|
}
|
||||||
|
require_verified_profile
|
||||||
ADB="adb -s $DEVICE_SERIAL"
|
ADB="adb -s $DEVICE_SERIAL"
|
||||||
log() { echo "[session] $*" >&2; }
|
log() { echo "[session] $*" >&2; }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user