add comments, lower iterations, check profiles roughly match

Author: danleh

JetStreamDriver.js

@@ -1931,7 +1931,8 @@ const testPlans = [
             wasmBinary: "./wasm/richards/build/richards.wasm"
         },
         benchmarkClass: WasmEMCCBenchmark,
-        iterations: 30,
+        iterations: 20,
+        worstCaseCount: 2,
         testGroup: WasmGroup
     },
     {

wasm/richards/benchmark.js

@@ -2,21 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-function scheduleIter() {
-  return Module._scheduleIter();
-}
-
 class Benchmark {
   async runIteration() {
-    if (!Module._main)
+    // Instantiate the Wasm module before the first run.
+    if (!Module._setup)
       await setupModule(Module);
 
+    // Set-up the problem (fill the work queue) on each run.
     Module._setup();
+
+    // Repeatedly call into Wasm to stress test JS-to-Wasm call performance.
+    // I (dlehmann) suppose this wrapper was added (originally in JetStream 2)
+    // to test that a wrapping JavaScript function doesn't slow things down.
+    function scheduleIter() {
+      return Module._scheduleIter();
+    }
     while (scheduleIter()) {}
   }
 
   validate() {
-    if (Module._getQpktcount() !== 2326410 || Module._getHoldcount() !== 930563)
+    if (!Module._validate())
       throw new Error("Bad richards result!");
   }
 }

wasm/richards/build.log

@@ -1,4 +1,4 @@
-Built on 2025-01-16T15:10:49Z
+Built on 2025-01-20T14:41:13Z
 Toolchain versions
 emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.73 (ac676d5e437525d15df5fd46bc2c208ec6d376a3)
 Building...

wasm/richards/build.sh

@@ -15,7 +15,7 @@ emcc -o build/richards.js \
     -s WASM=1 -O2 -s TOTAL_MEMORY=83886080 \
     -g1 --emit-symbol-map \
     -s MODULARIZE=1 \
-    -s EXPORT_NAME=setupModule -s EXPORTED_FUNCTIONS=_setup,_getHoldcount,_scheduleIter,_getQpktcount \
+    -s EXPORT_NAME=setupModule -s EXPORTED_FUNCTIONS=_setup,_scheduleIter,_validate \
     richards.c | tee -a "$BUILD_LOG"
 
 echo "Building done" | tee -a "$BUILD_LOG"

wasm/richards/build/richards.js

@@ -539,9 +539,7 @@ var _scheduleIter = Module["_scheduleIter"] = () => (_scheduleIter = Module["_sc
 
 var _setup = Module["_setup"] = () => (_setup = Module["_setup"] = wasmExports["setup"])();
 
-var _getQpktcount = Module["_getQpktcount"] = () => (_getQpktcount = Module["_getQpktcount"] = wasmExports["getQpktcount"])();
-
-var _getHoldcount = Module["_getHoldcount"] = () => (_getHoldcount = Module["_getHoldcount"] = wasmExports["getHoldcount"])();
+var _validate = Module["_validate"] = () => (_validate = Module["_validate"] = wasmExports["validate"])();
 
 var __emscripten_stack_restore = a0 => (__emscripten_stack_restore = wasmExports["_emscripten_stack_restore"])(a0);
 

wasm/richards/build/richards.js.symbols

@@ -6,10 +6,9 @@
 5:handlerfn
 6:devfn
 7:setup
-8:getQpktcount
-9:getHoldcount
-10:emscripten_builtin_malloc
-11:sbrk
-12:_emscripten_stack_restore
-13:_emscripten_stack_alloc
-14:emscripten_stack_get_current
+8:validate
+9:emscripten_builtin_malloc
+10:sbrk
+11:_emscripten_stack_restore
+12:_emscripten_stack_alloc
+13:emscripten_stack_get_current

wasm/richards/build/richards.wasm

@@ -1,4 +1,4 @@
-// $ emcc -o richards.html -O2 -s TOTAL_MEMORY=83886080 -g1 -s "EXPORTED_FUNCTIONS=[_setup, _getHoldcount, _scheduleIter, _getQpktcount, _main]" ./richards.c
+// $ emcc -o richards.html -O2 -s TOTAL_MEMORY=83886080 -g1 -s "EXPORTED_FUNCTIONS=[_setup, _scheduleIter, _validate]" ./richards.c
 
 #include <emscripten.h>
 
@@ -370,20 +370,7 @@ void setup()
     layout = 0;
 }
 
-int getQpktcount()
+int validate()
 {
-    return  qpktcount;
+    return qpktcount == Qpktcountval && holdcount == Holdcountval;
 }
-
-int getHoldcount()
-{
-    return holdcount;
-}
-
-int main()
-{
-    EM_ASM( runRichards() );
-
-    return 0;
-}
-