mirror of
https://github.com/pjh456/OxideJS.git
synced 2026-10-24 02:31:13 +08:00
pjh123
d9acda7417
RegAlloc 改写后补第三次 liveness，为每条 CALL/NEW/SUPER_CALL 计算调用点 存活上界（最大存活物理槽号 + 1，254/255 由帧单独保存不计入），编码进 ext 高 8 位（nargs 低 8 位不变）。三处手写压帧窗口 = min(调用方活动寄存 器, 存活上界)，restore_frame 按窗口回拷；CallFrame 新增 caller_active_reg_limit 保存调用方真实活动上限，恢复时不随截断窗口缩水。 生成器/异步函数体调用点保持全量窗口。spread 调用与运行时发起压帧 （accessor/内联）走全量路径不受影响。
264 lines
11 KiB
Rust
264 lines
11 KiB
Rust
//! RegAlloc 改写 pass：干涉图染色决策（前半）+ 指令改写/元数据回写（后半）。
|
||
//!
|
||
//! 消费 `oxide_liveness::LiveInfo`（inst_live_before 逐指令活集）与
|
||
//! `oxide_ir::IRFunction`（param_layout 参数段 + nested escaped 收集）。染色：干涉图
|
||
//! （graph.rs）+ Kemp 简化/贪心/spill 区间拆分（color.rs）→ AllocMap；改写：rewrite.rs
|
||
//! （指令槽 vreg→phys 重写 + spill 插入 + 参数连续性 MOV + label 重建）+ finish.rs
|
||
//! （元数据回写）。`alloc()` 是完整改写 pass 入口，`color()` 只产决策。
|
||
|
||
mod alloc_map;
|
||
mod call_window;
|
||
mod color;
|
||
mod finish;
|
||
mod graph;
|
||
mod regalloc_log;
|
||
mod rewrite;
|
||
|
||
pub use alloc_map::{Alloc, AllocMap, FreshKind, FreshVreg, SpillPlan};
|
||
pub use call_window::encode_call_window;
|
||
|
||
use oxide_ir::IRFunction;
|
||
use oxide_liveness::LiveInfo;
|
||
|
||
/// 染色：`&IRFunction + &LiveInfo → Result<AllocMap, String>`。纯函数，只读 IR。
|
||
/// 空 IRFunction 退化：Ok(AllocMap::new())。Err = 无可行染色（RangeError 路径，
|
||
/// 消息与 lower 逐字一致，编译接线时原样传播）。
|
||
pub fn color(f: &IRFunction, live: &LiveInfo) -> Result<AllocMap, String> {
|
||
if f.insts.is_empty() {
|
||
return Ok(AllocMap::new());
|
||
}
|
||
color::run(f, live)
|
||
}
|
||
|
||
/// 寄存器分配改写：`&mut IRFunction + &LiveInfo → Result<(), String>`。
|
||
///
|
||
/// # 步骤
|
||
/// - LiveInfo 维度守卫：inst 数不符说明 LiveInfo 已过期（精确 DCE 删指令后下标位移），
|
||
/// 内部重跑 build_cfg + liveness 重建，不重复建分析引擎
|
||
/// - `color()` 产染色决策（Err 原样传播）
|
||
/// - `rewrite::run` 指令改写 → `finish::run` 元数据回写
|
||
/// - nested 递归自顶向下：每子函数独立 vreg 空间独立 alloc
|
||
///
|
||
/// # 注意事项
|
||
/// - 嵌套子函数不继承父 LiveInfo，各自重跑 build_cfg + liveness。
|
||
pub fn alloc(f: &mut IRFunction, live: &LiveInfo) -> Result<(), String> {
|
||
if f.insts.is_empty() && f.nested.is_empty() {
|
||
return Ok(());
|
||
}
|
||
// LiveInfo 维度守卫：删改后的过期 LiveInfo 索引错位会误删活指令
|
||
let live = if live.inst_live_before.len() == f.insts.len() && !f.insts.is_empty() {
|
||
live.clone()
|
||
} else {
|
||
let cfg = oxide_cfg::build_cfg(f);
|
||
oxide_liveness::liveness(f, &cfg)
|
||
};
|
||
let map = color(f, &live)?;
|
||
regalloc_debug!("alloc: {} vregs -> {} phys", map.map.len(), map.phys_peak);
|
||
rewrite::run(f, &map);
|
||
finish::run(f, &map);
|
||
remap_nested_parent_slots(&mut f.nested, &map);
|
||
for child in &mut f.nested {
|
||
let cfg = oxide_cfg::build_cfg(child);
|
||
let l = oxide_liveness::liveness(child, &cfg);
|
||
alloc(child, &l)?;
|
||
}
|
||
Ok(())
|
||
}
|
||
|
||
fn remap_nested_parent_slots(nested: &mut [IRFunction], map: &AllocMap) {
|
||
remap_nested_parent_slots_below(nested, map, u32::MAX);
|
||
}
|
||
|
||
fn remap_nested_parent_slots_below(nested: &mut [IRFunction], map: &AllocMap, ancestor_limit: u32) {
|
||
for child in nested {
|
||
let inherited_limit = child.param_layout.base.min(ancestor_limit);
|
||
for (_, slot) in &mut child.builtin_reg_map {
|
||
if *slot < inherited_limit {
|
||
if let Some(Alloc::Phys(physical)) = map.map.get(slot) {
|
||
*slot = *physical;
|
||
}
|
||
}
|
||
}
|
||
for inst in &mut child.insts {
|
||
let slot = match inst.op {
|
||
oxide_bytecode::opcode::OpCode::LOAD_VAR => &mut inst.a,
|
||
oxide_bytecode::opcode::OpCode::STORE_VAR => &mut inst.rd,
|
||
_ => continue,
|
||
};
|
||
if let oxide_ir::operand::Operand::Reg(vreg) = slot {
|
||
if *vreg < inherited_limit {
|
||
if let Some(Alloc::Phys(physical)) = map.map.get(vreg) {
|
||
*vreg = *physical;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
// 子函数自身 vreg 从 param_layout.base 起分配；祖先 map 不得改写同号的后代局部槽。
|
||
remap_nested_parent_slots_below(&mut child.nested, map, inherited_limit);
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
use oxide_bytecode::opcode::OpCode;
|
||
use oxide_ir::inst::Inst;
|
||
use oxide_ir::operand::Operand;
|
||
|
||
#[test]
|
||
fn alloc_empty_ok() {
|
||
let mut f = IRFunction::new();
|
||
assert!(alloc(&mut f, &LiveInfo::new()).is_ok());
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_stale_live_reruns() {
|
||
let mut f = IRFunction::new();
|
||
f.insts
|
||
.push(Inst::new(OpCode::ADD, Operand::Reg(3), Operand::Reg(1), Operand::Reg(2)));
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(3), Operand::None, Operand::None));
|
||
// 空 LiveInfo（维度不符）→ 内部重跑
|
||
let stale = LiveInfo::new();
|
||
assert!(alloc(&mut f, &stale).is_ok());
|
||
// 重写后全部槽 ≤253
|
||
for inst in &f.insts {
|
||
for o in [&inst.rd, &inst.a, &inst.b] {
|
||
if let Operand::Reg(r) = o {
|
||
assert!(*r <= 253, "重写后槽 {r} 超 253");
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_remaps_high_parameter_segment() {
|
||
let mut f = IRFunction::new();
|
||
f.param_layout = oxide_ir::ParamLayout { base: 300, count: 1 };
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(300), Operand::None, Operand::None));
|
||
let cfg = oxide_cfg::build_cfg(&f);
|
||
let live = oxide_liveness::liveness(&f, &cfg);
|
||
alloc(&mut f, &live).unwrap();
|
||
assert_eq!(f.param_layout, oxide_ir::ParamLayout { base: 1, count: 1 });
|
||
assert!(matches!(f.insts[0].rd, Operand::Reg(1)));
|
||
assert_eq!(f.n_registers, 2);
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_propagates_moved_parameter_to_nested_slot_reads() {
|
||
let mut f = IRFunction::new();
|
||
f.param_layout = oxide_ir::ParamLayout { base: 300, count: 1 };
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(300), Operand::None, Operand::None));
|
||
let mut child = IRFunction::new();
|
||
child.param_layout = oxide_ir::ParamLayout { base: 301, count: 0 };
|
||
child
|
||
.insts
|
||
.push(Inst::new(OpCode::LOAD_VAR, Operand::Reg(302), Operand::Reg(300), Operand::None));
|
||
child
|
||
.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(302), Operand::None, Operand::None));
|
||
f.nested.push(child);
|
||
let cfg = oxide_cfg::build_cfg(&f);
|
||
let live = oxide_liveness::liveness(&f, &cfg);
|
||
alloc(&mut f, &live).unwrap();
|
||
assert!(matches!(f.nested[0].insts[0].a, Operand::Reg(1)));
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_propagates_high_escaped_slot_to_nested_reads() {
|
||
let mut f = IRFunction::new();
|
||
f.insts.push(Inst::load_const(Operand::Reg(254), 0));
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(254), Operand::None, Operand::None));
|
||
let mut child = IRFunction::new();
|
||
child.param_layout = oxide_ir::ParamLayout { base: 300, count: 0 };
|
||
child
|
||
.insts
|
||
.push(Inst::new(OpCode::LOAD_VAR, Operand::Reg(301), Operand::Reg(254), Operand::None));
|
||
child
|
||
.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(301), Operand::None, Operand::None));
|
||
f.nested.push(child);
|
||
let cfg = oxide_cfg::build_cfg(&f);
|
||
let live = oxide_liveness::liveness(&f, &cfg);
|
||
alloc(&mut f, &live).unwrap();
|
||
let physical = match f.insts[0].rd {
|
||
Operand::Reg(reg) => reg,
|
||
_ => panic!("LOAD_CONST 目标应为寄存器"),
|
||
};
|
||
assert!((1..=253).contains(&physical));
|
||
assert!(matches!(f.nested[0].insts[0].a, Operand::Reg(reg) if reg == physical));
|
||
}
|
||
|
||
#[test]
|
||
fn ancestor_remap_preserves_descendant_vreg_collision() {
|
||
let mut child = IRFunction::new();
|
||
child.param_layout = oxide_ir::ParamLayout { base: 200, count: 0 };
|
||
child.builtin_reg_map.push(("root".to_string(), 100));
|
||
let mut grandchild = IRFunction::new();
|
||
grandchild.param_layout = oxide_ir::ParamLayout { base: 400, count: 0 };
|
||
grandchild.builtin_reg_map.push(("root".to_string(), 100));
|
||
grandchild.builtin_reg_map.push(("child".to_string(), 300));
|
||
grandchild
|
||
.insts
|
||
.push(Inst::new(OpCode::LOAD_VAR, Operand::Reg(401), Operand::Reg(100), Operand::None));
|
||
grandchild
|
||
.insts
|
||
.push(Inst::new(OpCode::LOAD_VAR, Operand::Reg(402), Operand::Reg(300), Operand::None));
|
||
child.nested.push(grandchild);
|
||
|
||
let mut map = AllocMap::new();
|
||
map.map.insert(100, Alloc::Phys(7));
|
||
map.map.insert(300, Alloc::Phys(8));
|
||
remap_nested_parent_slots(std::slice::from_mut(&mut child), &map);
|
||
|
||
assert_eq!(child.builtin_reg_map, vec![("root".to_string(), 7)]);
|
||
assert_eq!(child.nested[0].builtin_reg_map, vec![("root".to_string(), 7), ("child".to_string(), 300)]);
|
||
assert_eq!(child.nested[0].insts[0].a, Operand::Reg(7));
|
||
assert_eq!(child.nested[0].insts[1].a, Operand::Reg(300));
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_err_propagates() {
|
||
// 255 参数 CALL：参数窗口吞并全部可分配色 → k=0 → 无可行染色 → Err
|
||
let mut f = IRFunction::new();
|
||
f.insts
|
||
.push(Inst::call(Operand::Reg(1), Operand::Reg(2), Operand::Reg(3000), 255));
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(5), Operand::None, Operand::None));
|
||
let cfg = oxide_cfg::build_cfg(&f);
|
||
let live = oxide_liveness::liveness(&f, &cfg);
|
||
let err = alloc(&mut f, &live).unwrap_err();
|
||
assert!(err.contains("too many registers"), "Err: {err}");
|
||
}
|
||
|
||
#[test]
|
||
fn alloc_recurses_nested() {
|
||
let mut f = IRFunction::new();
|
||
f.insts.push(Inst::load_const(Operand::Reg(1), 0));
|
||
f.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(1), Operand::None, Operand::None));
|
||
let mut sub = IRFunction::new();
|
||
sub.insts.push(Inst::load_const(Operand::Reg(3), 0));
|
||
sub.insts
|
||
.push(Inst::new(OpCode::RETURN, Operand::Reg(3), Operand::None, Operand::None));
|
||
f.nested.push(sub);
|
||
let cfg = oxide_cfg::build_cfg(&f);
|
||
let live = oxide_liveness::liveness(&f, &cfg);
|
||
alloc(&mut f, &live).unwrap();
|
||
// 父与子函数全部槽 ≤253
|
||
for inst in &f.insts {
|
||
for o in [&inst.rd, &inst.a, &inst.b] {
|
||
if let Operand::Reg(r) = o {
|
||
assert!(*r <= 253);
|
||
}
|
||
}
|
||
}
|
||
assert!(!f.nested[0].insts.is_empty(), "子函数也被重写");
|
||
assert!(f.nested[0].n_registers <= 253, "子函数 n_registers 已回写");
|
||
}
|
||
}
|