Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the wasmtime-cranelift for winch component trampolines #8082

Merged

Conversation

elliottt
Copy link
Member

@elliottt elliottt commented Mar 11, 2024

Instead of reimplementing the component trampolines directly in terms of Winch's MacroAssembler trait, reuse wasmtime-cranelift's Compiler implementation to do that heavy lifting.

I had to remove the type parameter from CompiledFunction and make it a boxed dyn Trait to make this work, due to the requirements of Compiler::append_code, and the visibility of ModuleTextBuilder in the crate hierarchy. I think that this refactoring could be pushed further to avoid the need to have the Compiler 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.

@elliottt elliottt requested review from a team as code owners March 11, 2024 23:47
@elliottt elliottt requested review from alexcrichton and removed request for a team March 11, 2024 23:47
@elliottt elliottt marked this pull request as draft March 11, 2024 23:55
@github-actions github-actions bot added the winch Winch issues or pull requests label Mar 12, 2024
Copy link

Subscribe to Label Action

cc @saulecabrera

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 .github/subscribe-to-label.json configuration file.

Learn more.

@elliottt elliottt force-pushed the trevor/winch-cranelift-trampolines branch from 540fd4c to 6ae2b77 Compare March 12, 2024 19:42
@elliottt elliottt marked this pull request as ready for review March 12, 2024 19:42
@github-actions 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 Mar 12, 2024
Copy link

Subscribe to Label Action

cc @peterhuene

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 .github/subscribe-to-label.json configuration file.

Learn more.

Copy link

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.

@alexcrichton alexcrichton added this pull request to the merge queue Mar 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 12, 2024
@elliottt elliottt added this pull request to the merge queue Mar 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 12, 2024
@elliottt elliottt added this pull request to the merge queue Mar 12, 2024
Merged via the queue into bytecodealliance:main with commit ed0b537 Mar 12, 2024
19 checks passed
@elliottt elliottt deleted the trevor/winch-cranelift-trampolines branch March 12, 2024 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
wasmtime:api Related to the API of the `wasmtime` crate itself wasmtime:config Issues related to the configuration of Wasmtime winch Winch issues or pull requests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants