Rename eval-expression to evalexpression in calcualtor component to work around bug in hyperlight-wasm and also use release profiles for wasm components so we do not need to plug wasi interfaces with wasi-virt stubs

Signed-off-by: Mark Rossett <[email protected]>

Author: marosset

Justfile

@@ -1,28 +1,21 @@
 build-adder:
-  cd components/adder && cargo component build
+  cd components/adder && cargo component build --release
 
 init-subtractor:
-  cd components/subtractor && npm install
+  cd components/subtractor && npm install 
 
 build-subtractor:
-  cd components/subtractor && npm run build:component
+  cd components/subtractor && npm run build:component 
 
 build-calculator:
-  cd components/calculator && cargo component build
+  cd components/calculator && cargo component build --release
 
 build-component: build-adder build-subtractor build-calculator
-  # Virtualize the calculator component
-  wasm-tools print ./components/calculator/target/wasm32-wasip1/debug/calculator.wasm -o calculator.wat
-  sed -i 's/@0.2.3/@0.2.1/g' calculator.wat
-  wasm-tools parse calculator.wat -o calculator.hack.wasm
-  wasi-virt --out calculator.virtualized.wasm calculator.hack.wasm
-  # Virtualize the adder component
-  wasm-tools print ./components/adder/target/wasm32-wasip1/debug/adder.wasm -o adder.wat
-  sed -i 's/@0.2.3/@0.2.1/g' adder.wat
-  wasm-tools parse adder.wat -o adder.hack.wasm
-  wasi-virt --out adder.virtualized.wasm adder.hack.wasm
-  # compose the components
-  wac plug calculator.virtualized.wasm  \
-    --plug ./adder.virtualized.wasm \
+  # compose the wasm components
+  wac plug ./components/calculator/target/wasm32-wasip1/release/calculator.wasm  \
+    --plug ./components/adder/target/wasm32-wasip1/release/adder.wasm \
     --plug ./components/subtractor/subtractor.wasm \
     --output calculator-composed.wasm
+  # ahead-of-time compile the composed component
+  hyperlight-wasm-aot compile --component calculator-composed.wasm ./example/calculator-composed.bin
+

components/calculator/src/bindings.rs

@@ -102,30 +102,30 @@ pub mod exports {
                 }
                 #[doc(hidden)]
                 #[allow(non_snake_case)]
-                pub unsafe fn _export_eval_expression_cabi<T: Guest>(
+                pub unsafe fn _export_evalexpression_cabi<T: Guest>(
                     arg0: i32,
                     arg1: i32,
                     arg2: i32,
                 ) -> i32 {
                     #[cfg(target_arch = "wasm32")] _rt::run_ctors_once();
-                    let result0 = T::eval_expression(
+                    let result0 = T::evalexpression(
                         Op::_lift(arg0 as u8),
                         arg1 as u32,
                         arg2 as u32,
                     );
                     _rt::as_i32(result0)
                 }
                 pub trait Guest {
-                    fn eval_expression(op: Op, x: u32, y: u32) -> u32;
+                    fn evalexpression(op: Op, x: u32, y: u32) -> u32;
                 }
                 #[doc(hidden)]
                 macro_rules! __export_hyperlight_wasm_examples_calculator_calculate_cabi {
                     ($ty:ident with_types_in $($path_to_types:tt)*) => {
                         const _ : () = { #[unsafe (export_name =
-                        "hyperlight-wasm-examples:calculator/calculate#eval-expression")]
-                        unsafe extern "C" fn export_eval_expression(arg0 : i32, arg1 :
+                        "hyperlight-wasm-examples:calculator/calculate#evalexpression")]
+                        unsafe extern "C" fn export_evalexpression(arg0 : i32, arg1 :
                         i32, arg2 : i32,) -> i32 { unsafe { $($path_to_types)*::
-                        _export_eval_expression_cabi::<$ty > (arg0, arg1, arg2) } } };
+                        _export_evalexpression_cabi::<$ty > (arg0, arg1, arg2) } } };
                     };
                 }
                 #[doc(hidden)]
@@ -238,13 +238,13 @@ pub(crate) use __export_calculator_impl as export;
 )]
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 440] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb7\x02\x01A\x02\x01\
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 439] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb6\x02\x01A\x02\x01\
 A\x06\x01B\x02\x01@\x02\x01xy\x01yy\0y\x04\0\x03add\x01\0\x03\0'hyperlight-wasm-\
 examples:calculator/add\x05\0\x01B\x02\x01@\x02\x01xy\x01yy\0y\x04\0\x08subtract\
 \x01\0\x03\0,hyperlight-wasm-examples:calculator/subtract\x05\x01\x01B\x04\x01m\x02\
-\x03add\x08subtract\x04\0\x02op\x03\0\0\x01@\x03\x02op\x01\x01xy\x01yy\0y\x04\0\x0f\
-eval-expression\x01\x02\x04\0-hyperlight-wasm-examples:calculator/calculate\x05\x02\
+\x03add\x08subtract\x04\0\x02op\x03\0\0\x01@\x03\x02op\x01\x01xy\x01yy\0y\x04\0\x0e\
+evalexpression\x01\x02\x04\0-hyperlight-wasm-examples:calculator/calculate\x05\x02\
 \x04\0.hyperlight-wasm-examples:calculator/calculator\x04\0\x0b\x10\x01\0\x0acal\
 culator\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.22\
 7.1\x10wit-bindgen-rust\x060.41.0";

components/calculator/src/lib.rs

@@ -8,7 +8,7 @@ use bindings::hyperlight_wasm_examples::calculator::subtract::subtract;
 struct Component;
 
 impl Guest for Component {
-    fn eval_expression(op: Op, x: u32, y: u32) -> u32 {
+    fn evalexpression(op: Op, x: u32, y: u32) -> u32 {
         match op {
             Op::Add => add(x,y),
             Op::Subtract => subtract(x, y),

components/subtractor/package.json

@@ -4,6 +4,6 @@
         "@bytecodealliance/jco": "^1.10.2"
     },
     "scripts": {
-        "build:component": "jco componentize --wit ../../wit --world-name subtractor subtractor.js -d all -o subtractor.wasm"
+        "build:component": "jco componentize --wit ../../wit/calculator.wit --world-name subtractor subtractor.js -d all -o subtractor.wasm"
     }
-}
+}

wit/calculator.wit

@@ -21,7 +21,7 @@ interface calculate {
         add,
         subtract,
     }
-    eval-expression: func(op: op, x:u32, y:u32) -> u32;
+    evalexpression: func(op: op, x:u32, y:u32) -> u32;
 }
 
 world calculator {