Initial skeleton of some component model processing #4005

alexcrichton · 2022-04-07T18:09:24Z

This commit is the first of what will likely be many to implement the
component model proposal in Wasmtime. This will be structured as a
series of incremental commits, most of which haven't been written yet.
My hope is to make this incremental and over time to make this easier to
review and easier to test each step in isolation.

Here much of the skeleton of how components are going to work in
Wasmtime is sketched out. This is not a complete implementation of the
component model so it's not all that useful yet, but some things you can
do are:

Process the type section into a representation amenable for working
with in Wasmtime.
Process the module section and register core wasm modules.
Process the instance section for core wasm modules.
Process core wasm module imports.
Process core wasm instance aliasing.
Ability to compile a component with core wasm embedded.
Ability to instantiate a component with no imports.
Ability to get functions from this component.

This is already starting to diverge from the previous module linking
representation where a Component will try to avoid unnecessary
metadata about the component and instead internally only have the bare
minimum necessary to instantiate the module. My hope is we can avoid
constructing most of the index spaces during instantiation only for it
to all ge thrown away. Additionally I'm predicting that we'll need to
see through processing where possible to know how to generate adapters
and where they are fused.

At this time you can't actually call a component's functions, and that's
the next PR that I would like to make.

alexcrichton · 2022-04-07T18:10:45Z

It's worth pointing out that this is starting out as a draft PR. The main reason for this is that there aren't actually any tests in this PR for that. For tests I'm think we'll need bytecodealliance/wasm-tools#529 which is the text format for components. Tests can probably be written in the meantime with wasm-encoder but I'm hoping we won't have to resort to that.

github-actions · 2022-04-07T18:34:22Z

Subscribe to Label Action

cc @peterhuene

This issue or pull request has been labeled: "wasm-proposal: component-model", "wasmtime:api", "wasmtime:config"

Thus the following users have been cc'd because of the following labels:

peterhuene: wasmtime:api

To subscribe or unsubscribe from this label, edit the .github/subscribe-to-label.json configuration file.

Learn more.

github-actions · 2022-04-07T18:34:31Z

Label Messager: wasmtime:config

It looks like you are changing Wasmtime's configuration options. Make sure to
complete this check list:

If you added a new Config method, you wrote extensive documentation for
it.

Our documentation should be of the following form:

Short, simple summary sentence.

More details. These details can be multiple paragraphs. There should be
information about not just the method, but its parameters and results as
well.

Is this method fallible? If so, when can it return an error?

Can this method panic? If so, when does it panic?

# Example

Optional example here.

If you added a new Config method, or modified an existing one, you
ensured that this configuration is exercised by the fuzz targets.

For example, if you expose a new strategy for allocating the next instance
slot inside the pooling allocator, you should ensure that at least one of our
fuzz targets exercises that new strategy.

Often, all that is required of you is to ensure that there is a knob for this
configuration option in wasmtime_fuzzing::Config (or one
of its nested structs).

Rarely, this may require authoring a new fuzz target to specifically test this
configuration. See our docs on fuzzing for more details.
If you are enabling a configuration option by default, make sure that it
has been fuzzed for at least two weeks before turning it on by default.

To modify this label's message, edit the .github/label-messager/wasmtime-config.md file.

To add new label messages or remove existing label messages, edit the
.github/label-messager.json configuration file.

Learn more.

fitzgen

LGTM modulo tests! I'll take another look at this once those are written

crates/environ/src/component/info.rs

crates/environ/src/component/translate.rs

fitzgen · 2022-04-14T21:36:52Z

crates/environ/src/component/translate.rs

+                .translate(parser.clone(), &component[range.start..range.end])?;
+                let upvar_idx = self.result.upvars.push(translation);
+                self.result.modules.push(ModuleDef::Upvar(upvar_idx));
+                return Ok(Action::Skip(range.end - range.start));


Would be nice if we added a len method to wasmparser::Range.

Consider me sufficiently inspired

crates/environ/src/component/translate.rs

crates/environ/src/component/types.rs

crates/wasmtime/src/instance.rs

This commit removes `wasmparser::Range` and instead uses `std::ops::Range<usize>` instead. This is inspired by review on bytecodealliance/wasmtime#4005 where it's more convenience to have all the libstd methods available.

alexcrichton · 2022-05-18T18:48:48Z

Ok with bytecodealliance/wasm-tools#529 landed I've now started writing tests for this PR. Once all the pending PRs on wasm-tools are landed I'll make a release and then this should be ready-for-landing after another round of review.

github-actions · 2022-05-19T15:06:11Z

Subscribe to Label Action

cc @fitzgen

This issue or pull request has been labeled: "cranelift", "cranelift:wasm", "fuzzing"

Thus the following users have been cc'd because of the following labels:

fitzgen: fuzzing

To subscribe or unsubscribe from this label, edit the .github/subscribe-to-label.json configuration file.

Learn more.

github-actions · 2022-05-19T16:07:21Z

Subscribe to Label Action

cc @peterhuene

This issue or pull request has been labeled: "cranelift:module", "wasmtime:c-api"

Thus the following users have been cc'd because of the following labels:

peterhuene: wasmtime:c-api

To subscribe or unsubscribe from this label, edit the .github/subscribe-to-label.json configuration file.

Learn more.

This commit updates these crates as used by Wasmtime for the recently published versions to pull in changes necessary to support the component model. I've split this out from bytecodealliance#4005 to make it clear what's impacted here and bytecodealliance#4005 can simply rebase on top of this to pick up the necessary changes.

* Update the wasm-tools family of crates This commit updates these crates as used by Wasmtime for the recently published versions to pull in changes necessary to support the component model. I've split this out from #4005 to make it clear what's impacted here and #4005 can simply rebase on top of this to pick up the necessary changes. * More test fixes

This commit is the first of what will likely be many to implement the component model proposal in Wasmtime. This will be structured as a series of incremental commits, most of which haven't been written yet. My hope is to make this incremental and over time to make this easier to review and easier to test each step in isolation. Here much of the skeleton of how components are going to work in Wasmtime is sketched out. This is not a complete implementation of the component model so it's not all that useful yet, but some things you can do are: * Process the type section into a representation amenable for working with in Wasmtime. * Process the module section and register core wasm modules. * Process the instance section for core wasm modules. * Process core wasm module imports. * Process core wasm instance aliasing. * Ability to compile a component with core wasm embedded. * Ability to instantiate a component with no imports. * Ability to get functions from this component. This is already starting to diverge from the previous module linking representation where a `Component` will try to avoid unnecessary metadata about the component and instead internally only have the bare minimum necessary to instantiate the module. My hope is we can avoid constructing most of the index spaces during instantiation only for it to all ge thrown away. Additionally I'm predicting that we'll need to see through processing where possible to know how to generate adapters and where they are fused. At this time you can't actually call a component's functions, and that's the next PR that I would like to make.

This commit uses the recently updated wasm-tools crates to add tests for the component model added in the previous commit. This involved updating the `wasmtime-wast` crate for component-model changes. Currently the component support there is quite primitive, but enough to at least instantiate components and verify the internals of Wasmtime are all working correctly. Additionally some simple tests for the embedding API have also been added.

alexcrichton · 2022-05-19T19:14:10Z

Ok everything is now ready to go here and I think that this is good to land.

@fitzgen would you be up for reviewing the tests added here? (sorry I know this is quite late relative to the previous review and this is probably pretty far out of cache for you...)

fitzgen · 2022-05-19T19:31:08Z

Yeah I can take a look tomorrow.

fitzgen

Looks great!

alexcrichton added the wasm-proposal:component-model Issues related to the WebAssembly Component Model proposal label Apr 7, 2022

alexcrichton requested a review from fitzgen April 7, 2022 18:09

github-actions bot added wasmtime:api Related to the API of the `wasmtime` crate itself wasmtime:config Issues related to the configuration of Wasmtime labels Apr 7, 2022

fitzgen reviewed Apr 14, 2022

View reviewed changes

alexcrichton force-pushed the component-model branch from 0f52568 to 677e35a Compare April 15, 2022 16:44

This was referenced Apr 15, 2022

Use std::ops::Range instead of a custom type bytecodealliance/wasm-tools#556

Merged

components: Implement the ability to call component exports #4039

Merged

alexcrichton force-pushed the component-model branch from 677e35a to 96962a6 Compare April 28, 2022 18:47

alexcrichton force-pushed the component-model branch from 96962a6 to 5e73ec2 Compare May 18, 2022 18:33

github-actions bot added cranelift Issues related to the Cranelift code generator cranelift:wasm fuzzing Issues related to our fuzzing infrastructure labels May 18, 2022

github-actions bot added cranelift:module wasmtime:c-api Issues pertaining to the C API. labels May 19, 2022

alexcrichton mentioned this pull request May 19, 2022

Update the wasm-tools family of crates #4165

Merged

alexcrichton added 2 commits May 19, 2022 12:13

alexcrichton force-pushed the component-model branch from 05f6f26 to 0af5ff6 Compare May 19, 2022 19:13

alexcrichton marked this pull request as ready for review May 19, 2022 19:13

fitzgen approved these changes May 20, 2022

View reviewed changes

alexcrichton merged commit fcf6208 into bytecodealliance:main May 20, 2022

alexcrichton deleted the component-model branch May 20, 2022 20:33

alexcrichton mentioned this pull request May 24, 2022

Tracking issue for implementing the component model #4185

Closed

42 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial skeleton of some component model processing #4005

Initial skeleton of some component model processing #4005

alexcrichton commented Apr 7, 2022

alexcrichton commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented Apr 7, 2022 •

edited by alexcrichton

Loading

fitzgen left a comment

fitzgen Apr 14, 2022

alexcrichton Apr 15, 2022

alexcrichton commented May 18, 2022

github-actions bot commented May 19, 2022

github-actions bot commented May 19, 2022

alexcrichton commented May 19, 2022

fitzgen commented May 19, 2022

fitzgen left a comment

Initial skeleton of some component model processing #4005

Initial skeleton of some component model processing #4005

Conversation

alexcrichton commented Apr 7, 2022

alexcrichton commented Apr 7, 2022

github-actions bot commented Apr 7, 2022

Subscribe to Label Action

github-actions bot commented Apr 7, 2022 • edited by alexcrichton Loading

Label Messager: wasmtime:config

fitzgen left a comment

Choose a reason for hiding this comment

fitzgen Apr 14, 2022

Choose a reason for hiding this comment

alexcrichton Apr 15, 2022

Choose a reason for hiding this comment

alexcrichton commented May 18, 2022

github-actions bot commented May 19, 2022

Subscribe to Label Action

github-actions bot commented May 19, 2022

Subscribe to Label Action

alexcrichton commented May 19, 2022

fitzgen commented May 19, 2022

fitzgen left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 7, 2022 •

edited by alexcrichton

Loading