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

build: enable WAMR and WAVM runtimes. #162

Merged
merged 27 commits into from
May 16, 2021
Merged

build: enable WAMR and WAVM runtimes. #162

merged 27 commits into from
May 16, 2021

Conversation

mathetake
Copy link
Contributor

@mathetake mathetake commented May 11, 2021 •
edited
Loading

Signed-off-by: Takeshi Yoneda takeshi@tetrate.io

partially resolves_ #49 and left TODO in #142

@PiotrSikora
Copy link
Member

Could you add WAVM while you're at it? Once you get LLVM working, that should be pretty easy.

@mathetake
build: enable WAMR and LLVM builds.
9337c10 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
mathetake added 2 commits May 12, 2021 14:13
@mathetake
Add WAVM.
fe09128 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Use clang.
26a0890 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake mathetake changed the title build: enable WAMR and LLVM builds. build: enable WAMR and WAVM builds. May 12, 2021
@mathetake mathetake changed the title build: enable WAMR and WAVM builds. build: enable WAM, WAVM and LLVM builds. May 12, 2021
@mathetake mathetake changed the title build: enable WAM, WAVM and LLVM builds. build: enable WAMR, WAVM and LLVM builds. May 12, 2021
@mathetake
Fix test path
8357bea 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
PiotrSikora
PiotrSikora reviewed May 12, 2021
View reviewed changes
.bazelrc Outdated Show resolved Hide resolved
mathetake added 4 commits May 12, 2021 16:57
@mathetake
Cache on runtime dependency versions.
9d15fb0 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Fix WAVM build and disable runtime_test temporarily.
8296f8e 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Fix bazelrc.
cf4978d 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Fix runtime name.
0e077c4 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
PiotrSikora
PiotrSikora reviewed May 12, 2021
View reviewed changes
bazel/external/llvm.BUILD Show resolved Hide resolved
.bazelrc Show resolved Hide resolved
bazel/external/wavm.BUILD Outdated Show resolved Hide resolved
bazel/external/wavm.BUILD Outdated Show resolved Hide resolved
mathetake added 2 commits May 13, 2021 09:41
@mathetake
review: remove deprecated options, LLVM patch.
c67261f 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Use cache@v2 for better compression
117534a 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Copy link
Contributor Author

mathetake commented May 13, 2021 •
edited
Loading

so working on the test fixes, but I encountered some weird bug around contexts with WAVM.. which I think is something to do with the previous nasty bug we fought last year.. envoyproxy/envoy@8d49c1d Fixed.

@mathetake
Fix runtime tests.
db4b0ce 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake mathetake marked this pull request as ready for review May 13, 2021 03:19
mathetake
mathetake commented May 13, 2021
View reviewed changes
.github/workflows/cpp.yml Outdated Show resolved Hide resolved
@mathetake
Fix WAVM build with unresolved TODO.
180cfd0 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Copy link
Contributor Author

OK WAMR and Wasmtime finishes in 1~2 min so the cache works fine :)

mathetake added 4 commits May 13, 2021 21:09
@mathetake
review: use simple cache key.
72a8153 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Update WAMR and use Ninja.
f3d9496 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
review: Delete trap2 test.
90dc748 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
Add missing header in NullVm.
0bb696f 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
PiotrSikora
PiotrSikora reviewed May 13, 2021
View reviewed changes
test/runtime_test.cc Show resolved Hide resolved
test/runtime_test.cc Outdated Show resolved Hide resolved
PiotrSikora
PiotrSikora reviewed May 14, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

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

LGTM, sans nits.

test/runtime_test.cc Outdated Show resolved Hide resolved
test/runtime_test.cc Show resolved Hide resolved
.github/workflows/cpp.yml Outdated Show resolved Hide resolved
.github/workflows/cpp.yml Outdated Show resolved Hide resolved
@PiotrSikora
Copy link
Member

I'm not sure why the builds fails now.

There is this warning in logs:

stdout (/home/runner/.cache/bazel/_bazel_runner/ae21fb6b2e26a9267f16b46bb90ea321/execroot/proxy_wasm_cpp_host/bazel-out/_tmp/actions/stdout-69) exceeds maximum size of --experimental_ui_max_stdouterr_bytes=1048576 bytes; skipping

so maybe remove build_args = ["-v"]? It doesn't look like a failure, but there is nothing else of significance in the logs.

mathetake added 2 commits May 14, 2021 17:24
@mathetake
review: fix style.
6fed6fe 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
try removing -v.
502c42e 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@mathetake
review: disable LLVM benchmark build.
7492878 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
@PiotrSikora PiotrSikora changed the title build: enable WAMR, WAVM and LLVM builds. build: enable WAMR and WAVM runtimes. May 15, 2021
PiotrSikora
PiotrSikora approved these changes May 15, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

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

LGTM, assuming that raw_context -> current_context_ change is intentional and needed.

Thanks!

(Envoy tests for this PR are running in envoyproxy/envoy#16430)

@PiotrSikora
review: use --per_file_copt.
d6ba6ab 
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
@PiotrSikora
review: wipe cache.
6cf8d7b 
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
PiotrSikora
PiotrSikora approved these changes May 15, 2021
View reviewed changes
.github/workflows/cpp.yml Show resolved Hide resolved
@mathetake mathetake merged commit 21af4d7 into proxy-wasm:master May 16, 2021
@mathetake mathetake deleted the llvm-wamr branch May 16, 2021 22:53
@mathetake mathetake mentioned this pull request Jun 7, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lum1n0us lum1n0us lum1n0us left review comments

@PiotrSikora PiotrSikora PiotrSikora approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@mathetake @PiotrSikora @lum1n0us