chore!:remove support for wavm (#438)

* remove support for wavm

Signed-off-by: Michael Warres <[email protected]>

* apply clang-format

Signed-off-by: Michael Warres <[email protected]>

---------

Signed-off-by: Michael Warres <[email protected]>
Signed-off-by: Matt Leon <[email protected]>

Author: mpwarres

.github/workflows/test.yml

@@ -262,14 +262,6 @@ jobs:
           os: macos-13
           arch: x86_64
           action: test
-        - name: 'WAVM on Linux/x86_64'
-          engine: 'wavm'
-          repo: 'com_github_wavm_wavm'
-          os: ubuntu-22.04
-          arch: x86_64
-          action: test
-          flags: --config=clang
-          cache: true
 
     steps:
     - uses: actions/checkout@v2

BUILD

@@ -19,7 +19,6 @@ load(
     "proxy_wasm_select_engine_wamr",
     "proxy_wasm_select_engine_wasmedge",
     "proxy_wasm_select_engine_wasmtime",
-    "proxy_wasm_select_engine_wavm",
 )
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
@@ -281,34 +280,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "wavm_lib",
-    srcs = [
-        "src/wavm/wavm.cc",
-    ],
-    hdrs = ["include/proxy-wasm/wavm.h"],
-    copts = [
-        "-DWAVM_API=",
-        "-Wno-non-virtual-dtor",
-        "-Wno-old-style-cast",
-    ],
-    defines = [
-        "PROXY_WASM_HAS_RUNTIME_WAVM",
-        "PROXY_WASM_HOST_ENGINE_WAVM",
-    ],
-    linkopts = select({
-        "@platforms//os:macos": [],
-        "@platforms//os:windows": [],
-        "//conditions:default": [
-            "-ldl",
-        ],
-    }),
-    deps = [
-        ":wasm_vm_headers",
-        "//external:wavm",
-    ],
-)
-
 cc_library(
     name = "lib",
     deps = [
@@ -324,7 +295,5 @@ cc_library(
     ) + proxy_wasm_select_engine_wasmtime(
         [":wasmtime_lib"],
         [":prefixed_wasmtime_lib"],
-    ) + proxy_wasm_select_engine_wavm(
-        [":wavm_lib"],
     ),
 )

bazel/BUILD

@@ -46,11 +46,6 @@ config_setting(
     values = {"define": "engine=wasmtime"},
 )
 
-config_setting(
-    name = "engine_wavm",
-    values = {"define": "engine=wavm"},
-)
-
 config_setting(
     name = "multiengine",
     values = {"define": "engine=multi"},

bazel/external/wavm.BUILD

@@ -263,30 +263,3 @@ def proxy_wasm_cpp_host_repositories():
         name = "prefixed_wasmtime",
         actual = "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib",
     )
-
-    # WAVM with dependencies.
-
-    maybe(
-        http_archive,
-        name = "com_github_wavm_wavm",
-        build_file = "@proxy_wasm_cpp_host//bazel/external:wavm.BUILD",
-        sha256 = "7cfa3d7334c96f89553bb44eeee736a192826a78b4db114042d38d6882748f5b",
-        strip_prefix = "WAVM-nightly-2022-05-14",
-        url = "https://github.com/WAVM/WAVM/archive/refs/tags/nightly/2022-05-14.tar.gz",
-    )
-
-    native.bind(
-        name = "wavm",
-        actual = "@com_github_wavm_wavm//:wavm_lib",
-    )
-
-    maybe(
-        http_archive,
-        name = "llvm",
-        build_file = "@proxy_wasm_cpp_host//bazel/external:llvm.BUILD",
-        sha256 = "7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf",
-        strip_prefix = "llvm-12.0.1.src",
-        url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz",
-        patches = ["@proxy_wasm_cpp_host//bazel/external:llvm.patch"],
-        patch_args = ["-p1"],
-    )

bazel/repositories.bzl

@@ -47,10 +47,3 @@ def proxy_wasm_select_engine_wasmedge(xs):
         "@proxy_wasm_cpp_host//bazel:multiengine": xs,
         "//conditions:default": [],
     })
-
-def proxy_wasm_select_engine_wavm(xs):
-    return select({
-        "@proxy_wasm_cpp_host//bazel:engine_wavm": xs,
-        "@proxy_wasm_cpp_host//bazel:multiengine": xs,
-        "//conditions:default": [],
-    })

bazel/select.bzl

@@ -373,7 +373,7 @@ class PluginHandleBase : public std::enable_shared_from_this<PluginHandleBase> {
 using PluginHandleFactory = std::function<std::shared_ptr<PluginHandleBase>(
     std::shared_ptr<WasmHandleBase> base_wasm, std::shared_ptr<PluginBase> plugin)>;
 
-// Get an existing ThreadLocal VM matching 'vm_id' or create one using 'base_wavm' by cloning or by
+// Get an existing ThreadLocal VM matching 'vm_id' or create one using 'base_wasm' by cloning or by
 // using it it as a template.
 std::shared_ptr<PluginHandleBase> getOrCreateThreadLocalPlugin(
     const std::shared_ptr<WasmHandleBase> &base_handle, const std::shared_ptr<PluginBase> &plugin,

include/proxy-wasm/wasm.h

@@ -189,10 +189,9 @@ class WasmVm {
   /**
    * Whether or not the VM implementation supports cloning. Cloning is VM system dependent.
    * When a VM is configured a single VM is instantiated to check that the .wasm file is valid and
-   * to do VM system specific initialization. In the case of WAVM this is potentially ahead-of-time
-   * compilation. Then, if cloning is supported, we clone that VM for each worker, potentially
-   * copying and sharing the initialized data structures for efficiency. Otherwise we create an new
-   * VM from scratch for each worker.
+   * to do VM system specific initialization. Then, if cloning is supported, we clone that VM for
+   * each worker, potentially copying and sharing the initialized data structures for efficiency.
+   * Otherwise we create an new VM from scratch for each worker.
    * @return one of enum Cloneable with the VMs cloneability.
    */
   virtual Cloneable cloneable() = 0;