Add support for WebAssembly Micro Runtime (WAMR). #142

leyao-daily · 2021-03-18T02:04:59Z

Add WAMR support

leyao-daily · 2021-03-18T02:09:15Z

@googlebot I signed it!

leyao-daily · 2021-03-19T06:36:01Z

@googlebot I signed it!

leyao-daily · 2021-03-22T01:42:37Z

@googlebot I fixed it.

google-cla · 2021-03-22T01:42:42Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

PiotrSikora · 2021-03-23T06:33:06Z

@googlebot I fixed it.

@leyao-daily one of your commits has a line saying Co-authored-by: Liang He <[email protected]>, and we don't have signed CLA for that person.

leyao-daily · 2021-03-23T08:33:03Z

@googlebot I fixed it.

@leyao-daily one of your commits has a line saying Co-authored-by: Liang He <[email protected]>, and we don't have signed CLA for that person.

Okay, I will remind him.

google-cla · 2021-03-23T08:33:08Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

mathetake · 2021-03-24T03:21:02Z

I believe you need to put

 #if defined(WASM_WAMR) 
     } else if (runtime_ == "wamr") { 
       vm_ = proxy_wasm::createWAMRVm(); 
 #endif

here,

and

#if defined(WASM_WAMR)
    "wamr",
#endif

here as well to run test properly.

leyao-daily · 2021-03-25T03:58:01Z

@googlebot I fixed it.

leyao-daily · 2021-03-25T03:58:51Z

@googlebot I consent.

google-cla · 2021-03-25T03:58:59Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

lum1n0us · 2021-03-25T05:34:15Z

@googlebot I consent.

bazel/external/wamr.BUILD

src/wamr/wamr.cc

Build and testing runtime Signed-off-by: Le Yao <[email protected]>

Signed-off-by: Le Yao <[email protected]>

Add wamr runtime to testing, passed Signed-off-by: Le Yao <[email protected]>

using a pre-release archive until passing integration Signed-off-by: liam <[email protected]>

WAMR is commom WASM c/c++ API based, implenment same as wasitime Co-authored-by: Liang He <[email protected]> Signed-off-by: Le Yao <[email protected]>

Build and testing runtime Signed-off-by: Le Yao <[email protected]>

Signed-off-by: Le Yao <[email protected]>

Co-authored-by: Liang He <[email protected]> Signed-off-by: Le Yao <[email protected]>

INFO: Analyzed 9 targets (0 packages loaded, 0 targets configured). INFO: Found 1 target and 8 test targets... INFO: Elapsed time: 4.954s, Critical Path: 3.83s INFO: 25 processes: 2 internal, 23 linux-sandbox. INFO: Build completed successfully, 25 total actions //test:context_test PASSED in 0.1s //test:exports_test PASSED in 0.1s //test:null_vm_test PASSED in 0.2s //test:runtime_test PASSED in 0.1s //test:shared_data PASSED in 0.1s //test:shared_queue PASSED in 0.1s //test:vm_id_handle PASSED in 0.1s //test/common:bytecode_util_test PASSED in 0.2s Executed 8 out of 8 tests: 8 tests pass. INFO: Build completed successfully, 25 total actions Signed-off-by: Le Yao <[email protected]>

INFO: Analyzed 9 targets (0 packages loaded, 0 targets configured). INFO: Found 1 target and 8 test targets... INFO: Elapsed time: 4.541s, Critical Path: 3.48s INFO: 20 processes: 2 internal, 18 linux-sandbox. INFO: Build completed successfully, 20 total actions //test:context_test PASSED in 0.1s //test:exports_test PASSED in 0.1s //test:null_vm_test PASSED in 0.1s //test:runtime_test PASSED in 0.1s //test:shared_data PASSED in 0.1s //test:shared_queue PASSED in 0.1s //test:vm_id_handle PASSED in 0.1s //test/common:bytecode_util_test PASSED in 0.1s Executed 8 out of 8 tests: 8 tests pass. INFO: Build completed successfully, 20 total actions Signed-off-by: Le Yao <[email protected]>

Starting local Bazel server and connecting to it... DEBUG: Rule 'proxy_wasm_cpp_host__wasmtime_c_api_macros__0_19_0' indicated that a canonical reproducible form can be obtained by modifying arguments shallow_since = "1617649269 -0700" DEBUG: Repository proxy_wasm_cpp_host__wasmtime_c_api_macros__0_19_0 instantiated at: /root/proxy-wasm-cpp-host/WORKSPACE:9:33: in <toplevel> /root/.cache/bazel/_bazel_root/5d3cda4fc30ff6fff6d96ed8522a1d40/external/proxy_wasm_cpp_host/bazel/dependencies.bzl:20:44: in proxy_wasm_cpp_host_dependencies /root/.cache/bazel/_bazel_root/5d3cda4fc30ff6fff6d96ed8522a1d40/external/proxy_wasm_cpp_host/bazel/cargo/crates.bzl:724:10: in proxy_wasm_cpp_host_fetch_remote_crates /root/.cache/bazel/_bazel_root/5d3cda4fc30ff6fff6d96ed8522a1d40/external/bazel_tools/tools/build_defs/repo/utils.bzl:201:18: in maybe Repository rule new_git_repository defined at: /root/.cache/bazel/_bazel_root/5d3cda4fc30ff6fff6d96ed8522a1d40/external/bazel_tools/tools/build_defs/repo/git.bzl:186:37: in <toplevel> INFO: Analyzed 9 targets (131 packages loaded, 34267 targets configured). INFO: Found 1 target and 8 test targets... INFO: Elapsed time: 117.312s, Critical Path: 101.49s INFO: 334 processes: 165 internal, 169 linux-sandbox. INFO: Build completed successfully, 334 total actions //test:context_test PASSED in 0.1s //test:exports_test PASSED in 5.7s //test:null_vm_test PASSED in 0.1s //test:runtime_test PASSED in 2.0s //test:shared_data PASSED in 0.1s //test:shared_queue PASSED in 0.1s //test:vm_id_handle PASSED in 0.1s //test/common:bytecode_util_test PASSED in 0.1s Executed 8 out of 8 tests: 8 tests pass. INFO: Build completed successfully, 334 total actions Signed-off-by: Le Yao <[email protected]>

INFO: Analyzed 9 targets (5 packages loaded, 930 targets configured). INFO: Found 1 target and 8 test targets... INFO: Elapsed time: 5.281s, Critical Path: 0.02s INFO: 1 process: 1 internal. INFO: Build completed successfully, 1 total action //test:context_test (cached) PASSED in 0.1s //test:exports_test (cached) PASSED in 5.7s //test:null_vm_test (cached) PASSED in 0.1s //test:runtime_test (cached) PASSED in 2.0s //test:shared_data (cached) PASSED in 0.1s //test:shared_queue (cached) PASSED in 0.1s //test:vm_id_handle (cached) PASSED in 0.1s //test/common:bytecode_util_test (cached) PASSED in 0.1s Executed 0 out of 8 tests: 8 tests pass. INFO: Build completed successfully, 1 total action Signed-off-by: Le Yao <[email protected]>

since `wasm_functype_new` will transfer data ownerships of both `params` and `resutls` to the new `wasm_functype_t`, we should not - delete `wasm_valtype_t` of `wasm_valtype_vec_t` - use `wasm_functype_delete` to release members of `wasm_functype_t` a good example will be found here: [multi.c](https://github.com/WebAssembly/wasm-c-api/blob/master/example/multi.c) another thing is the runtime() should return a string as same as the one in envoy.yaml update wamr code release to 0.1-beta Signed-off-by: liam <[email protected]>

Signed-off-by: Le Yao <[email protected]>

To the latest official commit Signed-off-by: Le Yao <[email protected]>

PiotrSikora · 2021-04-30T08:46:14Z

bazel/external/wamr.BUILD

+    },
+    lib_source = ":srcs",
+    out_shared_libs = ["libiwasm.so"],
+)


Don't we need LLVM dependency like in Envoy?

PiotrSikora · 2021-04-30T08:50:06Z

bazel/external/wamr.BUILD

+cmake(
+    name = "libiwasm",
+    cache_entries = {
+        "WAMR_BUILD_AOT": "0",


Please match it to options used in Envoy. At the very least, please add:

"WAMR_BUILD_INTERP": "1", "WAMR_BUILD_JIT": "0",

or does JIT work already?

✋ just curious, I didn't find any WAVM related BUILD file. Does it mean WAVM can not be linked in this repo yet?

Correct, currently you cannot build WAVM in this repo. We're slowly fixing this (see: #160), which is why it would be helpful if WAMR worked.

src/wamr/wamr.cc

leyao-daily · 2021-05-02T01:03:52Z

Get it. And I am on holiday now, so I will update PR after May 6th. Thanks!

________________________________ 发件人: Piotr Sikora ***@***.***> 发送时间: Sunday, May 2, 2021 6:29:10 AM 收件人: proxy-wasm/proxy-wasm-cpp-host ***@***.***> 抄送: Yao, Le ***@***.***>; Mention ***@***.***> 主题: Re: [proxy-wasm/proxy-wasm-cpp-host] Add Webassembly micro runtime support (#142) @PiotrSikora commented on this pull request.

________________________________ In src/wamr/wamr.cc<#142 (comment)>:

+ void *raw_func_;

+ WasmVm *vm_; +}; + +using HostFuncDataPtr = std::unique_ptr<HostFuncData>; + +wasm_engine_t *engine() { + static const auto engine = WasmEnginePtr(wasm_engine_new()); + return engine.get(); +} + +class Wamr : public WasmVm { +public: + Wamr() {} + + std::string_view runtime() override { return "envoy.wasm.runtime.wamr"; } This should return "wamr", since Proxy-Wasm C++ Host is (in theory) proxy-agnostic. The issue you've hit should be fixed in envoyproxy/envoy#16263<envoyproxy/envoy#16263>. ― You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#142 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AM66EL6HW54UQUMTEWBUBQTTLR6DNANCNFSM4ZLWT42Q>.

Signed-off-by: Le Yao <[email protected]>

PiotrSikora

@mathetake could you take a pass on this PR? I think it looks good, and tests in Envoy passed already (envoyproxy/envoy#16057).

I think the only thing missing right now is the LLVM dependency, but perhaps we could merge it as-is to unblock merge in Envoy, and we could fix any build issues as part of #160.

What do you think?

mathetake · 2021-05-07T05:20:47Z

this looks good to me now and we could merge as-is since Envoy tests pass. And I will handle build/test issues here in #160 and subsequent PRs.

PiotrSikora

LGTM, thanks a lot! @leyao-daily @lum1n0us please let me know if this is ready to be merged or if you still want to make some changes, thanks!

leyao-daily · 2021-05-07T05:58:10Z

LGTM, thanks a lot! @leyao-daily @lum1n0us please let me know if this is ready to be merged or if you still want to make some changes, thanks!

Cool! We think it is ready to be merged now. Thanks a lot.

PiotrSikora · 2021-05-07T06:03:17Z

Thanks!

leyao-daily changed the title ~~Add Webassembly micro runtime support~~ [WIP] Add Webassembly micro runtime support Mar 18, 2021

leyao-daily force-pushed the master branch from f1141e1 to d06e7f9 Compare March 19, 2021 05:57

leyao-daily force-pushed the master branch from 7741c38 to b59a9d6 Compare March 25, 2021 03:11

proxy-wasm deleted a comment from google-cla bot Mar 25, 2021

PiotrSikora reviewed Mar 25, 2021

View reviewed changes

bazel/external/wamr.BUILD Outdated Show resolved Hide resolved

lum1n0us reviewed Mar 27, 2021

View reviewed changes

src/wamr/wamr.cc Show resolved Hide resolved

leyao-daily force-pushed the master branch from b59a9d6 to bc9ef21 Compare April 6, 2021 05:33

leyao-daily marked this pull request as ready for review April 6, 2021 07:42

Le Yao and others added 14 commits April 30, 2021 02:02

Bazel build the runtime from external WAMR repo

9724c96

Build and testing runtime Signed-off-by: Le Yao <[email protected]>

Format the c/c++ files and build files

ac6b4ad

Signed-off-by: Le Yao <[email protected]>

Fix symbol link error when testing runtime

564b3c1

Add wamr runtime to testing, passed Signed-off-by: Le Yao <[email protected]>

compile WAMR from source code

3031f9a

using a pre-release archive until passing integration Signed-off-by: liam <[email protected]>

Implement the proxy-wasm interface wasm_vm

2ea172c

WAMR is commom WASM c/c++ API based, implenment same as wasitime Co-authored-by: Liang He <[email protected]> Signed-off-by: Le Yao <[email protected]>

Bazel build the runtime from external WAMR repo

2ad5f18

Build and testing runtime Signed-off-by: Le Yao <[email protected]>

Fix sha256 check and format

05502ed

Signed-off-by: Le Yao <[email protected]>

Update to the latest branch and drop the merge pull

fa6fd6f

Co-authored-by: Liang He <[email protected]> Signed-off-by: Le Yao <[email protected]>

Update to the latest repo

86ee01b

Signed-off-by: Le Yao <[email protected]>

leyao-daily force-pushed the master branch from 02ef693 to 86ee01b Compare April 30, 2021 02:02

Apply the latest WAMR repo as dependency

f569d10

To the latest official commit Signed-off-by: Le Yao <[email protected]>

leyao-daily requested a review from PiotrSikora April 30, 2021 02:10

PiotrSikora reviewed Apr 30, 2021

View reviewed changes

PiotrSikora reviewed May 1, 2021

View reviewed changes

src/wamr/wamr.cc Outdated Show resolved Hide resolved

Match the build params

55cdd8e

Signed-off-by: Le Yao <[email protected]>

PiotrSikora reviewed May 7, 2021

View reviewed changes

Merge branch 'master' into master

676d245

PiotrSikora changed the title ~~Add Webassembly micro runtime support~~ Add support for WebAssembly Micro Runtime (WAMR). May 7, 2021

PiotrSikora approved these changes May 7, 2021

View reviewed changes

PiotrSikora merged commit e641ffa into proxy-wasm:master May 7, 2021

mathetake mentioned this pull request May 12, 2021

build: enable WAMR and WAVM runtimes. #162

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for WebAssembly Micro Runtime (WAMR). #142

Add support for WebAssembly Micro Runtime (WAMR). #142

leyao-daily commented Mar 18, 2021

leyao-daily commented Mar 18, 2021

leyao-daily commented Mar 19, 2021

leyao-daily commented Mar 22, 2021

google-cla bot commented Mar 22, 2021

PiotrSikora commented Mar 23, 2021 •

edited

Loading

leyao-daily commented Mar 23, 2021

google-cla bot commented Mar 23, 2021

mathetake commented Mar 24, 2021 •

edited

Loading

leyao-daily commented Mar 25, 2021

leyao-daily commented Mar 25, 2021

google-cla bot commented Mar 25, 2021

lum1n0us commented Mar 25, 2021

PiotrSikora Apr 30, 2021

PiotrSikora Apr 30, 2021

lum1n0us May 2, 2021

PiotrSikora May 6, 2021

leyao-daily commented May 2, 2021 via email

PiotrSikora left a comment

mathetake commented May 7, 2021

PiotrSikora left a comment

leyao-daily commented May 7, 2021

PiotrSikora commented May 7, 2021

Add support for WebAssembly Micro Runtime (WAMR). #142

Add support for WebAssembly Micro Runtime (WAMR). #142

Conversation

leyao-daily commented Mar 18, 2021

leyao-daily commented Mar 18, 2021

leyao-daily commented Mar 19, 2021

leyao-daily commented Mar 22, 2021

google-cla bot commented Mar 22, 2021

PiotrSikora commented Mar 23, 2021 • edited Loading

leyao-daily commented Mar 23, 2021

google-cla bot commented Mar 23, 2021

mathetake commented Mar 24, 2021 • edited Loading

leyao-daily commented Mar 25, 2021

leyao-daily commented Mar 25, 2021

google-cla bot commented Mar 25, 2021

lum1n0us commented Mar 25, 2021

PiotrSikora Apr 30, 2021

Choose a reason for hiding this comment

PiotrSikora Apr 30, 2021

Choose a reason for hiding this comment

lum1n0us May 2, 2021

Choose a reason for hiding this comment

PiotrSikora May 6, 2021

Choose a reason for hiding this comment

leyao-daily commented May 2, 2021 via email

PiotrSikora left a comment

Choose a reason for hiding this comment

mathetake commented May 7, 2021

PiotrSikora left a comment

Choose a reason for hiding this comment

leyao-daily commented May 7, 2021

PiotrSikora commented May 7, 2021

PiotrSikora commented Mar 23, 2021 •

edited

Loading

mathetake commented Mar 24, 2021 •

edited

Loading