Merge pull request #31 from WebKit/revert-tfjs-to-js-scoring

Revert "Merge pull request #23 from WebKit/tfjs-to-js-scoring"

Author: kmiller68

JetStreamDriver.js

@@ -1970,44 +1970,42 @@ const testPlans = [
     {
         name: "tfjs-wasm",
         files: [
-            "./wasm/tfjs/tfjs-model-helpers.js",
-            "./wasm/tfjs/tfjs-model-mobilenet-v3.js",
-            "./wasm/tfjs/tfjs-model-mobilenet-v1.js",
-            "./wasm/tfjs/tfjs-model-coco-ssd.js",
-            "./wasm/tfjs/tfjs-model-use.js",
-            "./wasm/tfjs/tfjs-model-use-vocab.js",
-            "./wasm/tfjs/tfjs-bundle.js",
-            "./wasm/tfjs/tfjs.js",
-            "./wasm/tfjs/benchmark.js"
+            "./wasm/tfjs-model-helpers.js",
+            "./wasm/tfjs-model-mobilenet-v3.js",
+            "./wasm/tfjs-model-mobilenet-v1.js",
+            "./wasm/tfjs-model-coco-ssd.js",
+            "./wasm/tfjs-model-use.js",
+            "./wasm/tfjs-model-use-vocab.js",
+            "./wasm/tfjs-bundle.js",
+            "./wasm/tfjs.js",
+            "./wasm/tfjs-benchmark.js"
         ],
         preload: {
-            tfjsBackendWasmBlob: "./wasm/tfjs/tfjs-backend-wasm.wasm",
+            tfjsBackendWasmBlob: "./wasm/tfjs-backend-wasm.wasm",
         },
-        benchmarkClass: WasmEMCCBenchmark,
-        iterations: 15,
-        worstCaseCount: 2,
+        benchmarkClass: WasmLegacyBenchmark,
+        async: true,
         deterministicRandom: true,
         testGroup: WasmGroup
     },
     {
         name: "tfjs-wasm-simd",
         files: [
-            "./wasm/tfjs/tfjs-model-helpers.js",
-            "./wasm/tfjs/tfjs-model-mobilenet-v3.js",
-            "./wasm/tfjs/tfjs-model-mobilenet-v1.js",
-            "./wasm/tfjs/tfjs-model-coco-ssd.js",
-            "./wasm/tfjs/tfjs-model-use.js",
-            "./wasm/tfjs/tfjs-model-use-vocab.js",
-            "./wasm/tfjs/tfjs-bundle.js",
-            "./wasm/tfjs/tfjs.js",
-            "./wasm/tfjs/benchmark.js"
+            "./wasm/tfjs-model-helpers.js",
+            "./wasm/tfjs-model-mobilenet-v3.js",
+            "./wasm/tfjs-model-mobilenet-v1.js",
+            "./wasm/tfjs-model-coco-ssd.js",
+            "./wasm/tfjs-model-use.js",
+            "./wasm/tfjs-model-use-vocab.js",
+            "./wasm/tfjs-bundle.js",
+            "./wasm/tfjs.js",
+            "./wasm/tfjs-benchmark.js"
         ],
         preload: {
-            tfjsBackendWasmSimdBlob: "./wasm/tfjs/tfjs-backend-wasm-simd.wasm",
+            tfjsBackendWasmSimdBlob: "./wasm/tfjs-backend-wasm-simd.wasm",
         },
-        benchmarkClass: WasmEMCCBenchmark,
-        iterations: 40,
-        worstCaseCount: 3,
+        benchmarkClass: WasmLegacyBenchmark,
+        async: true,
         deterministicRandom: true,
         testGroup: WasmGroup
     },