Merge pull request #2842 from peterhuene/engine-sig-registry

Additional performance improvements for module instantiation.
bytecodealliance · Apr 16, 2021 · 6b6a646 · 6b6a646
2 parents f26449f + ef2ad63
commit 6b6a646
Show file tree

Hide file tree

Showing 28 changed files with 957 additions and 923 deletions.
diff --git a/crates/environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rs
@@ -6,7 +6,7 @@
 // struct VMContext {
 //      interrupts: *const VMInterrupts,
 //      externref_activations_table: *mut VMExternRefActivationsTable,
-//      stack_map_registry: *mut StackMapRegistry,
+//      module_info_lookup: *const dyn ModuleInfoLookup,
 //      signature_ids: [VMSharedSignatureIndex; module.num_signature_ids],
 //      imported_functions: [VMFunctionImport; module.num_imported_functions],
 //      imported_tables: [VMTableImport; module.num_imported_tables],
@@ -77,7 +77,7 @@ pub struct VMOffsets {
     // precalculated offsets of various member fields
     interrupts: u32,
     externref_activations_table: u32,
-    stack_map_registry: u32,
+    module_info_lookup: u32,
     signature_ids: u32,
     imported_functions: u32,
     imported_tables: u32,
@@ -149,7 +149,7 @@ impl From<VMOffsetsFields> for VMOffsets {
             num_defined_globals: fields.num_defined_globals,
             interrupts: 0,
             externref_activations_table: 0,
-            stack_map_registry: 0,
+            module_info_lookup: 0,
             signature_ids: 0,
             imported_functions: 0,
             imported_tables: 0,
@@ -168,13 +168,13 @@ impl From<VMOffsetsFields> for VMOffsets {
             .interrupts
             .checked_add(u32::from(fields.pointer_size))
             .unwrap();
-        ret.stack_map_registry = ret
+        ret.module_info_lookup = ret
             .externref_activations_table
             .checked_add(u32::from(fields.pointer_size))
             .unwrap();
         ret.signature_ids = ret
-            .stack_map_registry
-            .checked_add(u32::from(fields.pointer_size))
+            .module_info_lookup
+            .checked_add(u32::from(fields.pointer_size * 2))
             .unwrap();
         ret.imported_functions = ret
             .signature_ids
@@ -507,10 +507,10 @@ impl VMOffsets {
         self.externref_activations_table
     }
 
-    /// The offset of the `*mut StackMapRegistry` member.
+    /// The offset of the `*const dyn ModuleInfoLookup` member.
     #[inline]
-    pub fn vmctx_stack_map_registry(&self) -> u32 {
-        self.stack_map_registry
+    pub fn vmctx_module_info_lookup(&self) -> u32 {
+        self.module_info_lookup
     }
 
     /// The offset of the `signature_ids` array.

diff --git a/crates/jit/src/instantiate.rs b/crates/jit/src/instantiate.rs
@@ -176,11 +176,13 @@ struct FinishedFunctions(PrimaryMap<DefinedFuncIndex, *mut [VMFunctionBody]>);
 unsafe impl Send for FinishedFunctions {}
 unsafe impl Sync for FinishedFunctions {}
 
+/// Information about a function, such as trap information, address map,
+/// and stack maps.
 #[derive(Serialize, Deserialize, Clone)]
-struct FunctionInfo {
-    traps: Vec<TrapInformation>,
-    address_map: FunctionAddressMap,
-    stack_maps: Vec<StackMapInformation>,
+pub struct FunctionInfo {
+    pub traps: Vec<TrapInformation>,
+    pub address_map: FunctionAddressMap,
+    pub stack_maps: Vec<StackMapInformation>,
 }
 
 /// This is intended to mirror the type tables in `wasmtime_environ`, except that
@@ -362,11 +364,10 @@ impl CompiledModule {
     }
 
     /// Gets the function information for a given function index.
-    pub fn func_info(&self, index: DefinedFuncIndex) -> (&FunctionAddressMap, &[TrapInformation]) {
+    pub fn func_info(&self, index: DefinedFuncIndex) -> &FunctionInfo {
         self.artifacts
             .funcs
             .get(index)
-            .map(|f| (&f.address_map, f.traps.as_ref()))
             .expect("defined function should be present")
     }