fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-05-21 19:51:25 +00:00
Code Issues Projects Releases Wiki Activity

optimize virtual calls

Browse Source
This commit is contained in:
NikVolf 2017-12-28 15:56:58 +03:00
parent f260bb8bb5
commit d45f0d51d5
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/optimizer.rs
View File

@ -1,7 +1,7 @@
use std::collections::HashSet; use std::collections::HashSet;
use parity_wasm::elements; use parity_wasm::elements;
use symbols::{Symbol, expand_symbols, push_code_symbols, resolve_function}; use symbols::{Symbol, expand_symbols, push_code_symbols};
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
@ -23,7 +23,7 @@ pub fn optimize(
for (index, entry) in module.export_section().ok_or(Error::NoExportSection)?.entries().iter().enumerate() { for (index, entry) in module.export_section().ok_or(Error::NoExportSection)?.entries().iter().enumerate() {
if used_exports.iter().find(|e| **e == entry.field()).is_some() { if used_exports.iter().find(|e| **e == entry.field()).is_some() {
stay.insert(Symbol::Export(index)); stay.insert(Symbol::Export(index));
} }
} }
// All symbols used in data/element segments are also should be preserved // All symbols used in data/element segments are also should be preserved
@ -33,14 +33,14 @@ pub fn optimize(
push_code_symbols(&module, segment.offset().code(), &mut init_symbols); push_code_symbols(&module, segment.offset().code(), &mut init_symbols);
} }
} }
if let Some(elements_section) = module.elements_section() { // if let Some(elements_section) = module.elements_section() {
for segment in elements_section.entries() { // for segment in elements_section.entries() {
push_code_symbols(&module, segment.offset().code(), &mut init_symbols); // push_code_symbols(&module, segment.offset().code(), &mut init_symbols);
for func_index in segment.members() { // for func_index in segment.members() {
stay.insert(resolve_function(&module, *func_index)); // stay.insert(resolve_function(&module, *func_index));
} // }
} // }
} // }
for symbol in init_symbols.drain(..) { stay.insert(symbol); } for symbol in init_symbols.drain(..) { stay.insert(symbol); }
// Call function which will traverse the list recursively, filling stay with all symbols // Call function which will traverse the list recursively, filling stay with all symbols
@ -103,7 +103,7 @@ pub fn optimize(
} else { } else {
remove = true; remove = true;
eliminated_globals.push(top_globals); eliminated_globals.push(top_globals);
trace!("Eliminated import({}) global({}, {})", old_index, top_globals, imports.entries()[index].field()); trace!("Eliminated import({}) global({}, {})", old_index, top_globals, imports.entries()[index].field());
} }
top_globals += 1; top_globals += 1;
}, },
@ -190,16 +190,16 @@ pub fn optimize(
&mut elements::Section::Function(ref mut function_section) if eliminated_types.len() > 0 => { &mut elements::Section::Function(ref mut function_section) if eliminated_types.len() > 0 => {
for ref mut func_signature in function_section.entries_mut() { for ref mut func_signature in function_section.entries_mut() {
let totalle = eliminated_types.iter().take_while(|i| (**i as u32) < func_signature.type_ref()).count(); let totalle = eliminated_types.iter().take_while(|i| (**i as u32) < func_signature.type_ref()).count();
*func_signature.type_ref_mut() -= totalle as u32; *func_signature.type_ref_mut() -= totalle as u32;
} }
}, },
&mut elements::Section::Import(ref mut import_section) if eliminated_types.len() > 0 => { &mut elements::Section::Import(ref mut import_section) if eliminated_types.len() > 0 => {
for ref mut import_entry in import_section.entries_mut() { for ref mut import_entry in import_section.entries_mut() {
if let &mut elements::External::Function(ref mut type_ref) = import_entry.external_mut() { if let &mut elements::External::Function(ref mut type_ref) = import_entry.external_mut() {
let totalle = eliminated_types.iter().take_while(|i| (**i as u32) < *type_ref).count(); let totalle = eliminated_types.iter().take_while(|i| (**i as u32) < *type_ref).count();
*type_ref -= totalle as u32; *type_ref -= totalle as u32;
} }
} }
}, },
&mut elements::Section::Code(ref mut code_section) if eliminated_globals.len() > 0 || eliminated_funcs.len() > 0 => { &mut elements::Section::Code(ref mut code_section) if eliminated_globals.len() > 0 || eliminated_funcs.len() > 0 => {
for ref mut func_body in code_section.bodies_mut() { for ref mut func_body in code_section.bodies_mut() {
@ -226,7 +226,7 @@ pub fn optimize(
*global_index -= totalle as u32; *global_index -= totalle as u32;
}, },
_ => {} _ => {}
} }
} }
}, },
&mut elements::Section::Global(ref mut global_section) => { &mut elements::Section::Global(ref mut global_section) => {
@ -244,7 +244,7 @@ pub fn optimize(
update_global_index(segment.offset_mut().code_mut(), &eliminated_globals); update_global_index(segment.offset_mut().code_mut(), &eliminated_globals);
// update all indirect call addresses initial values // update all indirect call addresses initial values
for func_index in segment.members_mut() { for func_index in segment.members_mut() {
let totalle = eliminated_funcs.iter().take_while(|i| (**i as u32) < *func_index).count(); let totalle = eliminated_funcs.iter().take_while(|i| (**i as u32) < *func_index).count();
*func_index -= totalle as u32; *func_index -= totalle as u32;
} }
} }
@ -384,7 +384,7 @@ mod tests {
/// Optimizer presumes that export section exists and contains /// Optimizer presumes that export section exists and contains
/// all symbols passed as a second parameter. Since empty module /// all symbols passed as a second parameter. Since empty module
/// obviously contains no export section, optimizer should return /// obviously contains no export section, optimizer should return
/// error on it. /// error on it.
#[test] #[test]
fn empty() { fn empty() {
let mut module = builder::module().build(); let mut module = builder::module().build();
@ -431,7 +431,7 @@ mod tests {
1, 1,
module.function_section().expect("functions section to be generated").entries().len(), module.function_section().expect("functions section to be generated").entries().len(),
"There should 2 (two) functions in the optimized module" "There should 2 (two) functions in the optimized module"
); );
} }
/// @spec 2 /// @spec 2
@ -466,14 +466,14 @@ mod tests {
1, 1,
module.global_section().expect("global section to be generated").entries().len(), module.global_section().expect("global section to be generated").entries().len(),
"There should 1 (one) global entry in the optimized module, since _call function uses it" "There should 1 (one) global entry in the optimized module, since _call function uses it"
); );
} }
/// @spec 2 /// @spec 2
/// Imagine there is one exported function in unoptimized module, `_call`, that we specify as the one /// Imagine there is one exported function in unoptimized module, `_call`, that we specify as the one
/// to stay during the optimization. The code of this function uses one global during the execution, /// to stay during the optimization. The code of this function uses one global during the execution,
/// but we have a bunch of other unused globals in the code. Last globals should not survive the optimization, /// but we have a bunch of other unused globals in the code. Last globals should not survive the optimization,
/// while the former should. /// while the former should.
#[test] #[test]
fn globals_2() { fn globals_2() {
let mut module = builder::module() let mut module = builder::module()
@ -485,7 +485,7 @@ mod tests {
.build() .build()
.global() .global()
.value_type().f32() .value_type().f32()
.build() .build()
.function() .function()
.signature().param().i32().build() .signature().param().i32().build()
.body() .body()
@ -508,7 +508,7 @@ mod tests {
1, 1,
module.global_section().expect("global section to be generated").entries().len(), module.global_section().expect("global section to be generated").entries().len(),
"There should 1 (one) global entry in the optimized module, since _call function uses only one" "There should 1 (one) global entry in the optimized module, since _call function uses only one"
); );
} }
/// @spec 3 /// @spec 3
@ -571,7 +571,7 @@ mod tests {
.build() .build()
.function() .function()
.signature().param().i32().param().i32().build() .signature().param().i32().param().i32().build()
.build() .build()
.function() .function()
.signature().param().i32().build() .signature().param().i32().build()
.body() .body()
@ -601,7 +601,7 @@ mod tests {
elements::Opcode::CallIndirect(0, false) => {}, elements::Opcode::CallIndirect(0, false) => {},
_ => { _ => {
panic!( panic!(
"Expected call_indirect to use index 0 after optimization, since previois 0th was eliminated, but got {:?}", "Expected call_indirect to use index 0 after optimization, since previois 0th was eliminated, but got {:?}",
indirect_opcode indirect_opcode
); );
} }

27
src/symbols.rs
View File

@ -8,6 +8,7 @@ pub enum Symbol {
Global(usize), Global(usize),
Function(usize), Function(usize),
Export(usize), Export(usize),
IndirectCall,
} }
pub fn resolve_function(module: &elements::Module, index: u32) -> Symbol { pub fn resolve_function(module: &elements::Module, index: u32) -> Symbol {
@ -58,12 +59,13 @@ pub fn push_code_symbols(module: &elements::Module, opcodes: &[elements::Opcode]
}, },
&CallIndirect(idx, _) => { &CallIndirect(idx, _) => {
dest.push(Symbol::Type(idx as usize)); dest.push(Symbol::Type(idx as usize));
dest.push(Symbol::IndirectCall);
}, },
&GetGlobal(idx) | &SetGlobal(idx) => { &GetGlobal(idx) | &SetGlobal(idx) => {
dest.push(resolve_global(module, idx)) dest.push(resolve_global(module, idx))
}, },
_ => { }, _ => { },
} }
} }
} }
@ -75,7 +77,7 @@ pub fn expand_symbols(module: &elements::Module, set: &mut HashSet<Symbol>) {
let mut fringe = set.iter().cloned().collect::<Vec<Symbol>>(); let mut fringe = set.iter().cloned().collect::<Vec<Symbol>>();
loop { loop {
let next = match fringe.pop() { let next = match fringe.pop() {
Some(s) if stop.contains(&s) => { continue; } Some(s) if stop.contains(&s) => { continue; }
Some(s) => s, Some(s) => s,
_ => { break; } _ => { break; }
}; };
@ -86,7 +88,7 @@ pub fn expand_symbols(module: &elements::Module, set: &mut HashSet<Symbol>) {
let entry = &module.export_section().expect("Export section to exist").entries()[idx]; let entry = &module.export_section().expect("Export section to exist").entries()[idx];
match entry.internal() { match entry.internal() {
&elements::Internal::Function(func_idx) => { &elements::Internal::Function(func_idx) => {
let symbol = resolve_function(module, func_idx); let symbol = resolve_function(module, func_idx);
if !stop.contains(&symbol) { if !stop.contains(&symbol) {
fringe.push(symbol); fringe.push(symbol);
} }
@ -97,7 +99,7 @@ pub fn expand_symbols(module: &elements::Module, set: &mut HashSet<Symbol>) {
if !stop.contains(&symbol) { if !stop.contains(&symbol) {
fringe.push(symbol); fringe.push(symbol);
} }
set.insert(symbol); set.insert(symbol);
}, },
_ => {} _ => {}
} }
@ -110,9 +112,9 @@ pub fn expand_symbols(module: &elements::Module, set: &mut HashSet<Symbol>) {
if !stop.contains(&type_symbol) { if !stop.contains(&type_symbol) {
fringe.push(type_symbol); fringe.push(type_symbol);
} }
set.insert(type_symbol); set.insert(type_symbol);
}, },
_ => {} _ => {}
} }
}, },
Function(idx) => { Function(idx) => {
@ -142,8 +144,17 @@ pub fn expand_symbols(module: &elements::Module, set: &mut HashSet<Symbol>) {
fringe.push(symbol); fringe.push(symbol);
} }
set.insert(symbol); set.insert(symbol);
} }
} },
IndirectCall => {
for entry in module.elements_section().map(|s| s.entries()).unwrap_or(&[]) {
for func_index in entry.members() {
let symbol = resolve_function(&module, *func_index);
if !stop.contains(&symbol) { fringe.push(symbol); }
set.insert(symbol);
}
}
},
_ => {} _ => {}
} }