scale-check fit fixes; big-run summary reads each check's output

crates/mirth-lab/src/tools/scale_check.rs

@@ -214,6 +214,16 @@ struct Res {
 fn one(args: &Args, sizes: &[usize], shape: &(&str, fn(usize) -> String, Extra, usize), opt: u32) -> Res {
     let (name, gen_fn, extra, cap) = *shape;
     let mut rows = Vec::new();
+    // A shape capped below the series gets the series scaled to end at its cap, so it still has
+    // enough points for a fit.
+    let scaled: Vec<usize>;
+    let sizes = if sizes.iter().filter(|&&n| n <= cap).count() >= 3 {
+        sizes
+    } else {
+        let top = *sizes.last().unwrap_or(&1) as f64;
+        scaled = sizes.iter().map(|&n| ((n as f64 / top) * cap as f64).round().max(1.0) as usize).collect();
+        &scaled
+    };
     for &n in sizes.iter().filter(|&&n| n <= cap) {
         let mut r = measure(args, &gen_fn(n), opt);
         r.n = n;
@@ -225,7 +235,12 @@ fn one(args: &Args, sizes: &[usize], shape: &(&str, fn(usize) -> String, Extra,
     }
     let ok: Vec<&Row> = rows.iter().filter(|r| r.user.is_some()).collect();
     let first_user = ok.first().and_then(|r| r.user).unwrap_or(0.0);
-    let k_time = exponent(&ok.iter().map(|r| (r.n, (r.user.unwrap() - first_user * 0.5).max(1e-3))).collect::<Vec<_>>());
+    // Below half a second the timer's noise decides the slope.
+    let k_time = if ok.last().and_then(|r| r.user).unwrap_or(0.0) < 0.5 {
+        None
+    } else {
+        exponent(&ok.iter().map(|r| (r.n, (r.user.unwrap() - first_user * 0.5).max(1e-3))).collect::<Vec<_>>())
+    };
     let k_rss = exponent(&ok.iter().map(|r| (r.n, r.rss_kb.unwrap_or(0) as f64)).collect::<Vec<_>>());
     let k_frame = (extra == Extra::Frame).then(|| exponent(&ok.iter().map(|r| (r.n, r.max_frame as f64)).collect::<Vec<_>>())).flatten();
     let k_size = (extra == Extra::RunSize).then(|| exponent(&ok.iter().map(|r| (r.n, r.run_size.unwrap_or(0) as f64)).collect::<Vec<_>>())).flatten();

rustc/big-run.sh

@@ -19,6 +19,17 @@ mkdir -p "$dir"
 lab=$dir/mirth-lab
 [ -x "$lab" ] || cp "$here/../target/release/mirth-lab" "$lab"
 
+findings() { # dir: what the check found, by its own output
+  local d=$1
+  case $(basename "$d") in
+    gate-check) echo "$(grep -oE '"(ice|no-gate-message|ungated)"\): [0-9]+' "$d/run.log" | awk '{s += $NF} END {print s + 0}') problems (ICEs, ungated or no gate message)" ;;
+    abi-diff-*) echo "$(grep -o '"kind"' "$d/results.json" 2>/dev/null | wc -l) unlabelled differences" ;;
+    scale-check) echo "$(awk 'NF && $0 ~ /(timeout|error|k_[a-z]+ = )/' "$d/run.log" | wc -l) shapes over budget" ;;
+    release-diff|xlink) echo "$(tail -1 "$d/run.log" | cut -c1-80)" ;;
+    *) echo "$(ls "$d/findings" 2>/dev/null | wc -l) findings" ;;
+  esac
+}
+
 run() { # name args...
   local name=$1; shift
   if [ -n "${ONLY:-}" ] && [[ " $ONLY " != *" $name "* ]]; then return; fi
@@ -28,7 +39,7 @@ run() { # name args...
   local t0=$SECONDS
   "$lab" "$@" > "$dir/$name/run.log" 2>&1
   echo "exit $? after $((SECONDS - t0))s" > "$dir/$name/DONE"
-  echo "$(date +%T) done $name: $(cat "$dir/$name/DONE"), $(ls "$dir/$name/findings" 2>/dev/null | wc -l) findings"
+  echo "$(date +%T) done $name: $(cat "$dir/$name/DONE"), $(findings "$dir/$name")"
 }
 
 sweep=(--tests "$tests" --jobs "$jobs")
@@ -54,7 +65,7 @@ run xlink xlink --toolchain "$pin" --jobs 8 --work "$dir/xlink"
   for d in "$dir"/*/; do
     n=$(basename "$d")
     [ -e "$d/DONE" ] || continue
-    printf '%-14s %-22s %4s findings   %s\n' "$n" "$(cat "$d/DONE")" "$(ls "$d/findings" 2>/dev/null | wc -l)" "$(tail -1 "$d/run.log" | cut -c1-120)"
+    printf '%-14s %-22s %s\n' "$n" "$(cat "$d/DONE")" "$(findings "$d")"
   done
 } > "$dir/summary.txt"
 cat "$dir/summary.txt"