feat: Add support for vcpu ms hostcall (#950)

Author: Guy Bedford

.github/actions/cache-crates/action.yml

@@ -15,16 +15,6 @@ updates:
           - "*"
     open-pull-requests-limit: 1
 
-  - package-ecosystem: "cargo"
-    directory: "/runtime/js-compute-runtime/rust-url"
-    schedule:
-      interval: "daily"
-    groups:
-      cargo:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 1
-
 
   - package-ecosystem: "npm"
     directory: "/integration-tests/js-compute"
@@ -34,38 +24,4 @@ updates:
       npm:
         patterns:
           - "*"
-    open-pull-requests-limit: 1
-
-
-  - package-ecosystem: "npm"
-    directory: ".github/actions/compute-sdk-test"
-    schedule:
-      interval: "daily"
-    groups:
-      npm:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 1
-
-
-  - package-ecosystem: "npm"
-    directory: ".github/actions/github-release"
-    schedule:
-      interval: "daily"
-    groups:
-      npm:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 1
-
-
-  - package-ecosystem: "npm"
-    directory: "/sdk/js-compute"
-    schedule:
-      interval: "daily"
-    groups:
-      npm:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 1
-
+    open-pull-requests-limit: 1

.github/actions/compute-sdk-test/action.yml

@@ -7,9 +7,11 @@ defaults:
   run:
     shell: bash
 env:
-  viceroy_version: 0.10.0
-  wasm-tools_version: 1.0.28
-  fastly-cli_version: 10.8.10
+  # Note: when updated, also update version in ensure_cargo_installs
+  viceroy_version: 0.12.0
+  # Note: when updated, also update version in ensure_cargo_installs
+  wasm-tools_version: 1.216.0
+  fastly-cli_version: 10.13.3
 
 jobs:
   check-changelog:
@@ -40,10 +42,10 @@ jobs:
       matrix:
         include:
           - crate: viceroy
-            version: 0.10.0 # Note: workflow-level env vars can't be used in matrix definitions
+            version: 0.12.0 # Note: workflow-level env vars can't be used in matrix definitions
             options: ""
           - crate: wasm-tools
-            version: 1.0.28 # Note: workflow-level env vars can't be used in matrix definitions
+            version: 1.216.0 # Note: workflow-level env vars can't be used in matrix definitions
             options: ""
     runs-on: ubuntu-latest
     steps:
@@ -54,8 +56,7 @@ jobs:
         path: "/home/runner/.cargo/bin/${{ matrix.crate }}"
         key: crate-cache-${{ matrix.crate }}-${{ matrix.version }}
     - name: Install ${{ matrix.crate }} ${{ matrix.version }}
-      run: cargo install ${{ matrix.crate }} ${{ matrix.options }} --version ${{ matrix.version }}
-      if: steps.cache-crate.outputs.cache-hit != 'true'
+      run: cargo install ${{ matrix.crate }} ${{ matrix.options }} --version ${{ matrix.version }} --force
 
   shellcheck:
     env:
@@ -134,6 +135,7 @@ jobs:
 
   build:
     name: Build
+    needs: [ensure_cargo_installs]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -212,13 +214,6 @@ jobs:
         path: "/home/runner/.cargo/bin/wasm-tools"
         key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
 
-    - name: "Check wasm-tools has been restored"
-      if: steps.wasm-tools.outputs.cache-hit != 'true'
-      run: |
-        echo "wasm-tools was not restored from the cache"
-        echo "bailing out from the build early"
-        exit 1
-    
     - run: npm install
 
     - name: Build WPT runtime
@@ -243,7 +238,7 @@ jobs:
       matrix:
         platform: [viceroy, compute]
         profile: [debug, release, weval]
-    needs: [build]
+    needs: [build, ensure_cargo_installs]
     steps:
     - name: Checkout fastly/js-compute-runtime
       uses: actions/checkout@v3
@@ -275,10 +270,6 @@ jobs:
         path: "/home/runner/.cargo/bin/wasm-tools"
         key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
 
-    - name: "Check caches have been restored"
-      if: steps.wasm-tools.outputs.cache-hit != 'true' || matrix.platform == 'viceory' && steps.viceroy.outputs.cache-hit != 'true'
-      run: echo "Unable to restore from the cache, bailing." && exit 1
-
     - name: Download Engine
       uses: actions/download-artifact@v3
       with:

.github/actions/install-rust/README.md

@@ -3,12 +3,11 @@
         {
             "name": "sm-wasi",
             "includePath": [
-                "${workspaceFolder}/runtime/spidermonkey/debug/include",
-                "${workspaceFolder}/runtime/spidermonkey/release/include",
+                "${workspaceFolder}/runtime/StarlingMonkey/include",
+                "${workspaceFolder}/runtime/StarlingMonkey/builtins/web",
+                "${workspaceFolder}/runtime/fastly/build-debug/",
                 "/opt/wasi-sdk/share/wasi-sysroot/include/",
-                "${workspaceFolder}/runtime/js-compute-runtime",
-                "${workspaceFolder}/runtime/js-compute-runtime/build/openssl-3.0.7/include",
-                "${workspaceFolder}/runtime/js-compute-runtime/third_party/fmt/include"
+                "${workspaceFolder}/runtime/fastly/host-api"
             ],
             "defines": [
                 "__wasi__"
@@ -23,7 +22,7 @@
             "forcedInclude": [
                 "${workspaceFolder}/.vscode/vscode-preinclude.h"
             ],
-            "compileCommands": "${workspaceFolder}/runtime/js-compute-runtime/compile_commands.json"
+            "compileCommands": "${workspaceFolder}/runtime/fastly/build-debug/compile_commands.json"
         }
     ],
     "version": 4

.github/actions/install-rust/action.yml

@@ -54,6 +54,16 @@ export function assert(actual, expected, code) {
   }
 }
 
+export { assert as strictEqual }
+
+export function ok(truthy, code) {
+  if (!truthy) {
+    fail(
+      `Expected ${code ? ' ' + code : ''}to be truthy - Found \`${JSON.stringify(prettyPrintSymbol(truthy))}\``,
+    );
+  }
+}
+
 export async function assertResolves(func) {
   try {
     await func();
@@ -124,6 +134,8 @@ export function assertDoesNotThrow(func) {
   }
 }
 
+export { deepEqual as deepStrictEqual }
+
 export function deepEqual(a, b) {
   var aKeys;
   var bKeys;

.github/dependabot.yml

@@ -44,6 +44,7 @@ import "./request-method.js";
 import "./response-json.js";
 import "./response-redirect.js";
 import "./response.js";
+import "./runtime.js";
 import "./secret-store.js";
 import "./server.js";
 import "./tee.js";

.github/workflows/main.yml

@@ -0,0 +1,23 @@
+import {
+  pass,
+  ok,
+  strictEqual
+} from "./assertions-throwing.js";
+import { routes } from "./routes.js";
+import { vCpuTime } from "fastly:runtime";
+
+routes.set("/runtime/get-vcpu-ms", () => {
+  const cpuTime = vCpuTime();
+  strictEqual(typeof cpuTime, 'number');
+  ok(cpuTime > 0);
+  ok(cpuTime < 3000);
+  const arr = [];
+  for (let i = 0; i < 10_000; i++) {
+    arr.push(i);
+  }
+  const cpuTime2 = vCpuTime();
+  ok(cpuTime2 > cpuTime);
+  ok(cpuTime2 - cpuTime > 1);
+  ok(cpuTime2 - cpuTime < 3000);
+  return pass('ok');
+});