Benchmark and Controller refactoring.

smfr · smfr · commit 75efd9ebb111 · 2025-02-05T17:14:03.000-08:00
Split up the confusingly named `main.js` into three files, for `class Benchmark`,
the various controllers, and `class Stage`.

Fix the html files to include the new JS files.
diff --git a/MotionMark/tests/3d/triangles-webgl.html b/MotionMark/tests/3d/triangles-webgl.html
@@ -87,7 +87,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/webgl.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/3d/triangles-webgpu.html b/MotionMark/tests/3d/triangles-webgpu.html
@@ -39,7 +39,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/webgpu.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-canvas-images.html b/MotionMark/tests/bouncing-particles/bouncing-canvas-images.html
@@ -42,7 +42,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-canvas-particles.js"></script>
     <script src="resources/bouncing-canvas-images.js"></script>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-canvas-shapes.html b/MotionMark/tests/bouncing-particles/bouncing-canvas-shapes.html
@@ -34,7 +34,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-canvas-particles.js"></script>
     <script src="resources/bouncing-canvas-shapes.js"></script>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-css-images.html b/MotionMark/tests/bouncing-particles/bouncing-css-images.html
@@ -39,7 +39,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-css-images.js"></script>
 </body>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-css-shapes.html b/MotionMark/tests/bouncing-particles/bouncing-css-shapes.html
@@ -50,7 +50,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-css-shapes.js"></script>
 </body>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-svg-images.html b/MotionMark/tests/bouncing-particles/bouncing-svg-images.html
@@ -34,7 +34,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-svg-particles.js"></script>
     <script src="resources/bouncing-svg-images.js"></script>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-svg-shapes.html b/MotionMark/tests/bouncing-particles/bouncing-svg-shapes.html
@@ -34,7 +34,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-svg-particles.js"></script>
     <script src="resources/bouncing-svg-shapes.js"></script>
diff --git a/MotionMark/tests/bouncing-particles/bouncing-tagged-images.html b/MotionMark/tests/bouncing-particles/bouncing-tagged-images.html
@@ -36,7 +36,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/bouncing-particles.js"></script>
     <script src="resources/bouncing-tagged-images.js"></script>
 </head>
diff --git a/MotionMark/tests/core/canvas-stage.html b/MotionMark/tests/core/canvas-stage.html
@@ -34,7 +34,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/canvas-stage.js"></script>
     <script src="resources/canvas-tests.js"></script>
 </body>
diff --git a/MotionMark/tests/core/design.html b/MotionMark/tests/core/design.html
@@ -101,7 +101,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/design.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/core/image-data.html b/MotionMark/tests/core/image-data.html
@@ -46,7 +46,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/image-data.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/core/leaves.html b/MotionMark/tests/core/leaves.html
@@ -42,7 +42,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/particles.js"></script>
     <script src="resources/leaves.js"></script>
 </body>
diff --git a/MotionMark/tests/core/multiply.html b/MotionMark/tests/core/multiply.html
@@ -71,7 +71,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/multiply.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/core/suits.html b/MotionMark/tests/core/suits.html
@@ -55,7 +55,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/particles.js"></script>
     <script src="resources/suits.js"></script>
 </body>
diff --git a/MotionMark/tests/dom/compositing-transforms.html b/MotionMark/tests/dom/compositing-transforms.html
@@ -41,7 +41,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="../bouncing-particles/resources/bouncing-particles.js"></script>
     <script src="resources/compositing-transforms.js"></script>
 </body>
diff --git a/MotionMark/tests/dom/focus.html b/MotionMark/tests/dom/focus.html
@@ -69,7 +69,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="resources/focus.js"></script>
 </body>
 </html>
diff --git a/MotionMark/tests/dom/leaves.html b/MotionMark/tests/dom/leaves.html
@@ -42,7 +42,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="../core/resources/particles.js"></script>
     <script src="../core/resources/leaves.js"></script>
     <script src="resources/leaves.js"></script>
diff --git a/MotionMark/tests/dom/multiply.html b/MotionMark/tests/dom/multiply.html
@@ -71,7 +71,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="../core/resources/multiply.js"></script>
     <script src="resources/multiply.js"></script>
 </body>
diff --git a/MotionMark/tests/dom/particles.html b/MotionMark/tests/dom/particles.html
@@ -41,7 +41,9 @@
     <script src="../../resources/extensions.js"></script>
     <script src="../../resources/statistics.js"></script>
     <script src="../resources/math.js"></script>
-    <script src="../resources/main.js"></script>
+    <script src="../resources/benchmark.js"></script>
+    <script src="../resources/controllers.js"></script>
+    <script src="../resources/stage.js"></script>
     <script src="../core/resources/particles.js"></script>
     <script src="resources/dom-particles.js"></script>
 </body>
diff --git a/MotionMark/tests/resources/benchmark.js b/MotionMark/tests/resources/benchmark.js
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2015-2025 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class Benchmark {
+    constructor(stage, options)
+    {
+        this._animateLoop = this._animateLoop.bind(this);
+        this._warmupLength = options["warmup-length"];
+        this._frameCount = 0;
+        this._warmupFrameCount = options["warmup-frame-count"];
+        this._firstFrameMinimumLength = options["first-frame-minimum-length"];
+
+        this._stage = stage;
+        this._stage.initialize(this, options);
+
+        switch (options["time-measurement"])
+        {
+        case "performance":
+            if (window.performance && window.performance.now)
+                this._getTimestamp = performance.now.bind(performance);
+            else
+                this._getTimestamp = null;
+            break;
+        case "raf":
+            this._getTimestamp = null;
+            break;
+        case "date":
+            this._getTimestamp = Date.now;
+            break;
+        }
+
+        options["test-interval"] *= 1000;
+        switch (options["controller"])
+        {
+        case "fixed":
+            this._controller = new FixedController(this, options);
+            break;
+        case "adaptive":
+            this._controller = new AdaptiveController(this, options);
+            break;
+        case "ramp":
+            this._controller = new RampController(this, options);
+            break;
+        }
+    }
+
+    get stage()
+    {
+        return this._stage;
+    }
+
+    get timestamp()
+    {
+        return this._currentTimestamp - this._benchmarkStartTimestamp;
+    }
+
+    backgroundColor()
+    {
+        var stage = window.getComputedStyle(document.getElementById("stage"));
+        return stage["background-color"];
+    }
+
+    run()
+    {
+        return this.waitUntilReady().then(function() {
+            this._finishPromise = new SimplePromise;
+            this._previousTimestamp = undefined;
+            this._didWarmUp = false;
+            this._stage.tune(this._controller.initialComplexity - this._stage.complexity());
+            this._animateLoop();
+            return this._finishPromise;
+        }.bind(this));
+    }
+
+    // Subclasses should override this if they have setup to do prior to commencing.
+    waitUntilReady()
+    {
+        var promise = new SimplePromise;
+        promise.resolve();
+        return promise;
+    }
+
+    _animateLoop(timestamp)
+    {
+        timestamp = (this._getTimestamp && this._getTimestamp()) || timestamp;
+        this._currentTimestamp = timestamp;
+
+        if (this._controller.shouldStop(timestamp)) {
+            this._finishPromise.resolve(this._controller.results());
+            return;
+        }
+
+        if (!this._didWarmUp) {
+            if (!this._previousTimestamp) {
+                this._previousTimestamp = timestamp;
+                this._benchmarkStartTimestamp = timestamp;
+            } else if (timestamp - this._previousTimestamp >= this._warmupLength && this._frameCount >= this._warmupFrameCount) {
+                this._didWarmUp = true;
+                this._benchmarkStartTimestamp = timestamp;
+                this._controller.start(timestamp, this._stage);
+                this._previousTimestamp = timestamp;
+
+                while (this._getTimestamp && this._getTimestamp() - timestamp < this._firstFrameMinimumLength) {
+                }
+            }
+
+            this._stage.animate(0);
+            ++this._frameCount;
+            requestAnimationFrame(this._animateLoop);
+            return;
+        }
+
+        this._controller.update(timestamp, this._stage);
+        this._stage.animate(timestamp - this._previousTimestamp);
+        this._previousTimestamp = timestamp;
+        requestAnimationFrame(this._animateLoop);
+    }
+}
diff --git a/MotionMark/tests/resources/controllers.js b/MotionMark/tests/resources/controllers.js
diff --git a/MotionMark/tests/resources/stage.js b/MotionMark/tests/resources/stage.js
diff --git a/MotionMark/tests/simple/simple-canvas-paths.html b/MotionMark/tests/simple/simple-canvas-paths.html
diff --git a/MotionMark/tests/simple/tiled-canvas-image.html b/MotionMark/tests/simple/tiled-canvas-image.html
diff --git a/MotionMark/tests/svg/suits.html b/MotionMark/tests/svg/suits.html
diff --git a/MotionMark/tests/template/template-canvas.html b/MotionMark/tests/template/template-canvas.html
diff --git a/MotionMark/tests/template/template-css.html b/MotionMark/tests/template/template-css.html
diff --git a/MotionMark/tests/template/template-svg.html b/MotionMark/tests/template/template-svg.html
diff --git a/MotionMark/tests/text/design-6.html b/MotionMark/tests/text/design-6.html
diff --git a/MotionMark/tests/text/design.html b/MotionMark/tests/text/design.html
