language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm_interp: create a branch cache to improve perf in some programs

Browse source
This commit is contained in:
Brian Carroll 2022-12-12 22:13:11 +00:00
parent 6d0e7426dc
commit 8052c2bb19
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
1 changed files with 72 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

105
crates/wasm_interp/src/instance.rs
View file

@ -24,6 +24,13 @@ enum Block {
Normal { vstack: usize },
}
#[derive(Debug)]
struct BranchCacheEntry {
addr: u32,
argument: u32,
target: u32,
}
#[derive(Debug)]
pub struct Instance<'a, I: ImportDispatcher> {
/// Contents of the WebAssembly instance's memory
@ -40,6 +47,8 @@ pub struct Instance<'a, I: ImportDispatcher> {
blocks: Vec<'a, Block>,
/// Outermost block depth for the currently-executing function.
outermost_block: u32,
/// Cache for branching instructions
branch_cache: Vec<'a, BranchCacheEntry>,
/// Import dispatcher from user code
import_dispatcher: I,
/// Temporary storage for import arguments
@ -68,6 +77,7 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
program_counter,
blocks: Vec::new_in(arena),
outermost_block: 0,
branch_cache: Vec::new_in(arena),
import_dispatcher,
import_arguments: Vec::new_in(arena),
debug_string: Some(String::new()),
@ -116,6 +126,7 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
program_counter: usize::MAX,
blocks: Vec::new_in(arena),
outermost_block: 0,
branch_cache: Vec::new_in(arena),
import_dispatcher,
import_arguments: Vec::new_in(arena),
debug_string,
@ -373,23 +384,39 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
fn break_forward(&mut self, relative_blocks_outward: u32, module: &WasmModule<'a>) {
use OpCode::*;
let addr = self.program_counter as u32;
let cache_result = self
.branch_cache
.iter()
.find(|entry| entry.addr == addr && entry.argument == relative_blocks_outward);
let mut depth = self.blocks.len();
let target_block_depth = depth - (relative_blocks_outward + 1) as usize;
loop {
let skipped_op = OpCode::from(module.code.bytes[self.program_counter]);
OpCode::skip_bytes(&module.code.bytes, &mut self.program_counter).unwrap();
match skipped_op {
BLOCK | LOOP | IF => {
depth += 1;
}
END => {
depth -= 1;
if depth == target_block_depth {
break;
if let Some(entry) = cache_result {
self.program_counter = entry.target as usize;
} else {
loop {
let skipped_op = OpCode::from(module.code.bytes[self.program_counter]);
OpCode::skip_bytes(&module.code.bytes, &mut self.program_counter).unwrap();
match skipped_op {
BLOCK | LOOP | IF => {
depth += 1;
}
END => {
depth -= 1;
if depth == target_block_depth {
break;
}
}
_ => {}
}
_ => {}
}
self.branch_cache.push(BranchCacheEntry {
addr,
argument: relative_blocks_outward,
target: self.program_counter as u32,
});
}
self.blocks.truncate(target_block_depth);
}
@ -513,31 +540,43 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
vstack: self.value_stack.depth(),
});
if condition == 0 {
let target_depth = self.blocks.len();
let mut depth = target_depth;
loop {
let skipped_op = OpCode::from(module.code.bytes[self.program_counter]);
OpCode::skip_bytes(&module.code.bytes, &mut self.program_counter).unwrap();
match skipped_op {
BLOCK | LOOP | IF => {
depth += 1;
}
END => {
if depth == target_depth {
// `if` without `else`
self.blocks.pop();
break;
} else {
depth -= 1;
let addr = self.program_counter as u32;
let cache_result = self.branch_cache.iter().find(|entry| entry.addr == addr);
if let Some(entry) = cache_result {
self.program_counter = entry.target as usize;
} else {
let target_depth = self.blocks.len();
let mut depth = target_depth;
loop {
let skipped_op = OpCode::from(module.code.bytes[self.program_counter]);
OpCode::skip_bytes(&module.code.bytes, &mut self.program_counter)
.unwrap();
match skipped_op {
BLOCK | LOOP | IF => {
depth += 1;
}
}
ELSE => {
if depth == target_depth {
break;
END => {
if depth == target_depth {
// `if` without `else`
self.blocks.pop();
break;
} else {
depth -= 1;
}
}
ELSE => {
if depth == target_depth {
break;
}
}
_ => {}
}
_ => {}
}
self.branch_cache.push(BranchCacheEntry {
addr,
argument: 0,
target: self.program_counter as u32,
});
}
}
}