Skip to content

Commit ee7b3c6

Browse files
avrabeavrabe
committed
refactor(file-ops): use local AOT compilation for guaranteed compatibility
BREAKING CHANGE in architecture (but not in functionality): Previously: Downloaded pre-compiled AOT artifacts (extracted from 22.8MB file) Now: Compile AOT locally at build time using wasm_precompile Why This Change? ================ **Problem:** Pre-compiled AOT artifacts are compiled for a specific Wasmtime version. If the user's Wasmtime version doesn't match, AOT loading fails. **Solution:** Compile AOT locally at build time using the user's Wasmtime version. This guarantees perfect compatibility while maintaining 100x performance improvement. Changes: ======== 1. MODULE.bazel - Switch from AOT variant (22.8MB) to regular WASM (853KB) - AOT compilation happens locally, not downloaded - Comment explains the approach 2. tools/file_ops_external/BUILD.bazel - Remove all wasm_extract_aot rules (no longer needed) - Add single wasm_precompile rule for local compilation - Much simpler: 20 lines vs 80+ lines 3. tools/file_ops_external/main.go - Remove platform detection (no longer needed) - Remove AOT extraction logic (no longer needed) - Simpler: just load locally-compiled .cwasm - Remove getPlatformName() function - Clean up unused imports - 100 lines vs 170+ lines Benefits: ========= ✅ **Guaranteed Compatibility** - Always matches user's Wasmtime version ✅ **Simpler Architecture** - No extraction, no platform detection ✅ **Same Performance** - Still 100x faster startup with native code ✅ **Smaller Download** - 853KB vs 22.8MB external file ✅ **Better CI** - No dependency on external AOT artifacts being compatible ✅ **Future-Proof** - Works with any Wasmtime version update Technical Details: ================== Compilation: wasm_precompile rule uses @rules_wasm_component//wasm:wasm_precompile.bzl Output: Single .cwasm file (~3.3MB) for current platform Execution: wasmtime run --allow-precompiled file_ops_aot.cwasm Fallback: Regular WASM if AOT not available Testing: ======== ✅ Local AOT compilation successful (3.3MB .cwasm) ✅ Execution with local AOT working ✅ All integration tests passing (3/3) ✅ Deprecation warning still showing for embedded This resolves the compatibility concern raised about pre-compiled AOT artifacts.
1 parent f7c28dd commit ee7b3c6

File tree

3 files changed

+56
-131
lines changed

3 files changed

+56
-131
lines changed

‎MODULE.bazel‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,23 +178,22 @@ register_toolchains("@jco_toolchain//:jco_toolchain")
178178
register_toolchains("//toolchains:file_ops_toolchain_local")
179179

180180
# External File Operations Component from bazel-file-ops-component
181-
# Phase 2: AOT variant is now default for 100x faster startup
181+
# Phase 2: External component with LOCAL AOT compilation
182182
#
183-
# Version information tracked in: //checksums/tools/file-ops-component.json
184-
# Current: v0.1.0-rc.3 AOT (22.8MB with native code for multiple platforms)
183+
# We download the regular WASM component and compile AOT locally using our
184+
# wasm_precompile rules. This guarantees compatibility with the user's
185+
# Wasmtime version while maintaining 100x faster startup.
185186
#
186-
# AOT artifacts are extracted at build time for the current platform:
187-
# - linux-x64, linux-arm64
188-
# - darwin-x64, darwin-arm64
189-
# - windows-x64
190-
# - portable (Pulley64 fallback)
187+
# Version information tracked in: //checksums/tools/file-ops-component.json
188+
# Current: v0.1.0-rc.3 (regular WASM, 853KB)
189+
# AOT compilation happens at build time for perfect compatibility
191190
http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
192191

193192
http_file(
194193
name = "file_ops_component_external",
195-
url = "https://github.com/pulseengine/bazel-file-ops-component/releases/download/v0.1.0-rc.3/file_ops_component_aot.wasm",
196-
sha256 = "4fc117fae701ffd74b03dd72bbbeaf4ccdd1677ad15effa5c306a809de256938",
197-
downloaded_file_path = "file_ops_component_aot.wasm",
194+
url = "https://github.com/pulseengine/bazel-file-ops-component/releases/download/v0.1.0-rc.3/file_ops_component.wasm",
195+
sha256 = "8a9b1aa8a2c9d3dc36f1724ccbf24a48c473808d9017b059c84afddc55743f1e",
196+
downloaded_file_path = "file_ops_component.wasm",
198197
)
199198

200199
# WASM Tools Component toolchain for universal wasm-tools operations

‎tools/file_ops_external/BUILD.bazel‎

Lines changed: 15 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
11
"""Wrapper for external file operations WASM component
22
33
This wrapper executes the pre-built WASM component from bazel-file-ops-component
4-
via wasmtime, with AOT extraction for faster startup (100x improvement).
4+
via wasmtime, with LOCAL AOT compilation for guaranteed compatibility and
5+
100x faster startup.
56
"""
67

78
load("@rules_go//go:def.bzl", "go_binary")
8-
load("//wasm:wasm_embed_aot.bzl", "wasm_extract_aot")
9+
load("//wasm:wasm_precompile.bzl", "wasm_precompile")
910

1011
package(default_visibility = ["//visibility:public"])
1112

12-
# Wrapper binary that executes external WASM component with AOT extraction
13+
# Compile external WASM component to native code (AOT) at build time
14+
# This guarantees compatibility with the user's Wasmtime version
15+
wasm_precompile(
16+
name = "file_ops_aot",
17+
wasm_file = "@file_ops_component_external//file",
18+
optimization_level = "2", # Maximum optimization
19+
debug_info = False, # Production build - no debug info
20+
)
21+
22+
# Wrapper binary that executes external WASM component with local AOT
1323
go_binary(
1424
name = "file_ops_external",
1525
srcs = ["main.go"],
1626
pure = "on",
1727
data = [
18-
":file_ops_aot", # Platform-specific AOT artifact (extracted at build time)
19-
"@file_ops_component_external//file", # Fallback to regular WASM if needed
28+
":file_ops_aot", # Locally compiled AOT - guaranteed compatible!
29+
"@file_ops_component_external//file", # Fallback to regular WASM if AOT fails
2030
"@wasmtime_toolchain//:wasmtime",
2131
],
2232
deps = ["@rules_go//go/runfiles"],
@@ -29,57 +39,3 @@ alias(
2939
actual = ":file_ops_external",
3040
visibility = ["//visibility:public"],
3141
)
32-
33-
# AOT extraction targets for each platform
34-
# These extract the precompiled native code from the AOT-embedded component
35-
36-
wasm_extract_aot(
37-
name = "file_ops_aot_linux_x64",
38-
component = "@file_ops_component_external//file",
39-
target_name = "linux-x64",
40-
)
41-
42-
wasm_extract_aot(
43-
name = "file_ops_aot_linux_arm64",
44-
component = "@file_ops_component_external//file",
45-
target_name = "linux-arm64",
46-
)
47-
48-
wasm_extract_aot(
49-
name = "file_ops_aot_darwin_x64",
50-
component = "@file_ops_component_external//file",
51-
target_name = "darwin-x64",
52-
)
53-
54-
wasm_extract_aot(
55-
name = "file_ops_aot_darwin_arm64",
56-
component = "@file_ops_component_external//file",
57-
target_name = "darwin-arm64",
58-
)
59-
60-
wasm_extract_aot(
61-
name = "file_ops_aot_windows_x64",
62-
component = "@file_ops_component_external//file",
63-
target_name = "windows-x64",
64-
)
65-
66-
wasm_extract_aot(
67-
name = "file_ops_aot_portable",
68-
component = "@file_ops_component_external//file",
69-
target_name = "portable",
70-
)
71-
72-
# Filegroup containing all AOT artifacts
73-
# The Go wrapper will select the correct one at runtime based on the platform
74-
filegroup(
75-
name = "file_ops_aot",
76-
srcs = [
77-
":file_ops_aot_linux_x64",
78-
":file_ops_aot_linux_arm64",
79-
":file_ops_aot_darwin_x64",
80-
":file_ops_aot_darwin_arm64",
81-
":file_ops_aot_windows_x64",
82-
":file_ops_aot_portable",
83-
],
84-
visibility = ["//visibility:public"],
85-
)

‎tools/file_ops_external/main.go‎

Lines changed: 31 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,70 @@ import (
44
"log"
55
"os"
66
"os/exec"
7-
"path/filepath"
8-
"runtime"
97

108
"github.com/bazelbuild/rules_go/go/runfiles"
119
)
1210

13-
// Wrapper for external file operations WASM component with AOT support
14-
// This wrapper executes the pre-built WASM component via wasmtime,
15-
// using extracted AOT artifacts for 100x faster startup
11+
// Wrapper for external file operations WASM component with LOCAL AOT
12+
// This wrapper executes the WASM component via wasmtime, using locally-compiled
13+
// AOT for 100x faster startup with guaranteed Wasmtime version compatibility
1614
func main() {
1715
// Initialize Bazel runfiles
1816
r, err := runfiles.New()
1917
if err != nil {
2018
log.Fatalf("Failed to initialize runfiles: %v", err)
2119
}
2220

23-
// Locate wasmtime binary using Bazel runfiles
21+
// Locate wasmtime binary
2422
wasmtimeBinary, err := r.Rlocation("+wasmtime+wasmtime_toolchain/wasmtime")
2523
if err != nil {
2624
log.Fatalf("Failed to locate wasmtime: %v", err)
2725
}
2826

29-
// Verify wasmtime exists
3027
if _, err := os.Stat(wasmtimeBinary); err != nil {
3128
log.Fatalf("Wasmtime binary not found at %s: %v", wasmtimeBinary, err)
3229
}
3330

34-
// Determine platform for AOT artifact selection
35-
osName := runtime.GOOS
36-
arch := runtime.GOARCH
37-
38-
// Map Go platform names to AOT artifact names
39-
platformName := getPlatformName(osName, arch)
40-
41-
// Try to locate the AOT artifact for this platform
42-
aotPath, err := r.Rlocation(filepath.Join("_main/tools/file_ops_external", "file_ops_aot_" + platformName + ".cwasm"))
43-
useAOT := false
44-
45-
if err == nil {
46-
if _, err := os.Stat(aotPath); err == nil {
47-
useAOT = true
48-
if os.Getenv("FILE_OPS_DEBUG") != "" {
49-
log.Printf("DEBUG: Using AOT artifact for platform %s at %s", platformName, aotPath)
50-
}
51-
} else if os.Getenv("FILE_OPS_DEBUG") != "" {
52-
log.Printf("DEBUG: AOT artifact not found at %s: %v", aotPath, err)
31+
// Try to locate locally-compiled AOT artifact
32+
// This is compiled at build time with the user's Wasmtime version - guaranteed compatible!
33+
aotPath, err := r.Rlocation("_main/tools/file_ops_external/file_ops_aot.cwasm")
34+
useAOT := err == nil
35+
36+
if useAOT {
37+
if _, err := os.Stat(aotPath); err != nil {
38+
useAOT = false
5339
}
54-
} else if os.Getenv("FILE_OPS_DEBUG") != "" {
55-
log.Printf("DEBUG: Failed to locate AOT artifact: %v", err)
40+
}
41+
42+
// Locate regular WASM component for fallback
43+
wasmComponent, err := r.Rlocation("+_repo_rules+file_ops_component_external/file/file_ops_component.wasm")
44+
if err != nil {
45+
log.Fatalf("Failed to locate WASM component: %v", err)
46+
}
47+
48+
if _, err := os.Stat(wasmComponent); err != nil {
49+
log.Fatalf("WASM component not found at %s: %v", wasmComponent, err)
5650
}
5751

5852
// Build wasmtime command
5953
var args []string
6054

6155
if useAOT {
62-
// Use AOT precompiled artifact for faster startup
56+
// Use locally-compiled AOT - guaranteed compatible with current Wasmtime version
57+
if os.Getenv("FILE_OPS_DEBUG") != "" {
58+
log.Printf("DEBUG: Using locally-compiled AOT at %s", aotPath)
59+
}
60+
6361
args = []string{
6462
"run",
6563
"--dir=/::/", // Preopen root directory for full filesystem access
6664
"--allow-precompiled",
6765
aotPath,
6866
}
6967
} else {
70-
// Fall back to regular WASM component
71-
wasmComponent, err := r.Rlocation("+_repo_rules+file_ops_component_external/file/file_ops_component_aot.wasm")
72-
if err != nil {
73-
log.Fatalf("Failed to locate WASM component: %v", err)
74-
}
75-
76-
if _, err := os.Stat(wasmComponent); err != nil {
77-
log.Fatalf("WASM component not found at %s: %v", wasmComponent, err)
68+
// Fallback to regular WASM (still much faster than embedded Go binary)
69+
if os.Getenv("FILE_OPS_DEBUG") != "" {
70+
log.Printf("DEBUG: AOT not available, using regular WASM")
7871
}
7972

8073
args = []string{
@@ -84,7 +77,7 @@ func main() {
8477
}
8578
}
8679

87-
// Append all original arguments
80+
// Append original arguments
8881
args = append(args, os.Args[1:]...)
8982

9083
// Execute wasmtime
@@ -100,26 +93,3 @@ func main() {
10093
log.Fatalf("Failed to execute wasmtime: %v", err)
10194
}
10295
}
103-
104-
// getPlatformName maps Go OS/arch to AOT platform names
105-
func getPlatformName(osName, arch string) string {
106-
switch osName {
107-
case "linux":
108-
if arch == "amd64" {
109-
return "linux_x64"
110-
} else if arch == "arm64" {
111-
return "linux_arm64"
112-
}
113-
case "darwin":
114-
if arch == "amd64" {
115-
return "darwin_x64"
116-
} else if arch == "arm64" {
117-
return "darwin_arm64"
118-
}
119-
case "windows":
120-
if arch == "amd64" {
121-
return "windows_x64"
122-
}
123-
}
124-
return "portable"
125-
}

0 commit comments

Comments
 (0)