Lazily populate a store's trampoline map #3742
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit is another installment of "how fast can we make instantiation". Currently when instantiating a module with many function imports each function, typically from the host, is inserted into the store. This insertion process stores the `VMTrampoline` for the host function in a side table so it can be looked up later if the host function is called through the `Func` interface. This insertion process, however, involves a hash map insertion which can be relatively expensive at the scale of the rest of the instantiation process. The optimization implemented in this commit is to avoid inserting trampolines into the store at `Func`-insertion-time (aka instantiation time) and instead only lazily populate the map of trampolines when needed. The theory behind this is that almost all `Func` instances that are called indirectly from the host are actually wasm functions, not host-defined functions. This means that they already don't need to go through the map of host trampolines and can instead be looked up from the module they're defined in. With the assumed rarity of host functions making `lookup_trampoline` a bit slower seems ok. The `lookup_trampoline` function will now, on a miss from the wasm modules and `host_trampolines` map, lazily iterate over the functions within the store and insert trampolines into the `host_trampolines` map. This process will eventually reach something which matches the function provided because it should at least hit the same host function. The relevant `lookup_trampoline` now sports a new documentation block explaining all this as well for future readers. Concretely this commit speeds up instantiation of an empty module with 100 imports and ~80 unique signatures from 10.6us to 6.4us, a 40% improvement.
github-actions
bot
added
the
wasmtime:api
Subscribe to Label Actioncc @peterhuene
This issue or pull request has been labeled: "wasmtime:api"
Thus the following users have been cc'd because of the following labels:
To subscribe or unsubscribe from this label, edit the |
fitzgen
approved these changes
Feb 1, 2022
| .skip(self.host_func_trampolines_registered) | ||
| { | ||
| self.host_func_trampolines_registered += 1; | ||
| self.host_trampolines.insert(f.sig_index(), f.trampoline()); |
There was a problem hiding this comment.
Suggested change
| self.host_trampolines.insert(f.sig_index(), f.trampoline()); | |
| let old_entry = self.host_trampolines.insert(f.sig_index(), f.trampoline()); | |
| debug_assert!(old_entry.is_none()); |
There was a problem hiding this comment.
Ah actually doing this causes a test failure because we might find duplicates of signatures we're not looking for as the array of functions is scanned.
alexcrichton
added a commit
to alexcrichton/wasmtime
that referenced
this pull request
Feb 2, 2022
* Lazily populate a store's trampoline map This commit is another installment of "how fast can we make instantiation". Currently when instantiating a module with many function imports each function, typically from the host, is inserted into the store. This insertion process stores the `VMTrampoline` for the host function in a side table so it can be looked up later if the host function is called through the `Func` interface. This insertion process, however, involves a hash map insertion which can be relatively expensive at the scale of the rest of the instantiation process. The optimization implemented in this commit is to avoid inserting trampolines into the store at `Func`-insertion-time (aka instantiation time) and instead only lazily populate the map of trampolines when needed. The theory behind this is that almost all `Func` instances that are called indirectly from the host are actually wasm functions, not host-defined functions. This means that they already don't need to go through the map of host trampolines and can instead be looked up from the module they're defined in. With the assumed rarity of host functions making `lookup_trampoline` a bit slower seems ok. The `lookup_trampoline` function will now, on a miss from the wasm modules and `host_trampolines` map, lazily iterate over the functions within the store and insert trampolines into the `host_trampolines` map. This process will eventually reach something which matches the function provided because it should at least hit the same host function. The relevant `lookup_trampoline` now sports a new documentation block explaining all this as well for future readers. Concretely this commit speeds up instantiation of an empty module with 100 imports and ~80 unique signatures from 10.6us to 6.4us, a 40% improvement. * Review comments * Remove debug assert
mpardesh
pushed a commit
to avanhatt/wasmtime
that referenced
this pull request
Mar 17, 2022
* Lazily populate a store's trampoline map This commit is another installment of "how fast can we make instantiation". Currently when instantiating a module with many function imports each function, typically from the host, is inserted into the store. This insertion process stores the `VMTrampoline` for the host function in a side table so it can be looked up later if the host function is called through the `Func` interface. This insertion process, however, involves a hash map insertion which can be relatively expensive at the scale of the rest of the instantiation process. The optimization implemented in this commit is to avoid inserting trampolines into the store at `Func`-insertion-time (aka instantiation time) and instead only lazily populate the map of trampolines when needed. The theory behind this is that almost all `Func` instances that are called indirectly from the host are actually wasm functions, not host-defined functions. This means that they already don't need to go through the map of host trampolines and can instead be looked up from the module they're defined in. With the assumed rarity of host functions making `lookup_trampoline` a bit slower seems ok. The `lookup_trampoline` function will now, on a miss from the wasm modules and `host_trampolines` map, lazily iterate over the functions within the store and insert trampolines into the `host_trampolines` map. This process will eventually reach something which matches the function provided because it should at least hit the same host function. The relevant `lookup_trampoline` now sports a new documentation block explaining all this as well for future readers. Concretely this commit speeds up instantiation of an empty module with 100 imports and ~80 unique signatures from 10.6us to 6.4us, a 40% improvement. * Review comments * Remove debug assert
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit is another installment of "how fast can we make
instantiation". Currently when instantiating a module with many function
imports each function, typically from the host, is inserted into the
store. This insertion process stores the
VMTrampolinefor the hostfunction in a side table so it can be looked up later if the host
function is called through the
Funcinterface. This insertion process,however, involves a hash map insertion which can be relatively expensive
at the scale of the rest of the instantiation process.
The optimization implemented in this commit is to avoid inserting
trampolines into the store at
Func-insertion-time (aka instantiationtime) and instead only lazily populate the map of trampolines when
needed. The theory behind this is that almost all
Funcinstances thatare called indirectly from the host are actually wasm functions, not
host-defined functions. This means that they already don't need to go
through the map of host trampolines and can instead be looked up from
the module they're defined in. With the assumed rarity of host functions
making
lookup_trampolinea bit slower seems ok.The
lookup_trampolinefunction will now, on a miss from the wasmmodules and
host_trampolinesmap, lazily iterate over the functionswithin the store and insert trampolines into the
host_trampolinesmap.This process will eventually reach something which matches the function
provided because it should at least hit the same host function. The
relevant
lookup_trampolinenow sports a new documentation blockexplaining all this as well for future readers.
Concretely this commit speeds up instantiation of an empty module with
100 imports and ~80 unique signatures from 10.6us to 6.4us, a 40%
improvement.