Address review comments

Author: eqrion

JetStreamDriver.js

@@ -31,7 +31,7 @@ const defaultIterationCount = 120;
 const defaultWorstCaseCount = 4;
 
 if (!JetStreamParams.prefetchResources)
-    console.warn("Disabling resource prefetching! All compressed files must have been decompressed using `node utils/compress.mjs -d`");
+    console.warn("Disabling resource prefetching! All compressed files must have been decompressed using `node utils/compress.mjs -d -k`");
 
 if (!isInBrowser && JetStreamParams.prefetchResources) {
     // Use the wasm compiled zlib as a polyfill when decompression stream is
@@ -158,9 +158,8 @@ function isCompressed(name) {
 }
 
 function uncompressedName(name) {
-    if (name.endsWith(".z"))
-        return name.slice(0, -2);
-    return name;
+    console.assert(isCompressed(name));
+    return name.slice(0, -2);
 }
 
 // TODO: Cleanup / remove / merge. This is only used for caching loads in the
@@ -624,7 +623,7 @@ class Scripts {
 class ShellScripts extends Scripts {
     constructor() {
         super();
-        this.prefetchedResources = [];
+        this.prefetchedResources = Object.create(null);;
     }
 
     run() {
@@ -661,12 +660,9 @@ class ShellScripts extends Scripts {
             globalObject.ShellTextDecoder = TextDecoder;
             // Store shellPrefetchedResources on ShellPrefetchedResources so that
             // getBinary and getString can find them.
-            globalObject.ShellPrefetchedResources = {};
-            for (const [name, value] of this.prefetchedResources) {
-                globalObject.ShellPrefetchedResources[name] = value;
-            }
+            globalObject.ShellPrefetchedResources = this.prefetchedResources;
         } else {
-            console.assert(this.prefetchedResources.length === 0, "Unexpected prefetched resources");
+            console.assert(Object.values(this.prefetchedResources).length === 0, "Unexpected prefetched resources");
         }
 
         globalObject.performance ??= performance;
@@ -677,7 +673,9 @@ class ShellScripts extends Scripts {
     }
 
     addPrefetchedResources(prefetchedResources) {
-        this.prefetchedResources.push(...prefetchedResources);
+        for (let [file, bytes] of Object.entries(prefetchedResources)) {
+            this.prefetchedResources[file] = bytes;
+        }
     }
 
     add(text) {
@@ -1090,11 +1088,9 @@ class Benchmark {
 
         console.assert(this.preloads === null, "This initialization should be called only once.");
         this.preloads = [];
-        this.shellPrefetchedResources = [];
+        this.shellPrefetchedResources = Object.create(null);
         if (this.plan.preload) {
-            for (let name of Object.getOwnPropertyNames(this.plan.preload)) {
-                let file = this.plan.preload[name];
-
+            for (let [name, file] of Object.entries(this.plan.preload)) {
                 const compressed = isCompressed(file);
                 if (compressed && !JetStreamParams.prefetchResources) {
                     file = uncompressedName(file);
@@ -1105,7 +1101,7 @@ class Benchmark {
                     if (compressed) {
                         bytes = zlib.decompress(bytes);
                     }
-                    this.shellPrefetchedResources.push([file, bytes]);
+                    this.shellPrefetchedResources[file] = bytes;
                 }
 
                 this.preloads.push([name, file]);
@@ -1354,14 +1350,14 @@ class AsyncBenchmark extends DefaultBenchmark {
         } else {
             str += `
                 JetStream.getBinary = async function(path) {
-                    if (ShellPrefetchedResources) {
+                    if ("ShellPrefetchedResources" in globalThis) {
                         return ShellPrefetchedResources[path];
                     }
                     return new Int8Array(read(path, "binary"));
                 };
 
                 JetStream.getString = async function(path) {
-                    if (ShellPrefetchedResources) {
+                    if ("ShellPrefetchedResources" in globalThis) {
                         return new ShellTextDecoder().decode(ShellPrefetchedResources[path]);
                     }
                     return read(path);