irisandClaude Fable 5.1
167862ca1b
Wrapping the composer's field in .scrollable().masked() needed three layout defects fixed first, each with a headless regression test that was confirmed to fail without its fix: - MaxSize/Sized reported a caller's declared dp length unresolved, and Span places a child from the abs/rel of what it reported, so dp(168) was worth zero: the bar got a slot of nothing the moment its content passed six lines and the Scroll inside measured its container at -63px (container=-63 content=415.8 amt=478.8 on the emulator). Len::fold_dp, used on the way out, plus a debug_assert in draw_inner that a reported Size carries no dp -- the rule is about every widget, not those two. - Masked allocated a fresh mask slot per draw, and draw_inner's unchanged-region fast path does not revisit descendants, so they kept clipping against a box the bar had moved away from: four live mask entries, none of them current, and the field drew nothing. ActiveData::own_mask, allocated once and rewritten in place. - mov updates active.region and accumulates the same delta on the move slot, and resolved_region added both, so a panned widget's own hit box sat at twice the pan -- the composer's field was untappable after a drag. ActiveData::move_applied. Scroll itself measured the right number by a misleading route; it is written against painter.px_size() now and still reports its content's size, since reporting the container makes the answer a function of itself. Verified on this checkout's emulator: swipe 540 1200 -> 540 1460 moved the field's Message box 31,1041..1048,1509 -> 31,1131..1048,1651 with its height unchanged at 468px. run-bench.sh polled logcat for a prefix copy_report also logs at startup, so it printed a report that had never been run. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
75 lines
3.0 KiB
Bash
Executable File
75 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
# Installs and runs the iris `bench` build on this checkout's own emulator
|
|
# (per this-machine-android's per-checkout-AVD rule; `emu serial` picks it)
|
|
# and prints the report -- the iris half of `app/transcript-bench.sh`'s
|
|
# job. No coordinates: the button is found by its accessibility label
|
|
# through `ui-trace`, per AGENTS.md's "Driving the UI".
|
|
#
|
|
# Usage: ./run-bench.sh [--apk PATH]
|
|
# Defaults to this checkout's own release APK
|
|
# (app/build/outputs/apk/release/app-release.apk) if it exists, else the
|
|
# debug one -- build one first with ./build-apk.sh.
|
|
set -eu
|
|
cd "$(dirname "$0")"
|
|
|
|
APK=""
|
|
while [ $# -gt 0 ]; do
|
|
case "$1" in
|
|
--apk) APK="$2"; shift 2 ;;
|
|
*) echo "run-bench.sh: unknown argument: $1" >&2; exit 1 ;;
|
|
esac
|
|
done
|
|
if [ -z "$APK" ]; then
|
|
if [ -f app/build/outputs/apk/release/app-release.apk ]; then
|
|
APK=app/build/outputs/apk/release/app-release.apk
|
|
else
|
|
APK=app/build/outputs/apk/debug/app-debug.apk
|
|
fi
|
|
fi
|
|
if [ ! -f "$APK" ]; then
|
|
echo "run-bench.sh: no APK at $APK -- run ./build-apk.sh first" >&2
|
|
exit 1
|
|
fi
|
|
|
|
SERIAL=$(emu serial)
|
|
PKG=$(aapt2 dump badging "$APK" 2>/dev/null | sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p")
|
|
if [ -z "$PKG" ]; then
|
|
BUILD_TOOLS=$(ls -d "$HOME"/Android/Sdk/build-tools/*/ | sort -V | tail -1)
|
|
PKG=$("${BUILD_TOOLS}aapt2" dump badging "$APK" | sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p")
|
|
fi
|
|
|
|
echo "run-bench.sh: installing $APK ($PKG) on $SERIAL"
|
|
adb -s "$SERIAL" install -r "$APK" >/dev/null
|
|
adb -s "$SERIAL" shell am force-stop "$PKG"
|
|
adb -s "$SERIAL" logcat -c
|
|
adb -s "$SERIAL" shell am start -n "$PKG/dev.iris.android.demo.MainActivity" >/dev/null
|
|
|
|
ui-trace record -s "$SERIAL" -d 3000 --do "tap 'Run benchmark'" -o /tmp/run-bench-tap.txt >/dev/null
|
|
|
|
# Poll for the report line rather than a fixed sleep -- the run itself is
|
|
# a fixed script (RUST.md's "Benchmark v2": 16 flings, a 20s streaming
|
|
# phase, ~61s of typing, 10s of keyboard toggles, roughly 2.5 minutes end
|
|
# to end) but device speed varies. 260s cap rather than v1's 90s -- v2 is
|
|
# a longer script than v1's swipe-loop-only run.
|
|
# The report's own first line, not the bare "iris bench report:" prefix:
|
|
# `copy_report` logs that prefix too ("nothing to copy -- run the benchmark
|
|
# first", which the app emits at startup), so polling for the prefix
|
|
# returned instantly and the script printed a report that was never run.
|
|
REPORT_LINE="iris bench report: iris bench report"
|
|
i=0
|
|
while [ "$i" -lt 260 ]; do
|
|
LINE=$(adb -s "$SERIAL" logcat -d -s iris-android-app:I 2>/dev/null | grep "$REPORT_LINE" || true)
|
|
if [ -n "$LINE" ]; then
|
|
break
|
|
fi
|
|
i=$((i + 1))
|
|
sleep 1
|
|
done
|
|
if [ -z "$LINE" ]; then
|
|
echo "run-bench.sh: no report after 260s -- check logcat by hand" >&2
|
|
exit 1
|
|
fi
|
|
# -A 60 rather than v1's -A 6 -- v2's report has a per-phase block (four
|
|
# phases, four lines each) on top of the frames/bench sections v1 had.
|
|
adb -s "$SERIAL" logcat -d -s iris-android-app:I | grep -A 60 "$REPORT_LINE"
|