Migrate MotionMark 1.2 from its own directory to the common MotionMark directory.

Author: smfr

MotionMark/about.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+  Copyright (C) 2015-2020 Apple Inc. All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
@@ -59,7 +59,7 @@ <h1>About MotionMark <span class="version"></span></h1>
             <ul>
                 <li><strong>Multiply</strong>: CSS border radius, transforms, opacity</li>
                 <li><strong>Arcs and Fills</strong>: Canvas path fills and arcs</li>
-                <li><strong>Leaves</strong>: CSS-transformed elements</li>
+                <li><strong>Leaves</strong>: CSS-transformed elements, opacity</li>
                 <li><strong>Paths</strong>: Canvas line, quadratic, and Bezier paths</li>
                 <li><strong>Lines</strong>: Canvas line segments</li>
                 <li><strong>Focus</strong>: CSS blur filter, opacity</li>
@@ -70,6 +70,15 @@ <h1>About MotionMark <span class="version"></span></h1>
 
             <p>To achieve consistent results on mobile devices, put the device in landscape orientation. On laptops and desktops, use the default display resolution and make the browser window fullscreen. Make sure that screen automatic display sleep is turned off or set to longer than 8 minutes.</p>
 
+            <h3>Version log</h3>
+
+            <ul id="log">
+                <li><strong>1.2</strong>: Fix <a href="https://bugs.webkit.org/show_bug.cgi?id=220847">bug</a>, <a href="https://bugs.webkit.org/show_bug.cgi?id=221075">bug</a>, and <a href="https://bugs.webkit.org/show_bug.cgi?id=219984">bug</a> to reduce test variance and sensitivity to individual long frames.</li>
+                <li><strong>1.1.1</strong>: Fix <a href="https://bugs.webkit.org/show_bug.cgi?id=210640">bug</a> in the calculation of timestamps used for animation during warm up phase of tests.</li>
+                <li><a href="https://webkit.org/blog/8434/motionmark-1-1/"><strong>1.1</strong></a>: Update Multiply test to increase max capacity and expand methods for hiding elements. Update Leaves test to use range of sizes and opacity.</li>
+                <li><a href="https://webkit.org/blog/6943/motionmark-a-new-graphics-benchmark/"><strong>1.0</strong></a>: Initial release.</li>
+            </ul>
+
             <center><button onclick="location.href='./'">Return to homepage</button></center>
         </div>
         </section>
@@ -80,4 +89,4 @@ <h1>About MotionMark <span class="version"></span></h1>
         document.querySelector(".version").textContent = Strings.version;
     </script>
 </body>
-</html>
+</html>

MotionMark/developer.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+  Copyright (C) 2015-2020 Apple Inc. All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
@@ -64,6 +64,15 @@ <h2>Suites:</h2>
                         <h2>Options:</h2>
                         <form name="benchmark-options">
                             <ul>
+                                <li>
+                                    <label>Warmup length: <input type="number" id="warmup-length" value="2000"> milliseconds</label>
+                                </li>
+                                <li>
+                                    <label>Warmup frame count: <input type="number" id="warmup-frame-count" value="30"> frames</label>
+                                </li>
+                                <li>
+                                    <label>First frame minimum length: <input type="number" id="first-frame-minimum-length" value="0"> ms</label>
+                                </li>
                                 <li>
                                     <label>Test length: <input type="number" id="test-interval" value="30"> seconds each</label>
                                 </li>
@@ -92,13 +101,6 @@ <h3>Adjusting the test complexity:</h3>
                                 <li>
                                     <label>Target frame rate: <input type="number" id="frame-rate" value="50"> FPS</label>
                                 </li>
-                                <li>
-                                    <h3>Kalman filter estimated error:</h3>
-                                    <ul>
-                                        <li><label>Process error (Q): <input type="number" id="kalman-process-error" value="1"></label></li>
-                                        <li><label>Measurement error (R): <input type="number" id="kalman-measurement-error" value="4"></label></li>
-                                    </ul>
-                                </li>
                                 <li>
                                     <h3>Time measurement method:</h3>
                                     <ul>

MotionMark/resources/debug-runner/motionmark.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -241,7 +241,7 @@ window.optionsManager =
 
         document.body.classList.add("display-" + optionsManager.valueForOption("display"));
     },
-    
+
     updateTiles: function()
     {
         document.body.classList.remove("tiles-big");
@@ -615,7 +615,7 @@ Utilities.extendObject(window.benchmarkController, {
     startBenchmark: function()
     {
         benchmarkController.determineCanvasSize();
-        benchmarkController.options = optionsManager.updateLocalStorageFromUI();
+        benchmarkController.options = Utilities.mergeObjects(this.benchmarkDefaultParameters, optionsManager.updateLocalStorageFromUI());
         benchmarkController.suites = suitesManager.updateLocalStorageFromUI();
         this._startBenchmark(benchmarkController.suites, benchmarkController.options, "running-test");
     },

MotionMark/resources/debug-runner/tests.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -183,7 +183,7 @@ Suites.push(new Suite("HTML suite",
             name: "CSS bouncing filter circles"
         },
         {
-            url: "bouncing-particles/bouncing-css-images.html?particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-css-images.html?particleWidth=80&particleHeight=80",
             name: "CSS bouncing SVG images"
         },
         {
@@ -199,7 +199,7 @@ Suites.push(new Suite("HTML suite",
             name: "DOM particles, SVG masks"
         },
         {
-            url: "dom/compositing-transforms.html?particleWidth=50&particleHeight=50&filters=yes&imageSrc=../resources/yin-yang.svg",
+            url: "dom/compositing-transforms.html?particleWidth=50&particleHeight=50&filters=yes",
             name: "Composited Transforms"
         }
     ]
@@ -216,11 +216,11 @@ Suites.push(new Suite("Canvas suite",
             name: "canvas bouncing gradient circles"
         },
         {
-            url: "bouncing-particles/bouncing-canvas-images.html?particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-canvas-images.html?particleWidth=80&particleHeight=80",
             name: "canvas bouncing SVG images"
         },
         {
-            url: "bouncing-particles/bouncing-canvas-images.html?particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
+            url: "bouncing-particles/bouncing-canvas-images.html?particleWidth=80&particleHeight=80",
             name: "canvas bouncing PNG images"
         },
         {
@@ -253,11 +253,11 @@ Suites.push(new Suite("SVG suite",
             name: "SVG bouncing gradient circles"
         },
         {
-            url: "bouncing-particles/bouncing-svg-images.html?particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.svg",
+            url: "bouncing-particles/bouncing-svg-images.html?particleWidth=80&particleHeight=80",
             name: "SVG bouncing SVG images"
         },
         {
-            url: "bouncing-particles/bouncing-svg-images.html?particleWidth=80&particleHeight=80&imageSrc=../resources/yin-yang.png",
+            url: "bouncing-particles/bouncing-svg-images.html?particleWidth=80&particleHeight=80",
             name: "SVG bouncing PNG images"
         },
     ]

MotionMark/resources/runner/motionmark.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -347,6 +347,18 @@ body.images-loaded #intro {
     min-width: initial;
     transform: skewX(-10deg);
 }
+#about h3 {
+    margin-top: 3em;
+}
+#about #log {
+    font-size: .9em;
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+#about #log li {
+    margin-top: .5em;
+}
 
 @media screen and (min-width: 667px) {
     #about .body {

MotionMark/resources/runner/motionmark.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -457,6 +457,19 @@ window.sectionsManager =
 };
 
 window.benchmarkController = {
+    benchmarkDefaultParameters: {
+        "test-interval": 30,
+        "display": "minimal",
+        "tiles": "big",
+        "controller": "ramp",
+        "kalman-process-error": 1,
+        "kalman-measurement-error": 4,
+        "time-measurement": "performance",
+        "warmup-length": 2000,
+        "warmup-frame-count": 30,
+        "first-frame-minimum-length": 0
+    },
+
     initialize: function()
     {
         document.title = Strings.text.title.replace("%s", Strings.version);
@@ -530,15 +543,7 @@ window.benchmarkController = {
 
     startBenchmark: function()
     {
-        var options = {
-            "test-interval": 30,
-            "display": "minimal",
-            "tiles": "big",
-            "controller": "ramp",
-            "kalman-process-error": 1,
-            "kalman-measurement-error": 4,
-            "time-measurement": "performance"
-        };
+        var options = this.benchmarkDefaultParameters;
         this._startBenchmark(Suites, options, "test-container");
     },
 

MotionMark/resources/runner/tests.js

@@ -51,10 +51,6 @@ Suites.push(new Suite("MotionMark",
             url: "master/canvas-stage.html?pathType=line&lineCap=square",
             name: "Canvas Lines"
         },
-        {
-            url: "master/focus.html",
-            name: "Focus"
-        },
         {
             url: "master/image-data.html",
             name: "Images"

MotionMark/resources/strings.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

MotionMark/tests/3d/resources/webgpu.js

@@ -94,13 +94,13 @@ WebGLStage = Utilities.createSubclass(Stage,
 
                     this._timeBindGroupLayout = device.createBindGroupLayout({
                         bindings: [
-                            { binding: 0, visibility: GPUShaderStage.VERTEX, type: "uniform-buffer" },
+                            { binding: 0, visibility: GPUShaderStageBit.VERTEX, type: "uniform-buffer" },
                         ],
                     });
 
                     this._bindGroupLayout = device.createBindGroupLayout({
                         bindings: [
-                            { binding: 0, visibility: GPUShaderStage.VERTEX, type: "uniform-buffer" },
+                            { binding: 0, visibility: GPUShaderStageBit.VERTEX, type: "uniform-buffer" },
                         ],
                     });
 

MotionMark/tests/bouncing-particles/resources/bouncing-canvas-images.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -49,7 +49,7 @@ BouncingCanvasImagesStage = Utilities.createSubclass(BouncingCanvasParticlesStag
     initialize: function(benchmark, options)
     {
         BouncingCanvasParticlesStage.prototype.initialize.call(this, benchmark, options);
-        var imageSrc = options["imageSrc"] || "resources/yin-yang.svg";
+        var imageSrc = options["imageSrc"] || "../resources/yin-yang.svg";
         this.imageElement = document.querySelector(".hidden[src=\"" + imageSrc + "\"]");
     },