## Problem Houses and boats (multis) were pathed correctly only by **delegation to the slow path**: `StepCache.TryGetMask` returns `Fallthrough_Multi` for any multi-covered cell, and `GetSuccessors` ran `CheckMovement` **8× per cell** (each re-resolving the tile stack via `GetStaticAndMultiTiles`) — a sustained per-step cost near every house/boat. There was also no automated test pinning multi pathfinding. This branch is the full multi-pathfinding effort in phases on one branch. ## Phase 1 — characterization tests (the oracle) Implementation-agnostic invariants: a cache-on≡cache-off whole-path invariant, a per-cell sweep vs `CheckMovement` over footprint+halo (incl. destination Z), hand-verified routing (around walls, demolish-reopens, foundation-redesign-honored), classic-house / foundation / boat fixtures, non-vacuity guards. These gate every later phase byte-for-byte. ## Phase 2 — live single-pass synthesizer `StepProbe.ComputeMultiMaskAt` synthesizes a covered cell's full 8-direction `StepMask` in one pass (the existing surface/step logic over `GetStaticAndMultiTiles` instead of 8× `CheckMovement`). `GetSuccessors` routes `Fallthrough_Multi` cells through it. No new cache, no `.swb` change. **~1.5×**, zero added allocations. ## Phase 3 / 3.1 — warm per-`multiID` interior cache (airtight) `MultiMaskCache` caches each fixed multi's local-frame `StepMask` for **interior** cells (cell + all 8 neighbours covered → terrain-neighbour-free → position-invariant), keyed by `multiID & 0x3FFF`, built lazily from the MCL. Interior cells become ~20 ns lookups. The cache is gated on a **per-instance footprint-clean flag** (`BaseMulti.PathInteriorCacheState`): an instance whose whole footprint terrain is below its floor (`maxTerrain < minFloor`) serves from the cache; a **dirty** instance (terrain intrudes — a contrived/GM placement) **degrades to live-synth, never a wrong mask**. This closes a cross-instance soundness gap (the cached mask depends on neighbour terrain too) found in a holistic review. The gate resets whenever the footprint's world-terrain relationship can change — **location, map, or ItemID** (a boat's heading swaps the MCL). **Boats are cached too.** Their per-`multiID` deck masks are movement-invariant (built once per heading), so a sailing boat never rebuilds them; only the cheap clean-flag rescan repeats per move (and only when pathed near). Narrow existing boats have little interior; wide galleons (`multi.mul`) would gain Castle-class. `HouseFoundation` (per-instance runtime `DesignState`) is the one type that stays on the live path. ## Verification - `UOContent.Tests` **454/454**, `Server.Tests` **708/708**, 0 failures. - The Phase-1 oracle (`MultiPathInvariantTests`, cache-on ≡ cache-off) stays **byte-identical** with the synthesizer + interior cache active. - Tests pin: footprint-cleanliness (clean vs sunk), dirty/cluttered placement degrades to live-synth while still pathing, clean placement serves, and the gate resets on move/ItemID change. ## Performance (modernuo/ModernUO-Benchmarks#8, full-fixture) Houses at **Green Acres** (flat staff region → clean footprints, the legit-placement case): | Route | Slow path | Phase 3.1 (interior cache) | Speedup | |-------|----------:|---------------------------:|--------:| | `around_a` (29 steps) | 238.3 µs | **49.1 µs** | **4.85×** | | `around_b` (29 steps) | 224.3 µs | **49.5 µs** | **4.53×** | ~130 of ~167 multi cells/route serve from the cache (~20 ns) vs 37 live-synth. Per-cell, the slow path's 8× `CheckMovement` grows with multi complexity (GuildHouse ~857 ns → Castle ~1,194 ns), the synthesizer is a flat ~780 ns, and the cache serve is ~20 ns — so big/tall multis (and wide galleons) gain most. Identical allocations throughout.
158 lines
5.2 KiB
C#
158 lines
5.2 KiB
C#
using Server.Engines.Pathing.Cache;
|
|
using Server.Items;
|
|
using Server.Mobiles;
|
|
using Server.PathAlgorithms;
|
|
using Server.Systems.FeatureFlags;
|
|
using Xunit;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace Server.Tests.Pathfinding;
|
|
|
|
[Collection("Sequential Pathfinding Tests")]
|
|
public class MultiPathInvariantTests
|
|
{
|
|
private readonly ITestOutputHelper _output;
|
|
|
|
public MultiPathInvariantTests(ITestOutputHelper output) => _output = output;
|
|
|
|
private const int MapId = 1;
|
|
|
|
private sealed class WalkerStub : Mobile
|
|
{
|
|
public WalkerStub() => Body = 0xC9;
|
|
}
|
|
|
|
private static Direction[] FindWithFlag(Mobile m, Map map, Point3D start, Point3D goal, bool cacheOn)
|
|
{
|
|
var prev = ContentFeatureFlags.BitmapPathfindingCache;
|
|
try
|
|
{
|
|
ContentFeatureFlags.BitmapPathfindingCache = cacheOn;
|
|
StepCache.Instance.Clear();
|
|
StepCache.Instance.MissPromotionThreshold = 1;
|
|
return BitmapAStarAlgorithm.Instance.Find(m, map, start, goal);
|
|
}
|
|
finally
|
|
{
|
|
ContentFeatureFlags.BitmapPathfindingCache = prev;
|
|
}
|
|
}
|
|
|
|
[Theory]
|
|
// start, goal: straddle a house placed between them (house at ~ midpoint).
|
|
[InlineData(1500, 1600, 1500, 1612)] // N-S across the footprint
|
|
[InlineData(1494, 1606, 1512, 1606)] // E-W across the footprint
|
|
public void Find_CacheOn_EqualsCacheOff_WithHousePresent(int sx, int sy, int gx, int gy)
|
|
{
|
|
var map = Map.Maps[MapId];
|
|
Assert.NotNull(map);
|
|
|
|
// Place the house at the midpoint so it sits between start and goal.
|
|
var hx = (sx + gx) / 2;
|
|
var hy = (sy + gy) / 2;
|
|
map.GetAverageZ(hx, hy, out _, out var hz, out _);
|
|
var multi = new TestMulti(0x74);
|
|
multi.MoveToWorld(new Point3D(hx, hy, (sbyte)hz), map);
|
|
|
|
var walker = new WalkerStub();
|
|
map.GetAverageZ(sx, sy, out _, out var sz, out _);
|
|
var start = new Point3D(sx, sy, (sbyte)sz);
|
|
var goal = new Point3D(gx, gy, (sbyte)sz);
|
|
walker.MoveToWorld(start, map);
|
|
|
|
try
|
|
{
|
|
var on = FindWithFlag(walker, map, start, goal, cacheOn: true);
|
|
var off = FindWithFlag(walker, map, start, goal, cacheOn: false);
|
|
|
|
// Both-null or both-equal arrays. Equality of the direction sequence is the invariant.
|
|
Assert.Equal(off == null, on == null);
|
|
if (on != null)
|
|
{
|
|
Assert.Equal(off, on);
|
|
_output.WriteLine($"({sx},{sy})->({gx},{gy}) house: {on.Length} steps, cache==slow");
|
|
}
|
|
else
|
|
{
|
|
_output.WriteLine($"({sx},{sy})->({gx},{gy}) house: no path (both)");
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
walker.Delete();
|
|
multi.Delete();
|
|
}
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(1500, 1600, 1498, 1598)]
|
|
[InlineData(1500, 1600, 1497, 1599)]
|
|
public void Find_CacheOn_EqualsCacheOff_NoMultiControl(int sx, int sy, int gx, int gy)
|
|
{
|
|
var map = Map.Maps[MapId];
|
|
var walker = new WalkerStub();
|
|
map.GetAverageZ(sx, sy, out _, out var sz, out _);
|
|
var start = new Point3D(sx, sy, (sbyte)sz);
|
|
var goal = new Point3D(gx, gy, (sbyte)sz);
|
|
walker.MoveToWorld(start, map);
|
|
|
|
try
|
|
{
|
|
var on = FindWithFlag(walker, map, start, goal, cacheOn: true);
|
|
var off = FindWithFlag(walker, map, start, goal, cacheOn: false);
|
|
Assert.Equal(off == null, on == null);
|
|
if (on != null)
|
|
{
|
|
Assert.Equal(off, on);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
walker.Delete();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Find_CacheOn_EqualsCacheOff_RoutesAroundHouse()
|
|
{
|
|
var map = Map.Maps[MapId];
|
|
Assert.NotNull(map);
|
|
|
|
// Open area at (1480,1620,z=20): paths exist in all 8 directions (probe confirmed).
|
|
// N-S route: start=(1480,1630) goal=(1480,1610). House at (1480,1620) on direct line.
|
|
// Detour exists E (~1488+) and W (~1472-). Both cache-on and cache-off must agree.
|
|
const int hx = 1480, hy = 1620;
|
|
const int sx = 1480, sy = 1630;
|
|
const int gx = 1480, gy = 1610;
|
|
|
|
map.GetAverageZ(hx, hy, out _, out var hz, out _);
|
|
var multi = new TestMulti(0x74);
|
|
multi.MoveToWorld(new Point3D(hx, hy, (sbyte)hz), map);
|
|
|
|
var walker = new WalkerStub();
|
|
map.GetAverageZ(sx, sy, out _, out var sz, out _);
|
|
map.GetAverageZ(gx, gy, out _, out var gz, out _);
|
|
var start = new Point3D(sx, sy, (sbyte)sz);
|
|
var goal = new Point3D(gx, gy, (sbyte)gz);
|
|
walker.MoveToWorld(start, map);
|
|
|
|
try
|
|
{
|
|
var on = FindWithFlag(walker, map, start, goal, cacheOn: true);
|
|
var off = FindWithFlag(walker, map, start, goal, cacheOn: false);
|
|
|
|
// Non-vacuity: a real around-the-house route must exist on BOTH sides.
|
|
Assert.NotNull(off);
|
|
Assert.NotNull(on);
|
|
// The invariant: cache and slow path agree on that route.
|
|
Assert.Equal(off, on);
|
|
|
|
_output.WriteLine($"around-house: {on.Length} steps, cache==slow");
|
|
}
|
|
finally
|
|
{
|
|
walker.Delete();
|
|
multi.Delete();
|
|
}
|
|
}
|
|
}
|