Optimize table.init instruction and instantiation (#2847)
* Optimize `table.init` instruction and instantiation This commit optimizes table initialization as part of instance instantiation and also applies the same optimization to the `table.init` instruction. One part of this commit is to remove some preexisting duplication between instance instantiation and the `table.init` instruction itself, after this the actual implementation of `table.init` is optimized to effectively have fewer bounds checks in fewer places and have a much tighter loop for instantiation. A big fallout from this change is that memory/table initializer offsets are now stored as `u32` instead of `usize` to remove a few casts in a few places. This ended up requiring moving some overflow checks that happened in parsing to later in code itself because otherwise the wrong spec test errors are emitted during testing. I've tried to trace where these can possibly overflow but I think that I managed to get everything. In a local synthetic test where an empty module with a single 80,000 element initializer this improves total instantiation time by 4x (562us => 141us) * Review comments
This commit is contained in:
@@ -7,6 +7,7 @@ use cranelift_wasm::*;
|
||||
use indexmap::IndexMap;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::convert::TryFrom;
|
||||
use std::sync::Arc;
|
||||
|
||||
/// Implemenation styles for WebAssembly linear memory.
|
||||
@@ -86,7 +87,7 @@ pub struct MemoryInitializer {
|
||||
/// Optionally, a global variable giving a base index.
|
||||
pub base: Option<GlobalIndex>,
|
||||
/// The offset to add to the base.
|
||||
pub offset: usize,
|
||||
pub offset: u32,
|
||||
/// The data to write into the linear memory.
|
||||
pub data: Box<[u8]>,
|
||||
}
|
||||
@@ -168,7 +169,15 @@ impl MemoryInitialization {
|
||||
// Perform a bounds check on the segment
|
||||
// As this segment is referencing a defined memory without a global base, the last byte
|
||||
// written to by the segment cannot exceed the memory's initial minimum size
|
||||
if (initializer.offset + initializer.data.len())
|
||||
let offset = usize::try_from(initializer.offset).unwrap();
|
||||
let end = match offset.checked_add(initializer.data.len()) {
|
||||
Some(end) => end,
|
||||
None => {
|
||||
out_of_bounds = true;
|
||||
continue;
|
||||
}
|
||||
};
|
||||
if end
|
||||
> ((module.memory_plans[initializer.memory_index].memory.minimum
|
||||
as usize)
|
||||
* WASM_PAGE_SIZE)
|
||||
@@ -178,8 +187,8 @@ impl MemoryInitialization {
|
||||
}
|
||||
|
||||
let pages = &mut map[index];
|
||||
let mut page_index = initializer.offset / WASM_PAGE_SIZE;
|
||||
let mut page_offset = initializer.offset % WASM_PAGE_SIZE;
|
||||
let mut page_index = offset / WASM_PAGE_SIZE;
|
||||
let mut page_offset = offset % WASM_PAGE_SIZE;
|
||||
let mut data_offset = 0;
|
||||
let mut data_remaining = initializer.data.len();
|
||||
|
||||
@@ -268,7 +277,7 @@ pub struct TableInitializer {
|
||||
/// Optionally, a global variable giving a base index.
|
||||
pub base: Option<GlobalIndex>,
|
||||
/// The offset to add to the base.
|
||||
pub offset: usize,
|
||||
pub offset: u32,
|
||||
/// The values to write into the table elements.
|
||||
pub elements: Box<[FuncIndex]>,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user