@asmlift/core 0.9.0 → 0.10.0

package/src/ir/core.ts

@@ -86,6 +86,28 @@ export interface LocalObject {
   /** What an object FILE records of where the object sits, absent for an assembler listing, whose
    *  `.align` is among its directives. */
   placement?: LocalObjectPlacement;
+  /** Every address the initializer holds, in offset order — the words a relocation fills in at
+   *  link time, which the bytes alone do not carry. Absent for an object holding none. The bytes
+   *  under one say nothing: the relocation's `addend` is the whole of it. */
+  relocs?: readonly LocalObjectReloc[];
+  /** The object is the compiler's own, under a label the source never wrote (agbcc's `.LC0`): the
+   *  constant image a local aggregate's initializer is copied from. `name` is then the label, no
+   *  declaration spells it, and it reaches the C only as that local's initializer
+   *  (l3/constinit.ts). */
+  anonymous?: true;
+}
+
+/** The bytes of every address an initializer holds ({@link LocalObjectReloc}): a pointer's, on every
+ *  target whose initializers the frontends relocate (agbcc's `.word sym`, mwcc's `R_PPC_ADDR32`). */
+export const LOCAL_OBJECT_ADDRESS_BYTES = 4;
+
+/** One address an initializer holds: the pointer-width word at byte `offset` of the object is
+ *  `symbol`'s address plus `addend` — an ordinary global's, the only kind a declaration outside the
+ *  function can name (frontend/reloc-symbol.ts). */
+export interface LocalObjectReloc {
+  offset: number;
+  symbol: string;
+  addend: number;
 }
 
 /** What an object file records of where a static sits. */
@@ -112,6 +134,12 @@ export interface LocalObjectDirectives {
   /** every value directive writes a string (`.ascii`), as the compiler writes a string literal —
    *  whole, or as the elements of an array or struct of strings */
   string: boolean;
+  /** every run of padding among the value directives, as [byte offset, byte length], when there
+   *  is one: in an array, the elements its brace initializer left out — the compiler writes every
+   *  element the source spelled, zero or not, as a value, and each run it left out as a `.space`
+   *  (varasm.c `output_constructor`), wherever the run falls: after the last value, ahead of the
+   *  first, or between two (a designator, a nested brace's short row). In a struct, alignment too. */
+  gaps?: [number, number][];
 }
 
 /** The function-scope statics a function DEFINES, keyed by {@link LocalObject.symbol} — the object a
@@ -135,14 +163,16 @@ export type LocalObjects = ReadonlyMap<string, LocalObject>;
  *  `deadHome` — THE STORE DOES NOT REACH THE IR. Every slot-modelling frontend spells a word
  *  sp-relative store as a write to the SSA key `sp@k` instead of a `store` op (`stackSlotKey`), so
  *  a slot nothing reloads has no reader, no op and no value: it simply is not there by L1. MIPS and
- *  Thumb lift such a store. PowerPC refuses it, because an unread store may be a call's outgoing
- *  stack argument (frontend/ppc.ts), so a PowerPC lift never reports a dead home. A
+ *  Thumb lift such a store. PowerPC refuses it, because an unread slot store may be a call's
+ *  outgoing stack argument; in a function that makes no call, mwcc's local area takes such a store
+ *  as a store to a frame object instead of a slot (frontend/ppc.ts `measurePpcFrame`). Either way a
+ *  PowerPC lift never reports a dead home. A
  *  parameter stored to two slots, one of them reloaded, still counts — the dead store happened —
  *  and the reader's own gates decide what a parameter with that much traffic may become.
  *
  *  It asks NO FRAME PARTITION, and that is the difference from {@link SlotHomes}. A slot home is a
  *  DECLARATION RANK, so `sp@40` had to be classified as this function's local before it could be
- *  stamped, and MIPS declares no partition and so stamps none. "Stored here and never read back"
+ *  stamped, and MIPS declares no `declaredLocals` and so stamps none. "Stored here and never read back"
  *  needs no such classification: it is a statement about the store, true at any offset.
  *
  *  `selfRedefined` — THE REGISTER IDENTITY DOES NOT REACH THE IR EITHER. SSA renames, so nothing
@@ -178,7 +208,7 @@ export type ParamEvidence = ReadonlyMap<Value, ParamObservation>;
  *  A KEY IS NOT A FRAME COORDINATE, and the frontends differ on exactly that. `sp@40` is a local
  *  on one ABI and the caller's fifth argument on another, so the shared stamp asks the frontend's
  *  own `LiveInModel.declaredLocals` and refuses an offset outside it — Thumb declares a range,
- *  MIPS and PPC declare no partition and so stamp nothing. An entry here therefore means "storage
+ *  MIPS and PPC declare none and so stamp nothing. An entry here therefore means "storage
  *  this function DECLARES, homed at k", not "some sp-relative key".
  *
  *  DECLARES, NOT OWNS, AND THE DIFFERENCE IS AN AGBCC FACT WITH A LIVE DEPENDENCY: `ownedLocals`,
@@ -283,6 +313,35 @@ export function foldWriteOrder(order: WriteOrder | undefined, from: Block, into:
   order.writes.set(into, base + (order.writes.get(from) ?? 0));
 }
 
+/** The `laddr` attribute that marks a function's OWN struct return object: the local its hidden
+ *  struct-return pointer became, or the one its struct returned in a register is built in
+ *  (frontend/own-struct-return.ts). Neither lives in this frame, so no frame offset names it and
+ *  its `off` means nothing. */
+export const OWN_RETURN_OBJECT = 'returned';
+
+/** The `call` attribute of L1 that says its result is the IMAGE of a struct its callee is declared
+ *  to return in the return register (frontend/call-plan.ts `registerStructLocal`): a word the
+ *  frontend reads as any call's, which `liftRegisterStructCalls` (frontend/register-struct-call.ts)
+ *  turns into the struct assigned to a local and re-read off it. No call carries it past that.
+ *  `true`, or {@link STRUCT_HOMED} where the frontend saw the image stored to a frame home. */
+export const REGISTER_STRUCT = 'registerStruct';
+
+/** The value of {@link REGISTER_STRUCT} on a call whose image the function stores to a frame word
+ *  (frontend/ppc.ts): mwcc gives a struct the source names a home, read or not, and one the source
+ *  only returns none — `struct T s = mk(1); return s;` is `bl mk; stw r3,8(r1)`, `return mk(1);` is
+ *  `bl mk` alone. */
+export const STRUCT_HOMED = 'homed';
+
+/** The `laddr` attribute that marks the local a struct returned in a register is assigned to
+ *  (frontend/register-struct-call.ts), holding the callee's name, which names the local. The
+ *  struct lives in the return register, not in this frame, so no frame offset names it and its
+ *  `off` means nothing, as for {@link OWN_RETURN_OBJECT}. */
+export const CALL_RETURN_OBJECT = 'callReturned';
+
+/** The `ret` attribute that says it hands back the {@link OWN_RETURN_OBJECT} whole, by value: its
+ *  operand is that object's address, and the C returns the object. */
+export const RETURNS_OBJECT = 'returnsObject';
+
 export function mkValue(type: IrType): Value {
   return { type };
 }
@@ -314,6 +373,15 @@ export function calleeName(op: Op): string | undefined {
   return op.opcode === 'call' && typeof op.attrs.target === 'string' ? op.attrs.target : undefined;
 }
 
+/** The operands a call passes a struct BY VALUE (frontend/call-plan.ts `foldByValueArgs`): each
+ *  one's place in the operands and the declared parameter it is. The two differ by more than a
+ *  hidden return pointer wherever a parameter before it takes two operands, so the parameter is
+ *  carried rather than re-derived. */
+export function byValueOperands(op: Op): { at: number; param: number }[] {
+  const pairs = op.opcode === 'call' ? ((op.attrs.byValue as number[] | undefined) ?? []) : [];
+  return Array.from({ length: pairs.length / 2 }, (_, i) => ({ at: pairs[2 * i], param: pairs[2 * i + 1] }));
+}
+
 /** A call's arguments, the callee value of an indirect call aside. */
 export function callArgs(op: Op): Value[] {
   return calleeValue(op) === undefined ? op.operands : op.operands.slice(0, -1);
@@ -388,6 +456,33 @@ export function reachableBlocks(fn: Fn): Set<Block> {
   return seen;
 }
 
+/** The blocks `from` reaches along FORWARD edges — never a back-edge, whose target dominates its
+ *  source — `from` itself included. A block of `stop` is reached but not walked past.
+ *
+ *  Forward only, so an enclosing loop's next iteration does not count: the exit of a loop nested in
+ *  another reaches every block of the inner body round the outer back-edge, and a full walk would
+ *  say it runs the inner loop's own arms. Two passes ask "does a loop's exit run this block":
+ *  `raise/latch.ts`'s exit-trampoline scope gate and `structure.ts`'s `offExitPathOf` (the
+ *  duplication policy `codeBreakArm` and `earlyReturnArm` share). */
+export function reachForward(
+  from: Block,
+  dom: ReadonlyMap<Block, ReadonlySet<Block>>,
+  stop: ReadonlySet<Block> = new Set(),
+): Set<Block> {
+  const seen = new Set<Block>();
+  for (const stack = [from]; stack.length > 0;) {
+    const x = stack.pop()!;
+    if (seen.has(x)) {
+      continue;
+    }
+    seen.add(x);
+    if (!stop.has(x)) {
+      stack.push(...successorsOf(x).filter((s) => !dom.get(x)!.has(s)));
+    }
+  }
+  return seen;
+}
+
 /** Predecessor map for the whole function's CFG. */
 export function predecessors(fn: Fn): Map<Block, Block[]> {
   const preds = new Map<Block, Block[]>();
@@ -405,7 +500,7 @@ export function predecessors(fn: Fn): Map<Block, Block[]> {
 /** Forward dominators (iterative data-flow). dom(b) = {b} ∪ ⋂ dom(preds).
  *
  *  A CFG fact, so it lives beside `predecessors` it is built on rather than with either consumer:
- *  `verify` needs it to check def-dominates-use, `structure/loops.ts` to tell a back-edge from a
+ *  `verify` needs it to check def-dominates-use, `ir/loops.ts` to tell a back-edge from a
  *  forward one, and `raise/latch.ts` to tell a latch from a preheader. */
 
 export function dominators(fn: Fn): Map<Block, Set<Block>> {

package/src/ir/discipline.ts

@@ -4,8 +4,10 @@
 // Two kinds of fact meet here. The registry's flags (ir/opcodes.ts `OpSig`: `effects`, `reads`,
 // `traps`) are facts about an OPCODE. A PLACEMENT is a fact about one OP, decided once by the pass
 // that knew it: `call` is its own opcode; `helper` is the stamp `runtime-helpers.ts` `helperOp` puts
-// on a value op the asm computed by calling a runtime routine; `device` is the `volatile` the
-// frontend's device-pin pass (frontend/device-pins.ts) puts on a memory access; `declared` is the
+// on a value op the asm computed by calling a runtime routine; `device` is the `volatile` a frontend
+// puts on a memory access, decided by two pins — the device pin (frontend/device-pins.ts), for an
+// access of a device register, and the dead-read pin (frontend/dead-reads.ts), for a read at ANY
+// address whose value the lifted function never uses; `declared` is the
 // stamp raise/declared-volatile.ts puts on an access of an object the symbol map declares volatile —
 // a read only where the compiler could have made it of a `volatile` — as the lift is made and again
 // when structuring starts. Every question below takes the op, so a pass
@@ -50,7 +52,7 @@
 //     a read the stamp cannot place by byte — a runtime index, an `aload` — of an object the map
 //       qualifies only some members of, which may reach a plain member (symbols.ts
 //       `declaresVolatile`).
-import type { Op } from './core';
+import type { Block, Op, Value } from './core';
 import { MEM_BASE_OPS, type OpSig, opSig } from './opcodes';
 
 /** Why an op must run where the asm ran it. */
@@ -107,23 +109,37 @@ const PLACEMENT_ANSWERS: Readonly<Record<Placement, PlacementAnswers>> = {
   },
 };
 
-/** The placement an op carries, or null for an op that may render wherever its value is used. */
-export function placedAt(op: Op): Placement | null {
+/** Every placement stamp an op carries, the one that places it first. An op can carry two: a read
+ *  of an object the map declares volatile is `declared` and, kept by the lift's own pin (frontend/
+ *  dead-reads.ts, frontend/device-pins.ts), `device` too.
+ *
+ *  A declaration that qualifies the object places the access before a lift's own stamp does: both
+ *  say the access is `volatile`, and the declaration is the spelling the source used, so the
+ *  access counts and spells as the object's (raise/declared-volatile.ts re-derives it per map, and
+ *  under a map that declares nothing the lift's stamp places it again — which is why a rebuild
+ *  carries both, `carryDiscipline`). */
+function stampsOf(op: Op): Placement[] {
   if (op.opcode === 'call') {
-    return 'call';
-  }
-  if (MEM_BASE_OPS.has(op.opcode) && op.attrs.volatile === true) {
-    return 'device';
+    return ['call'];
   }
+  const stamps: Placement[] = [];
   if (MEM_BASE_OPS.has(op.opcode) && op.attrs[DECLARED_VOLATILE] === true) {
-    return 'declared';
+    stamps.push('declared');
+  }
+  if (MEM_BASE_OPS.has(op.opcode) && op.attrs.volatile === true) {
+    stamps.push('device');
   }
   // An `opaque` carries `helper` too, naming the call nothing could fold (`refuseUnmodelledHelpers`);
   // it is no value op, and its `effects` flag already places it.
   if (op.opcode !== 'opaque' && typeof op.attrs.helper === 'string') {
-    return 'helper';
+    stamps.push('helper');
   }
-  return null;
+  return stamps;
+}
+
+/** The placement an op carries, or null for an op that may render wherever its value is used. */
+export function placedAt(op: Op): Placement | null {
+  return stampsOf(op)[0] ?? null;
 }
 
 const answered = (op: Op, q: 'keptWhenDead' | 'speculationUnsafe' | 'counted'): boolean => {
@@ -161,12 +177,59 @@ export function effectful(op: Op): boolean {
 }
 
 /** May a dead result be deleted? Registered, no effect, not control flow, and not an op whose
- *  placement keeps it. */
+ *  placement keeps it. A memory read whose value the RAW lift never uses is never asked: the
+ *  frontend stamps it `volatile` first (frontend/dead-reads.ts), because a compiler deletes every
+ *  plain read nobody uses, so one still in the target was qualified. What reaches this question
+ *  plain is a read only asmlift's own rewrites orphaned, or one that pass's gates refused. */
 export function deletableWhenDead(op: Op): boolean {
   const sig = sigOf(op);
   return !!sig && !sig.effects && !sig.terminator && !answered(op, 'keptWhenDead');
 }
 
+/** THE DEAD OPS of these blocks: each op `deletableWhenDead` answers yes for whose single result no
+ *  op outside the set reads, as an operand or as a successor's argument, to a fixed point. The ONE
+ *  definition of dead: pattern/engine.ts `dce` deletes exactly this set, and the dead-read pin
+ *  (frontend/dead-reads.ts) asks it of the raw lift before anything is deleted, so the pin's "dead"
+ *  cannot drift from what the pass would delete.
+ *
+ *  `usesOperands` says whether an op's operands are uses at all. Every op's are, for `dce`; the pin
+ *  passes the one exception a declaration makes: the `ret` of a function its own prototype declares
+ *  void, whose operand the structurer suppresses (structure/analysis.ts `indexUses`). */
+export function deadOps(blocks: readonly Block[], usesOperands: (op: Op) => boolean = () => true): Set<Op> {
+  const dead = new Set<Op>();
+  let changed = true;
+  while (changed) {
+    changed = false;
+    const used = new Set<Value>();
+    for (const b of blocks) {
+      for (const op of b.ops) {
+        if (dead.has(op)) {
+          continue;
+        }
+        if (usesOperands(op)) {
+          for (const o of op.operands) {
+            used.add(o);
+          }
+        }
+        for (const s of op.successors) {
+          for (const a of s.args) {
+            used.add(a);
+          }
+        }
+      }
+    }
+    for (const b of blocks) {
+      for (const op of b.ops) {
+        if (!dead.has(op) && deletableWhenDead(op) && op.results.length === 1 && !used.has(op.results[0])) {
+          dead.add(op);
+          changed = true;
+        }
+      }
+    }
+  }
+  return dead;
+}
+
 /** Must the structurer still SPELL this op when nothing consumes its result — an effect, or a
  *  memory read?
  *
@@ -174,8 +237,9 @@ export function deletableWhenDead(op: Op): boolean {
  *  the C claim: nothing observes a load nobody reads. This one is the COMPILER claim: an optimizing
  *  compiler deletes every dead read it is allowed to delete, so one still in the target is evidence
  *  the source's access was `volatile`. A yes here only says the op may not be dropped silently;
- *  whether a `volatile` can reach the access is an ADDRESS-level question the caller asks
- *  (structure.ts `volatileQualifiable`), and a read it answers no to is dropped.
+ *  whether the read was `volatile` is decided once, by the dead-read pin (frontend/dead-reads.ts),
+ *  and the caller spells a read only where it is `qualified` (structure.ts `volatileQualifiable`),
+ *  dropping one the pin left plain.
  *
  *  Its own function and not `orderSensitive`, though the two agree on every registered opcode: they
  *  ask different questions, and a registry change that splits them is a decision to make at each. */
@@ -238,11 +302,12 @@ export function forgetHelperPlacement(op: Op): Op {
   return op;
 }
 
-/** `attrs`, plus the placement of `from`, for an op a pass builds to stand for `from`: a memory
- *  access keeps its `volatile` or its `declared` stamp, a value op its `helper`. Every op rebuilder
- *  carries the stamps through here, so a placement decided once is not lost to a rebuild that
- *  forgot to copy it. */
+/** `attrs`, plus every placement stamp of `from`, for an op a pass builds to stand for `from`: a
+ *  memory access keeps its `volatile` and its `declared` stamp, a value op its `helper`. Every op
+ *  rebuilder carries the stamps through here, so a placement decided once is not lost to a rebuild
+ *  that forgot to copy it. EVERY stamp, not only the one that places the op: a read carrying both
+ *  `declared` and `device` that kept only `declared` would be left plain — and deleted as dead — by
+ *  a later stamp that no longer finds the declaration. */
 export function carryDiscipline(from: Op, attrs: Op['attrs']): Op['attrs'] {
-  const p = placedAt(from);
-  return p === null ? attrs : { ...attrs, ...PLACEMENT_ANSWERS[p].carried(from) };
+  return stampsOf(from).reduce((acc, p) => ({ ...acc, ...PLACEMENT_ANSWERS[p].carried(from) }), attrs);
 }

package/src/ir/entry.ts

@@ -0,0 +1,159 @@
+// asmlift — does a test placed ahead of a loop compute the loop's own test on the loop's entry values?
+//
+// Three questions ask exactly that, at two levels, and all read the answer from this one predicate:
+//   • structure's GUARD FUSION (`structure.ts`, through `hazards.ts`): the `if` a rotated loop is
+//     wrapped in is deleted when it is the loop's test at the first iteration, and the loop re-tests;
+//   • raise's RE-ROLL (`raise/reroll.ts`): a loop test the compiler peeled into the loop's entry is
+//     deleted when it is the latch's test at the values the entry hands the loop;
+//   • the re-roll's TOP-TEST RESTORE (`entryGuard`, same file): the guard a restored top test
+//     makes redundant is deleted when it is that test at the entry values, with the same exit args.
+//
+// The reading is STRUCTURAL, never semantic: two values are the same when they are one value, or
+// when their defining ops have one opcode, one set of attributes and operands that are the same in
+// turn. A false negative costs a loud decline, the direction to be wrong in. `entry` models the
+// first iteration: on the loop side (`a`), a value it maps is read as the value it maps to, and
+// below that substitution the walk is in the entry's world, where the map no longer applies — a
+// loop-invariant back-edge argument read inside the entry's own expression is itself there, not the
+// param it feeds.
+//
+// `normalize` adds the equalities the re-roll needs and guard fusion does not take: an `add` or
+// `or` of a constant 0 on EITHER side, commutative operands in either order, and a load off
+// `base + c` as the same load off `base` at its offset plus `c` (`str[0]` against `str[i]` at
+// `i = 0`). Each is an identity of the integer operators, so turning it on for guard fusion is a
+// spelling decision, not a soundness one.
+import { Op, Value } from './core';
+import { spelledWhenDead } from './discipline';
+import { NEGATED_ICMP } from './opcodes';
+
+export interface EntryReading {
+  /** the value each loop-side value holds on the loop's first iteration */
+  readonly entry: ReadonlyMap<Value, Value>;
+  /** values whose defining op may be read through; everything else compares by identity. Default:
+   *  every value. An operand-free op that reads no memory (a constant, a symbol address) is always
+   *  read through: it is its attributes wherever it sits. */
+  readonly through?: (v: Value) => boolean;
+  /** the identities above, beyond `x + 0` / `x - 0` / `x | 0` with the zero on the right */
+  readonly normalize?: boolean;
+}
+
+/** Opcodes whose two operands may be read in either order, under `normalize`. */
+const COMMUTES = new Set(['add', 'mul', 'and', 'or', 'xor', 'icmp_eq', 'icmp_ne']);
+
+/** Is `a` (loop side), read on the loop's entry values, the same value as `b`? With `negated`, is it
+ *  `b`'s logical opposite — the usual case where a guard spells the loop's test the other way round. */
+export function sameAtEntry(
+  defs: ReadonlyMap<Value, Op>,
+  a: Value,
+  b: Value,
+  reading: EntryReading,
+  negated = false,
+): boolean {
+  const { entry, through = () => true, normalize = false } = reading;
+  const readable = (v: Value): boolean => {
+    const d = defs.get(v);
+    return d !== undefined && (through(v) || (d.operands.length === 0 && !spelledWhenDead(d)));
+  };
+  const constOf = (v: Value): number | null => {
+    const d = defs.get(v);
+    return d?.opcode === 'const' && typeof d.attrs?.value === 'number' ? d.attrs.value : null;
+  };
+  /** A constant `v` reads as: under `normalize`, as its entry substitution reads. */
+  const constAt = (v: Value, atEntry: boolean): number | null => constOf(normalize ? view(v, atEntry).x : v);
+  /** `x0` as the comparison reads it: through the entry map while on the loop side (`!atEntry`), and
+   *  with `x + 0` / `x - 0` / `x | 0` read as `x` — substituting a loop variable by its init constant
+   *  turns ordinary index arithmetic into exactly these. */
+  function view(x0: Value, atEntry0: boolean): { x: Value; atEntry: boolean } {
+    let x = x0;
+    let atEntry = atEntry0;
+    for (;;) {
+      const mapped = atEntry ? undefined : entry.get(x);
+      if (mapped !== undefined) {
+        x = mapped;
+        atEntry = true;
+        continue;
+      }
+      const d = readable(x) ? defs.get(x) : undefined;
+      if (!d || d.operands.length !== 2 || !['add', 'sub', 'or'].includes(d.opcode)) {
+        return { x, atEntry };
+      }
+      if (constAt(d.operands[1], atEntry) === 0) {
+        x = d.operands[0];
+      } else if (normalize && d.opcode !== 'sub' && constAt(d.operands[0], atEntry) === 0) {
+        x = d.operands[1];
+      } else {
+        return { x, atEntry };
+      }
+    }
+  }
+  /** A load's address as a base and a constant offset, the `+ c` of an `add` folded in. */
+  const address = (d: Op, atEntry0: boolean): { base: Value; off: number; atEntry: boolean } => {
+    const off = Number(d.attrs.off ?? 0);
+    const { x: base, atEntry } = view(d.operands[0], atEntry0);
+    const ad = readable(base) ? defs.get(base) : undefined;
+    if (ad?.opcode === 'add' && ad.operands.length === 2) {
+      for (const k of [0, 1]) {
+        const c = constAt(ad.operands[k], atEntry);
+        if (c !== null) {
+          return { base: ad.operands[1 - k], off: off + c, atEntry };
+        }
+      }
+    }
+    return { base, off, atEntry };
+  };
+  const attrsOf = (d: Op, drop: string | null) =>
+    JSON.stringify(Object.fromEntries(Object.entries(d.attrs ?? {}).filter(([k]) => k !== drop)));
+  // memoised per (x, y, side): a value its own consumer reads twice would otherwise double the work
+  // at every level
+  const memo = new Map<string, boolean>();
+  const ids = new Map<Value, number>();
+  const id = (v: Value) => ids.get(v) ?? (ids.set(v, ids.size), ids.size - 1);
+  /** `da` (read with `atEntry`) and `db` (the entry's own) compute the same value. */
+  const sameOp = (da: Op, db: Op, opcodeOk: boolean, atEntry: boolean): boolean => {
+    if (!opcodeOk || da.operands.length !== db.operands.length) {
+      return false;
+    }
+    if (normalize && da.opcode === 'load' && db.opcode === 'load') {
+      const x = address(da, atEntry);
+      const y = address(db, true);
+      return x.off === y.off && attrsOf(da, 'off') === attrsOf(db, 'off') && same(x.base, x.atEntry, y.base);
+    }
+    if (attrsOf(da, null) !== attrsOf(db, null)) {
+      return false;
+    }
+    if (da.operands.every((o, i) => same(o, atEntry, db.operands[i]))) {
+      return true;
+    }
+    return (
+      normalize &&
+      COMMUTES.has(da.opcode) &&
+      da.operands.length === 2 &&
+      same(da.operands[0], atEntry, db.operands[1]) &&
+      same(da.operands[1], atEntry, db.operands[0])
+    );
+  };
+  function same(x0: Value, atEntry0: boolean, y0: Value): boolean {
+    const { x, atEntry } = view(x0, atEntry0);
+    const { x: y } = view(y0, true);
+    if (x === y) {
+      return true;
+    }
+    const key = `${id(x)},${id(y)},${atEntry ? 1 : 0}`;
+    const hit = memo.get(key);
+    if (hit !== undefined) {
+      return hit;
+    }
+    const da = readable(x) ? defs.get(x) : undefined;
+    const db = readable(y) ? defs.get(y) : undefined;
+    const r = !!da && !!db && sameOp(da, db, da.opcode === db.opcode, atEntry);
+    memo.set(key, r);
+    return r;
+  }
+  if (!negated) {
+    return same(a, false, b);
+  }
+  const { x, atEntry } = view(a, false);
+  const { x: y } = view(b, true);
+  const da = readable(x) ? defs.get(x) : undefined;
+  const db = readable(y) ? defs.get(y) : undefined;
+  return !!da && !!db && sameOp(da, db, NEGATED_ICMP[da.opcode] === db.opcode, atEntry);
+}

package/src/{structure → ir}/loops.ts

@@ -1,4 +1,8 @@
-// asmlift — natural-loop discovery: the pure CFG analysis the structurer consumes.
+// asmlift — natural-loop discovery: the pure CFG analysis the structurer consumes, and the raise
+// passes that rewrite a loop's edges before it (`raise/latch.ts`, `raise/reroll.ts`).
+//
+// A substrate fact like dominance, so it lives here and not under `structure/`: that keeps the
+// dependency between the levels one way — structure imports raise, never the reverse.
 //
 // Produces a DEFINITE header set computed structurally from back-edges — a block is a loop header
 // iff it is a real back-edge target (`h ∈ dom(t)` for an edge `t→h`), never inferred from `cond_br`
@@ -8,7 +12,7 @@
 //
 // Dominance itself is a substrate fact and lives in `ir/core.ts`; `analyzeLoops` takes the map as
 // a parameter, so a caller passes `dominators(fn)` from there.
-import { Block, Fn, predecessors, successorsOf } from '../ir/core';
+import { Block, Fn, predecessors, successorsOf } from './core';
 
 /** One natural loop, keyed by its header. */
 export interface NaturalLoop {