add wasmedg-aot engine

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.github/workflows/test.yml

@@ -214,6 +214,22 @@ jobs:
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm
+        - name: 'WasmEdge AOT on Linux/x86_64'
+          engine: 'wasmedge-aot'
+          repo: 'com_github_wasmedge_wasmedge'
+          os: ubuntu-24.04-16core
+          arch: x86_64
+          action: test
+          flags: --config=hermetic-llvm
+          cache: true
+        - name: 'WasmEdge AOT on macOS/x86_64'
+          engine: 'wasmedge-aot'
+          repo: 'com_github_wasmedge_wasmedge'
+          os: macos-15
+          arch: x86_64
+          action: test
+          flags: --config=hermetic-llvm
+          cache: true
         - name: 'Wasmtime on Linux/x86_64'
           engine: 'wasmtime'
           repo: 'com_github_bytecodealliance_wasmtime'
@@ -339,4 +355,3 @@ jobs:
         ${{ matrix.flags }}
         --per_file_copt=src/signature_util.cc,test/signature_util_test.cc@-DPROXY_WASM_VERIFY_WITH_ED25519_PUBKEY=\"$(xxd -p -c 256 test/test_data/signature_key1.pub | cut -c3- | tr -d '\n')\"
         //test:signature_util_test
-

bazel/BUILD

@@ -42,6 +42,11 @@ config_setting(
     values = {"define": "engine=wasmedge"},
 )
 
+config_setting(
+    name = "engine_wasmedge_aot",
+    values = {"define": "engine=wasmedge-aot"},
+)
+
 config_setting(
     name = "engine_wasmtime",
     values = {"define": "engine=wasmtime"},

bazel/external/wamr_llvm.BUILD bazel/external/llvm.BUILDbazel/external/wamr_llvm.BUILD renamed to bazel/external/llvm.BUILD

@@ -18,13 +18,13 @@ licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
-# LLVM libraries needed by WAMR JIT - built with native Bazel.
+# LLVM libraries for JIT/AOT compilation - built with native Bazel.
 # This replaces the foreign_cc cmake build of LLVM with native Bazel builds.
-# These libraries are linked into the final binary, while WAMR's CMake build
-# uses the hermetic LLVM toolchain's CMake configs for configuration only.
+# These libraries are linked into the final binary for WAMR JIT and WasmEdge AOT.
+# Shared by both WAMR and WasmEdge for consistency.
 # Uses select() for CPU-specific libraries only.
 cc_library(
-    name = "llvm_wamr_lib",
+    name = "llvm_lib",
     deps = [
         "@llvm-project//llvm:Analysis",
         "@llvm-project//llvm:BitReader",

bazel/external/wamr.BUILD

@@ -107,7 +107,7 @@ cc_library(
     }),
     deps = [":wamr_lib_cmake"] + select({
         "@proxy_wasm_cpp_host//bazel:engine_wamr_jit": [
-            "@llvm-raw//:llvm_wamr_lib",
+            "@llvm-raw//:llvm_lib",
         ],
         "//conditions:default": [],
     }),

bazel/external/wasmedge.BUILD

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
 
 licenses(["notice"])  # Apache 2
@@ -24,19 +25,46 @@ filegroup(
 )
 
 cmake(
-    name = "wasmedge_lib",
+    name = "wasmedge_lib_cmake",
     cache_entries = {
-        "WASMEDGE_USE_LLVM": "Off",
         "WASMEDGE_BUILD_SHARED_LIB": "Off",
         "WASMEDGE_BUILD_STATIC_LIB": "On",
         "WASMEDGE_BUILD_TOOLS": "Off",
         "WASMEDGE_FORCE_DISABLE_LTO": "On",
         # Provide spdlog and fmt as external dependencies via Bazel (not CMake FetchContent)
         "CMAKE_PREFIX_PATH": "$$EXT_BUILD_DEPS$$/spdlog;$$EXT_BUILD_DEPS$$/fmt",
-    },
-    env = {
-        "CXXFLAGS": "-Wno-error=dangling-reference -Wno-error=maybe-uninitialized -Wno-error=array-bounds= -Wno-error=deprecated-declarations -std=c++20",
-    },
+    } | select({
+        "@proxy_wasm_cpp_host//bazel:engine_wasmedge_aot": {
+            "WASMEDGE_USE_LLVM": "On",
+            "BAZEL_BUILD": "ON",
+            # Set LLVM_INCLUDE_DIR for the build to use
+            "LLVM_INCLUDE_DIR": "$$EXT_BUILD_ROOT/external/llvm_toolchain_llvm/include",
+        },
+        "//conditions:default": {
+            "WASMEDGE_USE_LLVM": "Off",
+        },
+    }),
+    # LLVM dependencies for AOT are provided via Bazel, not CMake
+    # LLVM headers from hermetic toolchain (bzlmod-compatible via data attribute)
+    # LLVM libraries are linked via cc_library deps (see wasmedge_lib below)
+    data = select({
+        "@proxy_wasm_cpp_host//bazel:engine_wasmedge_aot": [
+            "@llvm_toolchain_llvm//:all_includes",
+        ],
+        "//conditions:default": [],
+    }),
+    env = select({
+        "@proxy_wasm_cpp_host//bazel:engine_wasmedge_aot": {
+            # Reference LLVM headers in sandbox via EXT_BUILD_ROOT
+            # The data attribute ensures llvm_toolchain_llvm is mounted in sandbox
+            # This path works with both WORKSPACE and bzlmod
+            "CFLAGS": "-isystem $$EXT_BUILD_ROOT/external/llvm_toolchain_llvm/include",
+            "CXXFLAGS": "-isystem $$EXT_BUILD_ROOT/external/llvm_toolchain_llvm/include -Wno-error=dangling-reference -Wno-error=maybe-uninitialized -Wno-error=array-bounds= -Wno-error=deprecated-declarations -std=c++20",
+        },
+        "//conditions:default": {
+            "CXXFLAGS": "-Wno-error=dangling-reference -Wno-error=maybe-uninitialized -Wno-error=array-bounds= -Wno-error=deprecated-declarations -std=c++20",
+        },
+    }),
     generate_args = ["-GNinja"],
     lib_source = ":srcs",
     out_static_libs = ["libwasmedge.a"],
@@ -45,3 +73,18 @@ cmake(
         "@com_github_gabime_spdlog//:spdlog",
     ],
 )
+
+# Wrapper library that adds LLVM dependencies for linking
+cc_library(
+    name = "wasmedge_lib",
+    linkopts = select({
+        "@proxy_wasm_cpp_host//bazel:engine_wasmedge_aot": ["-ldl"],
+        "//conditions:default": [],
+    }),
+    deps = [":wasmedge_lib_cmake"] + select({
+        "@proxy_wasm_cpp_host//bazel:engine_wasmedge_aot": [
+            "@llvm-raw//:llvm_lib",
+        ],
+        "//conditions:default": [],
+    }),
+)

bazel/repositories.bzl

@@ -309,7 +309,7 @@ def proxy_wasm_cpp_host_repositories():
     maybe(
         http_archive,
         name = "llvm-raw",
-        build_file = "@proxy_wasm_cpp_host//bazel/external:wamr_llvm.BUILD",
+        build_file = "@proxy_wasm_cpp_host//bazel/external:llvm.BUILD",
         sha256 = "5042522b49945bc560ff9206f25fb87980a9b89b914193ca00d961511ff0673c",
         strip_prefix = "llvm-project-19.1.0.src",
         url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/llvm-project-19.1.0.src.tar.xz",