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.

Sign up for GitHub

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

Jump to bottom

Feat/wasmer wasm alt #2851

Merged
merged 13 commits into from
May 3, 2022
Merged

Feat/wasmer wasm alt #2851

merged 13 commits into from
May 3, 2022

Conversation

ptitSeb
Copy link
Contributor

@ptitSeb ptitSeb commented Apr 19, 2022

Description

Abiility to build wasmer compile engine as WebAssembly, using a new CLI program wasmer-compiler-cli.
This is done with following steps:

  • New wasmer-engine-universal-artifact (extracted from wasmer-engine-universal), that handle only compilation and serialization.
  • wasmer-engine-universal will uses this crate to create the artifact binary.
  • wasmer-compiler-cli uses this crate for offline compilation.

@ptitSeb ptitSeb marked this pull request as ready for review April 22, 2022 08:58
@ptitSeb ptitSeb requested a review from Amanieu April 22, 2022 08:58
@syrusakbary syrusakbary mentioned this pull request Apr 27, 2022
Closed
3 tasks
Amanieu
Amanieu reviewed Apr 28, 2022
View reviewed changes
lib/compiler-singlepass/Cargo.toml Outdated Show resolved Hide resolved
lib/vm/Cargo.toml Show resolved Hide resolved
lib/types/src/trapcode.rs Outdated Show resolved Hide resolved
lib/types/src/memory.rs Outdated Show resolved Hide resolved
lib/cli-compiler/Cargo.toml Outdated Show resolved Hide resolved
lib/cli/src/bin/wasmer_compiler.rs Outdated Show resolved Hide resolved
lib/cli/Cargo.toml Outdated Show resolved Hide resolved
lib/vfs/src/host_fs.rs Outdated Show resolved Hide resolved
@Amanieu
Copy link
Contributor

Amanieu commented May 2, 2022

Also can you rebase the branch on top of the latest master? There are a few unrelated commits in there.

@syrusakbary
Copy link
Member

@Amanieu @epilys should we merge this into the wasmer3 branch instead of master ?

@Amanieu
Copy link
Contributor

Amanieu commented May 2, 2022

I don't think there are any API breaking changes, so it's not necessary.

Amanieu
Amanieu reviewed May 2, 2022
View reviewed changes
lib/api/src/js/mod.rs
@@ -41,7 +41,6 @@ mod resolver;
mod store;
mod trap;
mod types;
mod utils;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to delete utils.rs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not resolved: the file is still not deleted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what file? lib/api/src/js/utils.rs? It's not there.
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh the github "Files changed" didn't show it as deleted.

@Amanieu
Copy link
Contributor

Amanieu commented May 2, 2022

Also could you rebase on top of master (git fetch && git rebase origin/master && git push --force) instead of merging?

@ptitSeb
Copy link
Contributor Author

ptitSeb commented May 3, 2022

Also could you rebase on top of master (git fetch && git rebase origin/master && git push --force) instead of merging?

I alway have a conflict with the Update to wasmer 0.83:

Auto-merging lib/compiler-cranelift/src/translator/code_translator.rs
CONFLICT (content): Merge conflict in lib/compiler-cranelift/src/translator/code_translator.rs
Auto-merging lib/compiler-singlepass/src/codegen.rs
error: could not apply fc461f605... Update wasmparser to 0.83

ptitSeb added 13 commits May 3, 2022 09:32
@ptitSeb
Moved TrapCode enum to wasmer_types, and adapted compiler and wompile…
d5bbfd0 
…r-singlepass
@ptitSeb
Move VMOffset (and a few friends) to wasmer_types, and adapted compil…
eb7ef52 
…er-singlepass to use it
@ptitSeb
Moved TableStyle and MemoryStyle to wasmer-types (and compiler-single…
e745cea 
… pass do not depend from vm anymore)
@ptitSeb
Moved LibCall enum to wasmer_types, and compiler is no longer dependa…
3d7ae9e 
…nt of wasmer_vm
@ptitSeb
Also moved enum Trap out of vm
1783aa5
@ptitSeb
Split Artifact to have ArtifactCreate that handles only the creation …
1f3613c 
…part, not the run part
@ptitSeb
Added wasm32 part for vfs file access
0d6e13a
@ptitSeb
Removed cfg conditionnal compilation in link, to allow cross-link bet…
fd2db37 
…ween different bitness (wasm32 vs 64bits)
@ptitSeb
Splitted UniversalEngine in two, to have the Build (compilation) part…
5c609c3 
… separated from the Run part
@ptitSeb
Moved is_wasm function from api to types crate
6353847
@ptitSeb
Small change on UniversalEngine for consistency
d8a7d9f
@ptitSeb
Created stand-alone wasmer-compiler, builded only as a .wasm target f…
8010cb8 
…or now

Removed leftover trace of compiler feature in compiler-cli
Excluded the new wasmer-compiler-cli from lint test, like wasmer-cli it's based on
@ptitSeb
Cleanup:
0c7ea79 
Removed conditionnal toml on wasm for VM as it's not builded in that configuration
Added unwind to wasm build
Moved Trap back to vm (from types) as it's used only on Runtime
Move MemoryError back to vm (from types) as it's used on Runtime only scenario
Some cleanup and lint fixes
Removed wasm build case from vfs/host_fs as it's not used
@ptitSeb
Copy link
Contributor Author

ptitSeb commented May 3, 2022

Finaly got it. In needed to use interactive rebase to remove the strange merge I created earlier and that was incorrect. Seems clean now.

@Amanieu
Copy link
Contributor

Amanieu commented May 3, 2022

bors r+

@bors
Copy link
Contributor

bors bot commented May 3, 2022

Build succeeded:

@bors bors bot merged commit c164c16 into master May 3, 2022
@bors bors bot deleted the feat/wasmer-wasm-alt branch May 3, 2022 13:53
This was referenced May 6, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amanieu Amanieu Amanieu left review comments

@epilys epilys epilys approved these changes

@syrusakbary syrusakbary Awaiting requested review from syrusakbary

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ptitSeb @Amanieu @syrusakbary @epilys