perf: Pack successor instructions into cache-line gaps

crates/plotnik-compiler/src/emit/layout.rs

@@ -1,7 +1,8 @@
 //! Cache-aligned instruction layout.
 //!
 //! Extracts linear chains from the control flow graph and places them
-//! contiguously. Pads instructions to prevent cache line straddling.
+//! contiguously. Packs successor instructions into free space of predecessor
+//! blocks for improved d-cache locality.
 
 use std::collections::{BTreeMap, HashSet};
 
@@ -10,6 +11,170 @@ use crate::bytecode::{InstructionIR, Label, LayoutResult};
 const CACHE_LINE: usize = 64;
 const STEP_SIZE: usize = 8;
 
+/// Intermediate representation for layout optimization.
+struct LayoutIR {
+    blocks: Vec<Block>,
+    label_to_block: BTreeMap<Label, usize>,
+    label_to_offset: BTreeMap<Label, u8>,
+}
+
+/// A 64-byte cache-line block.
+struct Block {
+    placements: Vec<Placement>,
+    used: u8,
+}
+
+/// An instruction placed within a block.
+struct Placement {
+    label: Label,
+    offset: u8,
+    size: u8,
+}
+
+impl Block {
+    fn new() -> Self {
+        Self {
+            placements: Vec::new(),
+            used: 0,
+        }
+    }
+
+    fn free(&self) -> u8 {
+        CACHE_LINE as u8 - self.used
+    }
+
+    fn can_fit(&self, size: u8) -> bool {
+        self.free() >= size
+    }
+
+    fn place(&mut self, label: Label, size: u8) -> u8 {
+        let offset = self.used;
+        self.placements.push(Placement {
+            label,
+            offset,
+            size,
+        });
+        self.used += size;
+        offset
+    }
+}
+
+impl LayoutIR {
+    fn new() -> Self {
+        Self {
+            blocks: Vec::new(),
+            label_to_block: BTreeMap::new(),
+            label_to_offset: BTreeMap::new(),
+        }
+    }
+
+    fn place(&mut self, label: Label, block_idx: usize, size: u8) {
+        let offset = self.blocks[block_idx].place(label, size);
+        self.label_to_block.insert(label, block_idx);
+        self.label_to_offset.insert(label, offset);
+    }
+
+    /// Move an instruction from its current block to a new block.
+    fn move_to(&mut self, label: Label, new_block_idx: usize, size: u8) {
+        // Remove from old block
+        if let Some(&old_block_idx) = self.label_to_block.get(&label)
+            && let block = &mut self.blocks[old_block_idx]
+            && let Some(pos) = block.placements.iter().position(|p| p.label == label)
+        {
+            let old_placement = block.placements.remove(pos);
+            block.used -= old_placement.size;
+
+            // Compact remaining placements
+            let mut offset = 0u8;
+            for p in &mut block.placements {
+                p.offset = offset;
+                offset += p.size;
+            }
+        }
+
+        // Add to new block
+        let offset = self.blocks[new_block_idx].place(label, size);
+        self.label_to_block.insert(label, new_block_idx);
+        self.label_to_offset.insert(label, offset);
+    }
+
+    fn finalize(self) -> LayoutResult {
+        let mut mapping = BTreeMap::new();
+        let mut max_step_end = 0u16;
+
+        for (block_idx, block) in self.blocks.iter().enumerate() {
+            let block_base_step = (block_idx * CACHE_LINE / STEP_SIZE) as u16;
+            for placement in &block.placements {
+                let step = block_base_step + (placement.offset / STEP_SIZE as u8) as u16;
+                mapping.insert(placement.label, step);
+                let step_end = step + (placement.size / STEP_SIZE as u8) as u16;
+                max_step_end = max_step_end.max(step_end);
+            }
+        }
+
+        LayoutResult::new(mapping, max_step_end)
+    }
+}
+
+/// Block-to-block reference counts for scoring.
+struct BlockRefs {
+    /// (from_block, to_block) -> reference count
+    direct: BTreeMap<(usize, usize), usize>,
+    /// block -> list of predecessor blocks
+    predecessors: BTreeMap<usize, Vec<usize>>,
+}
+
+impl BlockRefs {
+    fn new() -> Self {
+        Self {
+            direct: BTreeMap::new(),
+            predecessors: BTreeMap::new(),
+        }
+    }
+
+    fn add_ref(&mut self, from_block: usize, to_block: usize) {
+        *self.direct.entry((from_block, to_block)).or_default() += 1;
+        let preds = self.predecessors.entry(to_block).or_default();
+        if !preds.contains(&from_block) {
+            preds.push(from_block);
+        }
+    }
+
+    fn count(&self, from_block: usize, to_block: usize) -> usize {
+        self.direct.get(&(from_block, to_block)).copied().unwrap_or(0)
+    }
+
+    fn predecessors(&self, block: usize) -> &[usize] {
+        self.predecessors
+            .get(&block)
+            .map(|v| v.as_slice())
+            .unwrap_or(&[])
+    }
+}
+
+/// Score a candidate block for packing based on reference distance.
+/// Direct refs count 1.0, 1-hop = 0.5, 2-hop = 0.25, capped at 3 hops.
+fn block_score(target_block: usize, candidate_block: usize, refs: &BlockRefs) -> f32 {
+    let mut score = 0.0f32;
+    let mut frontier = vec![(candidate_block, 0u8)];
+    let mut visited = HashSet::new();
+
+    while let Some((block, dist)) = frontier.pop() {
+        if !visited.insert(block) || dist > 3 {
+            continue;
+        }
+
+        let direct_refs = refs.count(block, target_block);
+        score += direct_refs as f32 / (1u32 << dist) as f32;
+
+        for &pred in refs.predecessors(block) {
+            frontier.push((pred, dist + 1));
+        }
+    }
+
+    score
+}
+
 /// Successor graph for layout analysis.
 struct Graph {
     /// label -> list of successor labels
@@ -70,7 +235,121 @@ impl CacheAligned {
         let chains = extract_chains(&graph, instructions, entries);
         let ordered = order_chains(chains, entries);
 
-        assign_step_ids(ordered, &label_to_instr)
+        let mut ir = build_layout_ir(&ordered, &label_to_instr);
+        let refs = build_block_refs(&ir, &label_to_instr);
+        pack_successors(&mut ir, &refs, &label_to_instr);
+
+        ir.finalize()
+    }
+}
+
+/// Build initial LayoutIR from ordered chains.
+fn build_layout_ir(
+    chains: &[Vec<Label>],
+    label_to_instr: &BTreeMap<Label, &InstructionIR>,
+) -> LayoutIR {
+    let mut ir = LayoutIR::new();
+
+    for chain in chains {
+        for &label in chain {
+            let Some(instr) = label_to_instr.get(&label) else {
+                continue;
+            };
+            let size = instr.size() as u8;
+
+            // Ensure current block can fit, or create new one
+            if ir.blocks.is_empty() || !ir.blocks.last().unwrap().can_fit(size) {
+                ir.blocks.push(Block::new());
+            }
+            let block_idx = ir.blocks.len() - 1;
+
+            ir.place(label, block_idx, size);
+        }
+    }
+
+    ir
+}
+
+/// Build block reference counts from current layout.
+fn build_block_refs(
+    ir: &LayoutIR,
+    label_to_instr: &BTreeMap<Label, &InstructionIR>,
+) -> BlockRefs {
+    let mut refs = BlockRefs::new();
+
+    for (&label, &block_idx) in &ir.label_to_block {
+        let Some(instr) = label_to_instr.get(&label) else {
+            continue;
+        };
+        for succ in instr.successors() {
+            if let Some(&succ_block) = ir.label_to_block.get(&succ)
+                && succ_block != block_idx
+            {
+                refs.add_ref(block_idx, succ_block);
+            }
+        }
+    }
+
+    refs
+}
+
+/// Pack successor instructions into free space of predecessor blocks.
+///
+/// When X → Y and X is in block B, try to move Y to an earlier block
+/// that has free space and high reference score to B.
+fn pack_successors(
+    ir: &mut LayoutIR,
+    refs: &BlockRefs,
+    label_to_instr: &BTreeMap<Label, &InstructionIR>,
+) {
+    // Collect candidates: (successor_label, successor_block, predecessor_block)
+    // We want to move successors to earlier blocks with free space
+    let mut candidates: Vec<(Label, usize, usize)> = Vec::new();
+
+    for (&label, &block_idx) in &ir.label_to_block {
+        let Some(instr) = label_to_instr.get(&label) else {
+            continue;
+        };
+
+        // For each successor of this instruction
+        for succ in instr.successors() {
+            if let Some(&succ_block) = ir.label_to_block.get(&succ) {
+                // Only consider moving if successor is in a later block
+                if succ_block > block_idx {
+                    candidates.push((succ, succ_block, block_idx));
+                }
+            }
+        }
+    }
+
+    // Sort by successor block descending (process later blocks first)
+    candidates.sort_by_key(|(_, succ_block, _)| std::cmp::Reverse(*succ_block));
+
+    // Try to move each successor to an earlier block
+    for (succ_label, _succ_block, pred_block) in candidates {
+        // Re-check current block (might have changed)
+        let Some(&current_block) = ir.label_to_block.get(&succ_label) else {
+            continue;
+        };
+
+        let Some(instr) = label_to_instr.get(&succ_label) else {
+            continue;
+        };
+        let size = instr.size() as u8;
+
+        // Find the best earlier block with free space
+        // Prefer blocks that reference the predecessor block (cache locality)
+        let best = (0..current_block)
+            .filter(|&c| ir.blocks[c].can_fit(size))
+            .max_by(|&a, &b| {
+                let score_a = block_score(pred_block, a, refs);
+                let score_b = block_score(pred_block, b, refs);
+                score_a.partial_cmp(&score_b).unwrap_or(std::cmp::Ordering::Equal)
+            });
+
+        if let Some(candidate) = best {
+            ir.move_to(succ_label, candidate, size);
+        }
     }
 }
 
@@ -144,46 +423,3 @@ fn order_chains(mut chains: Vec<Vec<Label>>, entries: &[Label]) -> Vec<Vec<Label
     entry_chains
 }
 
-/// Assign step IDs with cache line awareness.
-fn assign_step_ids(
-    chains: Vec<Vec<Label>>,
-    label_to_instr: &BTreeMap<Label, &InstructionIR>,
-) -> LayoutResult {
-    let mut mapping = BTreeMap::new();
-
-    let mut current_step = 0u16;
-    let mut current_offset = 0usize; // Byte offset for cache alignment
-
-    for chain in chains {
-        for label in chain {
-            let Some(instr) = label_to_instr.get(&label) else {
-                continue;
-            };
-            let size = instr.size();
-
-            // Pad if instruction would straddle cache line boundary
-            let line_offset = current_offset % CACHE_LINE;
-            if line_offset + size > CACHE_LINE {
-                let padding_bytes = CACHE_LINE - line_offset;
-                let padding_steps = (padding_bytes / STEP_SIZE) as u16;
-                current_step += padding_steps;
-                current_offset += padding_bytes;
-            }
-
-            // Invariant: instruction must not straddle cache line
-            assert!(
-                current_offset % CACHE_LINE + size <= CACHE_LINE,
-                "instruction at offset {} with size {} straddles 64-byte cache line",
-                current_offset,
-                size
-            );
-
-            mapping.insert(label, current_step);
-            let step_count = (size / STEP_SIZE) as u16;
-            current_step += step_count;
-            current_offset += size;
-        }
-    }
-
-    LayoutResult::new(mapping, current_step)
-}