elliottt opened PR #8082 from elliottt:trevor/winch-cranelift-trampolines
to bytecodealliance:main
:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.
<!--
Please make sure you include the following information:
If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
elliottt requested alexcrichton for a review on PR #8082.
elliottt requested wasmtime-default-reviewers for a review on PR #8082.
elliottt requested wasmtime-core-reviewers for a review on PR #8082.
elliottt edited PR #8082:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.We can push this work further to remove all trampoline generation from the
wasmtime-winch
crate, however I didn't want to bulk out the diff in this PR with that additional change, as it's not necessary for running components with winch.
<!--
Please make sure you include the following information:
If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
elliottt edited PR #8082:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.We can push this work further to remove all trampoline generation from the
wasmtime-winch
crate, however I didn't want to bulk out the diff in this PR with that additional change, as it's not necessary for running components with winch.TODO
[ ] Are there any additional component model tests we can opt winch into?
<!--
Please make sure you include the following information:If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
elliottt edited PR #8082:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.We can push this work further to remove all trampoline generation from the
wasmtime-winch
crate, however I didn't want to bulk out the diff in this PR with that additional change, as it's not necessary for running components with winch.TODO
- [ ] Are there any additional component model tests we can opt winch into?
[ ] We're not making use of the new
CallingConvention::Winch
convention from the trampolines, where should that be set?
<!--
Please make sure you include the following information:If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
elliottt edited PR #8082:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.We can push this work further to remove all trampoline generation from the
wasmtime-winch
crate, however I didn't want to bulk out the diff in this PR with that additional change, as it's not necessary for running components with winch.TODO
- [ ] Are there any additional component model tests we can opt winch into?
[ ] We're not making use of the new
CallConv::Winch
convention from the trampolines, where should that be set?
<!--
Please make sure you include the following information:If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
github-actions[bot] commented on PR #8082:
Subscribe to Label Action
cc @saulecabrera
<details>
This issue or pull request has been labeled: "winch"Thus the following users have been cc'd because of the following labels:
- saulecabrera: winch
To subscribe or unsubscribe from this label, edit the <code>.github/subscribe-to-label.json</code> configuration file.
Learn more.
</details>
elliottt updated PR #8082.
elliottt edited PR #8082:
Instead of reimplementing the component trampolines directly in terms of Winch's
MacroAssembler
trait, reusewasmtime-cranelift
'sCompiler
implementation to do that heavy lifting.I had to remove the type parameter from
CompiledFunction
and make it a boxeddyn Trait
to make this work, due to the requirements ofCompiler::append_code
, and the visibility ofModuleTextBuilder
in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have theCompiler
trait interface produce&dyn Any
results for compiled functions, but haven't looked into making changes further than what was needed to get component trampolines working here.We can push this work further to remove all trampoline generation from the
wasmtime-winch
crate, however I didn't want to bulk out the diff in this PR with that additional change, as it's not necessary for running components with winch.<!--
Please make sure you include the following information:
If this work has been discussed elsewhere, please include a link to that
conversation. If it was discussed in an issue, just mention "issue #...".Explain why this change is needed. If the details are in an issue already,
this can be brief.Our development process is documented in the Wasmtime book:
https://docs.wasmtime.dev/contributing-development-process.htmlPlease ensure all communication follows the code of conduct:
https://github.com/bytecodealliance/wasmtime/blob/main/CODE_OF_CONDUCT.md
-->
elliottt updated PR #8082.
elliottt has marked PR #8082 as ready for review.
github-actions[bot] commented on PR #8082:
Subscribe to Label Action
cc @peterhuene
<details>
This issue or pull request has been labeled: "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 <code>.github/subscribe-to-label.json</code> configuration file.
Learn more.
</details>
github-actions[bot] commented on PR #8082:
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.<details>
Our documentation should be of the following form:
```text
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.
```</details>
[ ] If you added a new
Config
method, or modified an existing one, you
ensured that this configuration is exercised by the fuzz targets.<details>
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
][fuzzing-config] (or one
of its nestedstruct
s).Rarely, this may require authoring a new fuzz target to specifically test this
configuration. See [our docs on fuzzing][fuzzing-docs] for more details.</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.[fuzzing-config]: https://github.com/bytecodealliance/wasmtime/blob/ca0e8d0a1d8cefc0496dba2f77a670571d8fdcab/crates/fuzzing/src/generators.rs#L182-L194
[fuzzing-docs]: https://docs.wasmtime.dev/contributing-fuzzing.html
<details>
To modify this label's message, edit the <code>.github/label-messager/wasmtime-config.md</code> file.
To add new label messages or remove existing label messages, edit the
<code>.github/label-messager.json</code> configuration file.</details>
alexcrichton submitted PR review.
alexcrichton has enabled auto merge for PR #8082.
elliottt updated PR #8082.
elliottt updated PR #8082.
elliottt merged PR #8082.
Last updated: Dec 23 2024 at 12:05 UTC