Add WAVM and update cache keys.

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

.github/workflows/cpp.yml

@@ -59,8 +59,8 @@ jobs:
 
     strategy:
       matrix:
-        # TODO(mathetake): Add other runtimes.
-        runtime: [ "wamr", "wasmtime" ]
+        # TODO(mathetake): Add V8.
+        runtime: [ "wamr", "wasmtime", "wavm" ]
 
     steps:
     - uses: actions/checkout@v2
@@ -69,7 +69,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: "/home/runner/.cache/bazel"
-        key: bazel-${{ matrix.runtime }}
+        key: bazel-${{ matrix.runtime }}-clang
 
     - name: Test
       run: |

BUILD

@@ -78,13 +78,12 @@ cc_library(
 cc_library(
     name = "wavm_lib",
     srcs = glob([
-        # TODO(@mathetake): Add WAVM lib.
-        # "src/wavm/*.h",
-        # "src/wavm/*.cc",
+        "src/wavm/*.h",
+        "src/wavm/*.cc",
     ]),
     deps = [
         ":common_lib",
-        # TODO(@mathetake): Add WAVM lib.
+        "@wavm//:wavm_lib",
     ],
 )
 

bazel/external/llvm.BUILD

@@ -7,7 +7,6 @@ package(default_visibility = ["//visibility:public"])
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//visibility:public"],
 )
 
 cmake(
@@ -46,7 +45,6 @@ cmake(
     },
     lib_source = ":srcs",
     out_static_libs = [
-        # Order from llvm-config --libnames.
         "libLLVMInterpreter.a",
         "libLLVMWindowsManifest.a",
         "libLLVMLibDriver.a",

bazel/external/wamr.BUILD

@@ -7,7 +7,6 @@ package(default_visibility = ["//visibility:public"])
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//visibility:public"],
 )
 
 cmake(

bazel/external/wavm.BUILD

@@ -0,0 +1,38 @@
+load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
+
+licenses(["notice"])  # Apache 2
+
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
+
+cmake(
+    name = "wavm_lib",
+    binaries = ["wavm"],
+    cache_entries = {
+        "LLVM_DIR": "$EXT_BUILD_DEPS/copy_llvm/llvm/lib/cmake/llvm",
+        "WAVM_ENABLE_STATIC_LINKING": "on",
+        "WAVM_ENABLE_RELEASE_ASSERTS": "on",
+        "WAVM_ENABLE_UNWIND": "on",
+        # Workaround for the issue with statically linked libstdc++
+        # using -l:libstdc++.a.
+        "CMAKE_CXX_FLAGS": "-lstdc++ -Wno-unused-command-line-argument",
+    },
+    defines = ["WASM_WAVM"],
+    env_vars = {
+        # Workaround for the -DDEBUG flag added in fastbuild on macOS,
+        # which conflicts with DEBUG macro used in LLVM.
+        "CFLAGS": "-UDEBUG",
+        "CXXFLAGS": "-UDEBUG",
+        "ASMFLAGS": "-UDEBUG",
+    },
+    lib_source = ":srcs",
+    static_libraries = [
+        "libWAVM.a",
+        "libWAVMUnwind.a",
+    ],
+    deps = ["@llvm//:llvm_lib"],
+)

bazel/repositories.bzl

@@ -90,3 +90,11 @@ def proxy_wasm_cpp_host_repositories():
         patch_args = ["-p1"],
         patches = ["@proxy_wasm_cpp_host//bazel/external:llvm.patch"],
     )
+
+    http_archive(
+        name = "wavm",
+        build_file = "@proxy_wasm_cpp_host//bazel/external:wavm.BUILD",
+        sha256 = "ce899269516313b400005a8cc9bc3bcd8329663f43f7b4baae211ea0cd456a39",
+        strip_prefix = "WAVM-79c3aa29366615d9b1593cd527e5b4b94cc6072a",
+        url = "https://github.com/WAVM/WAVM/archive/79c3aa29366615d9b1593cd527e5b4b94cc6072a.tar.gz",
+    )