Build rust wasm data with Bazel (#516)

Signed-off-by: Shikugawa <[email protected]>
Signed-off-by: Lizan Zhou <[email protected]>

Author: Shikugawa

.bazelrc

@@ -104,7 +104,8 @@ build:libc++ --config=clang
 build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
 build:libc++ --action_env=LDFLAGS=-stdlib=libc++
 build:libc++ --action_env=BAZEL_CXXOPTS=-stdlib=libc++
-build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a:-lm
+build:libc++ --action_env=BAZEL_LINKLIBS=-l%:libc++.a:-l%:libc++abi.a
+build:libc++ --action_env=BAZEL_LINKOPTS=-lm:-pthread
 build:libc++ --define force_libcpp=enabled
 
 # Optimize build for binary size reduction.
@@ -180,6 +181,8 @@ build:remote --spawn_strategy=remote,sandboxed,local
 build:remote --strategy=Javac=remote,sandboxed,local
 build:remote --strategy=Closure=remote,sandboxed,local
 build:remote --strategy=Genrule=remote,sandboxed,local
+# rules_rust is not remote runnable (yet)
+build:remote --strategy_regexp=_wasm_.*_rust=sandboxed,local
 build:remote --remote_timeout=7200
 build:remote --auth_enabled=true
 build:remote --remote_download_toplevel

bazel/dependency_imports.bzl

@@ -5,6 +5,8 @@ load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
 load("@upb//bazel:repository_defs.bzl", upb_bazel_version_repository = "bazel_version_repository")
+load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
+load("@io_bazel_rules_rust//:workspace.bzl", "bazel_version")
 load("@config_validation_pip3//:requirements.bzl", config_validation_pip_install = "pip_install")
 load("@protodoc_pip3//:requirements.bzl", protodoc_pip_install = "pip_install")
 load("@rules_antlr//antlr:deps.bzl", "antlr_dependencies")
@@ -19,6 +21,8 @@ def envoy_dependency_imports(go_version = GO_VERSION):
     rbe_toolchains_config()
     gazelle_dependencies()
     apple_rules_dependencies()
+    rust_repositories()
+    bazel_version(name = "bazel_version")
     upb_bazel_version_repository(name = "upb_bazel_version")
     antlr_dependencies(471)
 

bazel/repositories.bzl

@@ -136,6 +136,9 @@ def _go_deps(skip_targets):
         )
         _repository_impl("bazel_gazelle")
 
+def _rust_deps():
+    _repository_impl("io_bazel_rules_rust")
+
 def envoy_dependencies(skip_targets = []):
     # Setup Envoy developer tools.
     envoy_dev_binding()
@@ -212,6 +215,7 @@ def envoy_dependencies(skip_targets = []):
     _python_deps()
     _cc_deps()
     _go_deps(skip_targets)
+    _rust_deps()
     _kafka_deps()
 
     _org_llvm_llvm()

bazel/repository_locations.bzl

@@ -529,6 +529,14 @@ DEPENDENCY_REPOSITORIES = dict(
         urls = ["https://github.com/emscripten-core/emsdk/archive/1.39.6.tar.gz"],
         use_category = ["build"],
     ),
+    io_bazel_rules_rust = dict(
+        sha256 = "484a2b2b67cd2d1fa1054876de7f8d291c4b203fd256bc8cbea14d749bb864ce",
+        # Last commit where "out_binary = True" works.
+        # See: https://github.com/bazelbuild/rules_rust/issues/386
+        strip_prefix = "rules_rust-fda9a1ce6482973adfda022cadbfa6b300e269c3",
+        urls = ["https://github.com/bazelbuild/rules_rust/archive/fda9a1ce6482973adfda022cadbfa6b300e269c3.tar.gz"],
+        use_category = ["test"],
+    ),
     rules_antlr = dict(
         sha256 = "7249d1569293d9b239e23c65f6b4c81a07da921738bde0dfeb231ed98be40429",
         strip_prefix = "rules_antlr-3cc2f9502a54ceb7b79b37383316b23c4da66f9a",

bazel/wasm/wasm.bzl

@@ -1,6 +1,7 @@
+load("@io_bazel_rules_rust//rust:rust.bzl", "rust_binary")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 
-def _wasm_transition_impl(settings, attr):
+def _wasm_cc_transition_impl(settings, attr):
     return {
         "//command_line_option:cpu": "wasm32",
         "//command_line_option:crosstool_top": "@proxy_wasm_cpp_sdk//toolchain:emscripten",
@@ -13,8 +14,13 @@ def _wasm_transition_impl(settings, attr):
         "//command_line_option:collect_code_coverage": "false",
     }
 
-wasm_transition = transition(
-    implementation = _wasm_transition_impl,
+def _wasm_rust_transition_impl(settings, attr):
+    return {
+        "//command_line_option:platforms": "@io_bazel_rules_rust//rust/platform:wasm",
+    }
+
+wasm_cc_transition = transition(
+    implementation = _wasm_cc_transition_impl,
     inputs = [],
     outputs = [
         "//command_line_option:cpu",
@@ -26,25 +32,53 @@ wasm_transition = transition(
     ],
 )
 
+wasm_rust_transition = transition(
+    implementation = _wasm_rust_transition_impl,
+    inputs = [],
+    outputs = [
+        "//command_line_option:platforms",
+    ],
+)
+
 def _wasm_binary_impl(ctx):
     out = ctx.actions.declare_file(ctx.label.name)
-    ctx.actions.run_shell(
-        command = 'cp "{}" "{}"'.format(ctx.files.binary[0].path, out.path),
-        outputs = [out],
-        inputs = ctx.files.binary,
-    )
+    if ctx.attr.precompile:
+        ctx.actions.run(
+            executable = ctx.executable._compile_tool,
+            arguments = [ctx.files.binary[0].path, out.path],
+            outputs = [out],
+            inputs = ctx.files.binary,
+        )
+    else:
+        ctx.actions.run(
+            executable = "cp",
+            arguments = [ctx.files.binary[0].path, out.path],
+            outputs = [out],
+            inputs = ctx.files.binary,
+        )
 
-    return [DefaultInfo(runfiles = ctx.runfiles([out]))]
+    return [DefaultInfo(files = depset([out]), runfiles = ctx.runfiles([out]))]
+
+def _wasm_attrs(transition):
+    return {
+        "binary": attr.label(mandatory = True, cfg = transition),
+        "precompile": attr.bool(default = False),
+        # This is deliberately in target configuration to avoid compiling v8 twice.
+        "_compile_tool": attr.label(default = "@envoy//test/tools/wee8_compile:wee8_compile_tool", executable = True, cfg = "target"),
+        "_whitelist_function_transition": attr.label(default = "@bazel_tools//tools/whitelists/function_transition_whitelist"),
+    }
 
 # WASM binary rule implementation.
 # This copies the binary specified in binary attribute in WASM configuration to
 # target configuration, so a binary in non-WASM configuration can depend on them.
-wasm_binary = rule(
+wasm_cc_binary_rule = rule(
     implementation = _wasm_binary_impl,
-    attrs = {
-        "binary": attr.label(mandatory = True, cfg = wasm_transition),
-        "_whitelist_function_transition": attr.label(default = "@bazel_tools//tools/whitelists/function_transition_whitelist"),
-    },
+    attrs = _wasm_attrs(wasm_cc_transition),
+)
+
+wasm_rust_binary_rule = rule(
+    implementation = _wasm_binary_impl,
+    attrs = _wasm_attrs(wasm_rust_transition),
 )
 
 def wasm_cc_binary(name, **kwargs):
@@ -61,7 +95,29 @@ def wasm_cc_binary(name, **kwargs):
         **kwargs
     )
 
-    wasm_binary(
+    wasm_cc_binary_rule(
+        name = name,
+        binary = ":" + wasm_name,
+    )
+
+def wasm_rust_binary(name, **kwargs):
+    wasm_name = "_wasm_" + (name if not ".wasm" in name else name.strip(".wasm"))
+    kwargs.setdefault("visibility", ["//visibility:public"])
+
+    rust_binary(
+        name = wasm_name,
+        edition = "2018",
+        crate_type = "cdylib",
+        out_binary = True,
+        tags = ["manual"],
+        **kwargs
+    )
+
+    wasm_rust_binary_rule(
         name = name,
+        precompile = select({
+            "@envoy//bazel:linux_x86_64": True,
+            "//conditions:default": False,
+        }),
         binary = ":" + wasm_name,
     )

test/extensions/common/wasm/BUILD

@@ -12,10 +12,12 @@ envoy_cc_test(
     name = "wasm_vm_test",
     srcs = ["wasm_vm_test.cc"],
     data = [
-        "//test/extensions/common/wasm/test_data:modules",
+        "//test/extensions/common/wasm/test_data:test_rust.wasm",
+    ],
+    tags = [
+        # wasm (wee v8 etc) will not compile on Windows
+        "skip_on_windows",
     ],
-    # wasm (wee v8 etc) will not compile on Windows
-    tags = ["skip_on_windows"],
     deps = [
         "//source/extensions/common/wasm:wasm_lib",
         "//test/test_common:environment_lib",

test/extensions/common/wasm/test_data/BUILD

@@ -3,18 +3,16 @@ load(
     "envoy_cc_library",
     "envoy_package",
 )
-load("//bazel/wasm:wasm.bzl", "wasm_cc_binary")
+load("//bazel/wasm:wasm.bzl", "wasm_cc_binary", "wasm_rust_binary")
 
 licenses(["notice"])  # Apache 2
 
 envoy_package()
 
-filegroup(
-    name = "modules",
-    srcs = glob(["*.wasm"]),
-    data = [
-        ":test_cpp.wasm",
-    ],
+wasm_rust_binary(
+    name = "test_rust.wasm",
+    srcs = ["test_rust.rs"],
+    rustc_flags = ["-Clink-arg=-zstack-size=32768"],
 )
 
 envoy_cc_library(

test/extensions/common/wasm/test_data/test_rust.wasm

@@ -1,20 +1,20 @@
 load(
     "//bazel:envoy_build_system.bzl",
-    "envoy_cc_test_binary",
-    "envoy_cc_test_library",
+    "envoy_cc_binary",
+    "envoy_cc_library",
     "envoy_package",
 )
 
 licenses(["notice"])  # Apache 2
 
 envoy_package()
 
-envoy_cc_test_binary(
+envoy_cc_binary(
     name = "wee8_compile_tool",
     deps = [":wee8_compile_lib"],
 )
 
-envoy_cc_test_library(
+envoy_cc_library(
     name = "wee8_compile_lib",
     srcs = ["wee8_compile.cc"],
     external_deps = ["wee8"],