Clean up our samples and structue them like upstream HL

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

.github/dependabot.yml

@@ -32,7 +32,7 @@ updates:
       - dependency-name: "wasmtime"
         update-types: ["version-update:semver-minor", "version-update:semver-major"]
   - package-ecosystem: "cargo"
-    directory: "/src/rust_wasm_samples"
+    directory: "/src/tests/rust_guests/rust_wasm_samples"
     schedule:
       interval: "daily"
       time: "03:00"
@@ -48,7 +48,7 @@ updates:
     labels:
       - "kind/dependencies"
   - package-ecosystem: "cargo"
-    directory: "/src/component_sample"
+    directory: "/src/tests/rust_guests/component_sample"
     schedule:
       interval: "daily"
       time: "03:00"

.github/workflows/dep_build_wasm_examples.yml

@@ -66,8 +66,8 @@ jobs:
         # Only push if not from a fork, not from pull request, and not from dependabot
           uses: docker/build-push-action@v6
           with:
-            context: src/wasmsamples
-            file: src/wasmsamples/dockerfile
+            context: src/tests/c_guests/wasmsamples
+            file: src/tests/c_guests/wasmsamples/dockerfile
             load: true
             push: ${{ env.DO_PUSH }}
             build-args: |
@@ -81,7 +81,6 @@ jobs:
             just ensure-tools
             just build-wasm-examples release
           shell: bash
-          working-directory:  src/wasmsamples
         - name: Upload Wasm Modules
           uses: actions/upload-artifact@v4
           with:

.github/workflows/dep_rust.yml

@@ -120,10 +120,6 @@ jobs:
           # required for gh cli when downloading
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Test Component Model Examples
-        run: just examples-components ${{ matrix.config }}
-        working-directory: ./src/hyperlight_wasm
-      
       ### Benchmarks ###
 
       - name: Download benchmarks from "latest"

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [ "src/hyperlight_wasm", "src/examples_common", "src/hyperlight_wasm_aot", "src/hyperlight_wasm_runtime", "src/hyperlight_wasm_macro" ]
-exclude = [ "src/rust_wasm_samples", "src/component_sample", "src/greeter_sample" ]
+exclude = [ "src/tests/rust_guests/rust_wasm_samples", "src/tests/rust_guests/component_sample", "src/tests/rust_guests/greeter_sample" ]
 resolver = "2"
 
 [workspace.package]
@@ -13,11 +13,5 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm"
 readme = "README.md"
 
 [workspace.dependencies]
-hyperlight-common = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false }
-hyperlight-component-macro = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
-hyperlight-component-util = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
-hyperlight-guest = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" }
-hyperlight-guest-bin = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", features = [ "printf" ] }
-hyperlight-host = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false, features = ["executable_heap"] }
-hyperlight-wasm-macro = { version = "0.13.0", path = "src/hyperlight_wasm_macro" }
-hyperlight-wasm-runtime = { version = "0.13.0", path = "src/hyperlight_wasm_runtime" }
+hyperlight-host = { version = "0.13.0", default-features = false, features = ["executable_heap", "init-paging"] }
+hyperlight-common = { version = "0.13.0", default-features = false }

Justfile

@@ -8,7 +8,7 @@ use crate::bindings::example::runcomponent::Guest;
 extern crate alloc;
 mod bindings {
     hyperlight_component_macro::host_bindgen!(
-        "../../src/wasmsamples/components/runcomponent-world.wasm"
+        "../../src/tests/c_guests/wasmsamples/components/runcomponent-world.wasm"
     );
 }
 

src/hyperlight_wasm/benches/benchmarks_components.rs

@@ -6,7 +6,7 @@ use crate::bindings::example::runcomponent::Guest;
 extern crate alloc;
 mod bindings {
     hyperlight_component_macro::host_bindgen!(
-        "../../src/wasmsamples/components/runcomponent-world.wasm"
+        "../../src/tests/c_guests/wasmsamples/components/runcomponent-world.wasm"
     );
 }
 

src/hyperlight_wasm/examples/c-component/main.rs

@@ -8,7 +8,7 @@ use examples_common::get_wasm_module_path;
 extern crate alloc;
 mod bindings {
     hyperlight_component_macro::host_bindgen!({
-        path: "../component_sample/wit/component-world.wasm",
+        path: "../tests/rust_guests/component_sample/wit/component-world.wasm",
     });
 }
 

src/hyperlight_wasm/examples/component_example/main.rs

@@ -12,7 +12,7 @@ mod bindings {
     // and we select "greeter-world" via world_name.
     // Both worlds import the same "host" interface, showing interface reuse.
     hyperlight_component_macro::host_bindgen!({
-        path: "../component_sample/wit/component-world.wasm",
+        path: "../tests/rust_guests/component_sample/wit/component-world.wasm",
         world_name: "greeter-world",
     });
 }

src/hyperlight_wasm/examples/component_greeter_example/main.rs

@@ -1,6 +1,6 @@
 @echo off
-pushd %~dp0\..\..\wasmsamples
-call :NORMALIZEPATH "..\..\x64\%1"
+pushd %~dp0\..\..\tests\c_guests\wasmsamples
+call :NORMALIZEPATH "..\..\..\..\x64\%1"
 echo "%ABSPATH%"
 call compile-wasm.bat "." "%ABSPATH%"
 popd