Skip to content

cc,wasi: support WASI reactors via -mexec-model flag - #8978

Closed
mathetake wants to merge 11 commits into
ziglang:cc-wasm32-wasi-emulationsfrom
mathetake:cc-wasi-execmodel
Closed

cc,wasi: support WASI reactors via -mexec-model flag#8978
mathetake wants to merge 11 commits into
ziglang:cc-wasm32-wasi-emulationsfrom
mathetake:cc-wasi-execmodel

Conversation

@mathetake

@mathetakemathetake commented Jun 3, 2021•
edited
Loading

Copy link
Copy Markdown

Based on this patch to LLVM (https://reviews.llvm.org/D62922). This partially resolves (only for zig cc) #6757

@mathetakemathetake mentioned this pull request Jun 3, 2021
Closed
@kubkonkubkon added arch-wasm 32-bit and 64-bit WebAssembly os-wasi WebAssembly System Interface zig cc Zig as a drop-in C compiler feature enhancement Solving this issue will likely involve adding new logic or components to the codebase. labels Jun 7, 2021
@kubkonkubkon added this to the 0.9.0 milestone Jun 7, 2021
kubkon
kubkon requested changes Jun 7, 2021
View reviewed changes

@kubkonkubkon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the PR! I've got a couple of suggestions that when we address, I'm sure we'll be able to merge this change no problem.

Comment threadsrc/Compilation.zig Outdated
Comment threadsrc/wasi_libc.zig Outdated
@mathetakemathetake changed the title [wip] cc,wasi: support WASI reactors via -mexec-model flagcc,wasi: support WASI reactors via -mexec-model flagJun 7, 2021
@mathetake
mathetake marked this pull request as ready for review June 7, 2021 14:01
@mathetake

mathetake commented Jun 7, 2021

Copy link
Copy Markdown
Author

OK so I verified this works as expected locally.

@mathetake
mathetake requested a review from kubkonJune 7, 2021 14:01
kubkonand others added 8 commits June 7, 2021 16:38
@kubkon
zig,cc,wasi: include emulated libs in WASI libc
09fe751
This commit includes emulated libc sublibs that were not included
in the compilation and caching of WASI libc that ships with Zig.
The libs include (emulated): process clocks, getpid, mman, and signal.
With this change, it is now possible to successfully cross-compile
`wasm3` engine to WASI with `zig cc`.
For the future though, it might be worth considering splitting WASI
libc into libc-proper and modularised emulated libs as it is done
in upstream, and then have them included only if the user specifically
requests emulation/parts of it.
@kubkon
cc,wasi: package emulations as static archives
b752d34
This replicates the expected behavior when using `clang` with
upstream `wasi-libc` sysroot: linking emulated subcomponents
such as process clocks or signals requires an explicit link flag
in the compiler invocation, for example:
```
zig cc -target wasm32-wasi -lwasi-emulated-process-clocks main.c -o main.wasm
```
@kubkon
cc,wasi: build referenced-only emulated components
e23ed56
Move parsing of system libs into `main.zig` next to where we decide
if we should link libC, and, if targeting WASI, if the specified
libname equals one of the emulated components, save it on the side
and remove it from the system libs. Then, build *only* those parts
of WASI libc that were preserved in the previous step.
This also fixes building of different crt1 bits needed to support
reactors and commands.
@kubkon
wasi: skip adding wasi_snapshot_preview1 as lib dep in stage1
56dd63d
@kubkon
wasi: clean up linking logic
910b6f4
Do not try to link WASI libc or emulated subcomponents when not
targeting WASI; e.g., when targeting `wasm32-freestanding`.
@mathetake
cc,wasi: support WASI reactors via -mexec-model flag.
98a360e
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
review: have WasiExecModel enum.
ab9cdf5
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
revert unnecessary change.
7d37709
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
mathetake changed the base branch from master to cc-wasm32-wasi-emulationsJune 8, 2021 00:17
@mathetake
cc,wasi: compilie in command/reactor
a2b2044
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake

mathetake commented Jun 8, 2021

Copy link
Copy Markdown
Author

@kubkon ok now rebased and added a necessary commit for checking in command/reactor crt (a2b2044). PTAL!

kubkon
kubkon requested changes Jun 8, 2021
View reviewed changes
Comment threadsrc/Compilation.zig Outdated
Comment threadsrc/link.zig
Comment threadsrc/Compilation.zig
Comment threadsrc/main.zig Outdated
Comment threadsrc/link/Wasm.zig Outdated
@mathetake
review: add comments, and more idiomatic.
cd61097
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
review: remove unnecesasry null initialization.
2308783
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
kubkon
kubkon approved these changes Jun 8, 2021
View reviewed changes

@kubkonkubkon left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks great! Thanks for working on this @mathetake!

@kubkon

kubkon commented Jun 8, 2021

Copy link
Copy Markdown
Member

BTW once #8992 lands, I'll merge this one next.

@mathetake

mathetake commented Jun 8, 2021

Copy link
Copy Markdown
Author

@kubkon Thanks for the review! Much appreciated, and I learned a lot from your suggestions:)

@kubkon
kubkonforce-pushed the cc-wasm32-wasi-emulations branch from 910b6f4 to 2ee1f78CompareJune 8, 2021 23:26
@kubkonkubkon closed this Jun 9, 2021
@kubkon
kubkon deleted the branch ziglang:cc-wasm32-wasi-emulationsJune 9, 2021 07:52
@kubkon

kubkon commented Jun 9, 2021

Copy link
Copy Markdown
Member

OK Github, why the heck did you close this PR?!

@kubkon

kubkon commented Jun 9, 2021

Copy link
Copy Markdown
Member

@mathetake would you mind reopening the PR?

@kubkon

kubkon commented Jun 9, 2021

Copy link
Copy Markdown
Member

Or I can try merging your branch manually on the command line, let's see...

@mathetake

mathetake commented Jun 9, 2021

Copy link
Copy Markdown
Author

OK, let me reopen!

@kubkon

kubkon commented Jun 9, 2021

Copy link
Copy Markdown
Member

OK, let me reopen!

Don't worry about conflicts, I'll take care of them while merging.

@mathetake

mathetake commented Jun 9, 2021

Copy link
Copy Markdown
Author

#9052 here you go!

@mathetakemathetake mentioned this pull request Jun 9, 2021
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kubkonkubkonkubkon approved these changes

Assignees

No one assigned

Labels

arch-wasm32-bit and 64-bit WebAssemblyenhancementSolving this issue will likely involve adding new logic or components to the codebase.os-wasiWebAssembly System Interfacezig ccZig as a drop-in C compiler feature

Projects

None yet

Milestone

0.9.0

Development

Successfully merging this pull request may close these issues.

2 participants

@mathetake@kubkon