ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-23 18:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: liveness 异常目标块判定改 O(E) 预计算

Browse Source
This commit is contained in:
彭俊皓
2026-10-12 12:05:33 +00:00
parent 8b4abe447b
commit 215c74fe0b
4 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+20 -20
View File
@@ -1160,7 +1160,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_builtins" name = "oxide_builtins"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"chrono", "chrono",
"fast-float", "fast-float",
@@ -1185,7 +1185,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_bytecode" name = "oxide_bytecode"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_log", "oxide_log",
@@ -1193,7 +1193,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cfg" name = "oxide_cfg"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_emit", "oxide_emit",
@@ -1204,7 +1204,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cli" name = "oxide_cli"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"bumpalo", "bumpalo",
@@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_code_cache" name = "oxide_code_cache"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"lru", "lru",
"oxide_bytecode", "oxide_bytecode",
@@ -1237,7 +1237,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_compiler" name = "oxide_compiler"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1257,7 +1257,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_dce" name = "oxide_dce"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1271,7 +1271,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_emit" name = "oxide_emit"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxc_allocator", "oxc_allocator",
@@ -1286,7 +1286,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_engine" name = "oxide_engine"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1298,7 +1298,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_ir" name = "oxide_ir"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_log", "oxide_log",
@@ -1307,7 +1307,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_kernel" name = "oxide_kernel"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_liveness" name = "oxide_liveness"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1333,7 +1333,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_log" name = "oxide_log"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"tracing", "tracing",
"tracing-appender", "tracing-appender",
@@ -1342,11 +1342,11 @@ dependencies = [
[[package]] [[package]]
name = "oxide_net" name = "oxide_net"
version = "0.16.12" version = "0.16.13"
[[package]] [[package]]
name = "oxide_parser" name = "oxide_parser"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxc_allocator", "oxc_allocator",
"oxc_ast", "oxc_ast",
@@ -1361,7 +1361,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_regalloc" name = "oxide_regalloc"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1377,7 +1377,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_runtime_api" name = "oxide_runtime_api"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@@ -1390,7 +1390,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_test262" name = "oxide_test262"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1410,7 +1410,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_types" name = "oxide_types"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1423,7 +1423,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_vm" name = "oxide_vm"
version = "0.16.12" version = "0.16.13"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"chrono", "chrono",
Cargo.toml
+1 -1
View File
@@ -24,7 +24,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "0.16.12" version = "0.16.13"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
rust-version = "1.80" rust-version = "1.80"
crates/oxide_liveness/src/dataflow.rs
+16 -5
View File
@@ -33,6 +33,7 @@ pub(super) fn block_liveness(f: &IRFunction, cfg: &Cfg) -> (Vec<Vec<u64>>, Vec<V
// 每块 gen/kill：先算块内反向扫描的 gen，再算正向扫描的 kill。 // 每块 gen/kill：先算块内反向扫描的 gen，再算正向扫描的 kill。
let mut gen: Vec<Vec<u64>> = vec![vec![0u64; words]; n]; let mut gen: Vec<Vec<u64>> = vec![vec![0u64; words]; n];
let mut kill: Vec<Vec<u64>> = vec![vec![0u64; words]; n]; let mut kill: Vec<Vec<u64>> = vec![vec![0u64; words]; n];
let exc_targets = exception_target_blocks(cfg);
for (b, block) in cfg.blocks.iter().enumerate() { for (b, block) in cfg.blocks.iter().enumerate() {
// gen：块内反向扫描，kill 先于 gen（`live = (live − def) ∪ use`）。 // gen：块内反向扫描，kill 先于 gen（`live = (live − def) ∪ use`）。
// 顺序理由：COMPOUND_ADD 等读-写同寄存器指令的 uses 含 Rd（见 oxide_ir::contract 的 def/use 约定）， // 顺序理由：COMPOUND_ADD 等读-写同寄存器指令的 uses 含 Rd（见 oxide_ir::contract 的 def/use 约定），
@@ -58,11 +59,7 @@ pub(super) fn block_liveness(f: &IRFunction, cfg: &Cfg) -> (Vec<Vec<u64>>, Vec<V
// Exception 目标块：入口 reg 0 隐式 def（异常展开在块外写 regs[0]）。 // Exception 目标块：入口 reg 0 隐式 def（异常展开在块外写 regs[0]）。
// gen 去 0 防"无 def use"把活度污染到函数入口；kill 插 0 防 0 从任何 pred 流入。 // gen 去 0 防"无 def use"把活度污染到函数入口；kill 插 0 防 0 从任何 pred 流入。
// 注：preds 是 Vec<BBId>（无 EdgeKind），须从源块 succs 侧检测 Exception 边。 // 注：preds 是 Vec<BBId>（无 EdgeKind），须从源块 succs 侧检测 Exception 边。
let is_exception_target = cfg if exc_targets[b] {
.blocks
.iter()
.any(|src| src.succs.iter().any(|&(dst, k)| dst == b && k == EdgeKind::Exception));
if is_exception_target {
bitset_clear(&mut gen[b], 0); bitset_clear(&mut gen[b], 0);
bitset_set(&mut kill[b], 0); bitset_set(&mut kill[b], 0);
} }
@@ -108,6 +105,20 @@ pub(super) fn block_liveness(f: &IRFunction, cfg: &Cfg) -> (Vec<Vec<u64>>, Vec<V
(live_in, live_out, reg_count) (live_in, live_out, reg_count)
} }
/// 异常目标块标记：一次全边遍历（O(E)）预计算哪些块是 Exception 边目标，
/// 供逐块循环 O(1) 查表，替代原先每块一次全图扫描。
pub(super) fn exception_target_blocks(cfg: &Cfg) -> Vec<bool> {
let mut targets = vec![false; cfg.blocks.len()];
for block in &cfg.blocks {
for &(dst, kind) in &block.succs {
if kind == EdgeKind::Exception {
targets[dst] = true;
}
}
}
targets
}
/// 从 entry 出发 DFS 沿 succs 存储序（确定序）收集 postorder 后反转； /// 从 entry 出发 DFS 沿 succs 存储序（确定序）收集 postorder 后反转；
/// 不可达块按升序追加在末尾。纯 Vec + visited 位图，保证确定性。 /// 不可达块按升序追加在末尾。纯 Vec + visited 位图，保证确定性。
fn reverse_postorder(cfg: &Cfg) -> Vec<usize> { fn reverse_postorder(cfg: &Cfg) -> Vec<usize> {
crates/oxide_liveness/src/ranges.rs
+3 -6
View File
@@ -8,7 +8,7 @@
//! //!
//! 位集为 `u64` 压缩（与 dataflow 同 words 布局），逐指令集经 `copy_from_slice` 落地。 //! 位集为 `u64` 压缩（与 dataflow 同 words 布局），逐指令集经 `copy_from_slice` 落地。
use oxide_cfg::{Cfg, EdgeKind}; use oxide_cfg::Cfg;
use oxide_ir::IRFunction; use oxide_ir::IRFunction;
use crate::live_info::{bitset_clear, bitset_set}; use crate::live_info::{bitset_clear, bitset_set};
@@ -20,6 +20,7 @@ pub(super) fn inst_liveness(
let words = (reg_count + 1).div_ceil(64); let words = (reg_count + 1).div_ceil(64);
let mut before = vec![vec![0u64; words]; f.insts.len()]; let mut before = vec![vec![0u64; words]; f.insts.len()];
let mut after = vec![vec![0u64; words]; f.insts.len()]; let mut after = vec![vec![0u64; words]; f.insts.len()];
let exc_targets = crate::dataflow::exception_target_blocks(cfg);
for (b, block) in cfg.blocks.iter().enumerate() { for (b, block) in cfg.blocks.iter().enumerate() {
let mut live = block_live_out[b].clone(); // 从块级 liveOut 出发（非 liveIn） let mut live = block_live_out[b].clone(); // 从块级 liveOut 出发（非 liveIn）
for i in block.inst_range.clone().rev() { for i in block.inst_range.clone().rev() {
@@ -36,11 +37,7 @@ pub(super) fn inst_liveness(
} }
// Exception 目标块：入口 reg 0 隐式 def（异常展开写 regs[0]）截断无 def use。 // Exception 目标块：入口 reg 0 隐式 def（异常展开写 regs[0]）截断无 def use。
// preds 是 Vec<BBId>（无 EdgeKind），从源块 succs 侧检测 Exception 边。 // preds 是 Vec<BBId>（无 EdgeKind），从源块 succs 侧检测 Exception 边。
let is_exception_target = cfg if exc_targets[b] {
.blocks
.iter()
.any(|src| src.succs.iter().any(|&(dst, k)| dst == b && k == EdgeKind::Exception));
if is_exception_target {
bitset_clear(&mut live, 0); bitset_clear(&mut live, 0);
} }
debug_assert_eq!(live, block_live_in[b], "ranges 反向扫描与 dataflow liveIn 不一致，块 {b}"); debug_assert_eq!(live, block_live_in[b], "ranges 反向扫描与 dataflow liveIn 不一致，块 {b}");