Remove unnecessary MotionMark controllers
authorjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Jun 2018 16:17:43 +0000 (16:17 +0000)
committerjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Jun 2018 16:17:43 +0000 (16:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=186255

Reviewed by Said Abou-Hallawa.

Get rid of the ramp30 and the fixed-with-a-step controllers, which aren't used for testing
or debugging.

* MotionMark/developer.html: Move the "ramp" option as first, since that is the default
controller for the benchmark.
* MotionMark/resources/debug-runner/motionmark.js:
* MotionMark/resources/runner/motionmark.js: Added missing copyright notice.
* MotionMark/tests/resources/main.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

PerformanceTests/ChangeLog
PerformanceTests/MotionMark/developer.html
PerformanceTests/MotionMark/resources/debug-runner/motionmark.js
PerformanceTests/MotionMark/resources/runner/motionmark.js
PerformanceTests/MotionMark/tests/resources/main.js

index 0827290..e397ecb 100644 (file)
@@ -1,3 +1,19 @@
+2018-06-04  Jon Lee  <jonlee@apple.com>
+
+        Remove unnecessary MotionMark controllers
+        https://bugs.webkit.org/show_bug.cgi?id=186255
+
+        Reviewed by Said Abou-Hallawa.
+
+        Get rid of the ramp30 and the fixed-with-a-step controllers, which aren't used for testing
+        or debugging.
+
+        * MotionMark/developer.html: Move the "ramp" option as first, since that is the default
+        controller for the benchmark.
+        * MotionMark/resources/debug-runner/motionmark.js:
+        * MotionMark/resources/runner/motionmark.js: Added missing copyright notice.
+        * MotionMark/tests/resources/main.js:
+
 2018-05-25  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Improve the performance of Font::canRenderCombiningCharacterSequence()
index 1249347..eb3951d 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+  Copyright (C) 2015-2018 Apple Inc. All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
                                 <li>
                                     <h3>Adjusting the test complexity:</h3>
                                     <ul>
+                                        <li><label><input name="controller" type="radio" value="ramp" checked> Ramp</label></li>
                                         <li><label><input name="controller" type="radio" value="fixed"> Keep at a fixed complexity</label></li>
-                                        <li><label><input name="controller" type="radio" value="step"> Keep at a fixed complexity, then make a big step</label></li>
                                         <li><label><input name="controller" type="radio" value="adaptive"> Maintain target FPS</label></li>
-                                        <li><label><input name="controller" type="radio" value="ramp" checked> Ramp</label></li>
-                                        <li><label><input name="controller" type="radio" value="ramp30"> Ramp @ 30fps</label></li>
                                     </ul>
                                 </li>
                                 <li>
index 02d3e41..88b1c3d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -405,7 +405,7 @@ window.suitesManager =
     updateEditsElementsState: function()
     {
         var editsElements = this._editsElements();
-        var showComplexityInputs = ["fixed", "step"].indexOf(optionsManager.valueForOption("controller")) != -1;
+        var showComplexityInputs = optionsManager.valueForOption("controller") == "fixed";
 
         for (var i = 0; i < editsElements.length; ++i) {
             var editElement = editsElements[i];
@@ -639,7 +639,7 @@ Utilities.extendObject(window.benchmarkController, {
         }
 
         var dashboard = benchmarkRunnerClient.results;
-        if (["ramp", "ramp30"].indexOf(dashboard.options["controller"]) != -1)
+        if (dashboard.options["controller"] == "ramp")
             Headers.details[3].disabled = true;
         else {
             Headers.details[1].disabled = true;
index 65e8c54..40e6a21 100644 (file)
@@ -1,4 +1,28 @@
-ResultsDashboard = Utilities.createClass(
+/*
+ * Copyright (C) 2018 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.
+ */
+ ResultsDashboard = Utilities.createClass(
     function(options, testData)
     {
         this._iterationsSamplers = [];
@@ -69,8 +93,6 @@ ResultsDashboard = Utilities.createClass(
         var samples = data[Strings.json.samples];
 
         var desiredFrameLength = 1000/60;
-        if (this._options["controller"] == "ramp30")
-            desiredFrameLength = 1000/30;
 
         function findRegression(series, profile) {
             var minIndex = Math.round(.025 * series.length);
@@ -110,7 +132,7 @@ ResultsDashboard = Utilities.createClass(
                 samples[seriesName] = new SampleData(series.fieldMap, series.data);
         });
 
-        var isRampController = ["ramp", "ramp30"].indexOf(this._options["controller"]) != -1;
+        var isRampController = this._options["controller"] == "ramp";
         var predominantProfile = "";
         if (isRampController) {
             var profiles = {};
index 23c8641..093eb58 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -266,33 +266,6 @@ FixedController = Utilities.createSubclass(Controller,
     }
 );
 
-StepController = Utilities.createSubclass(Controller,
-    function(benchmark, options)
-    {
-        Controller.call(this, benchmark, options);
-        this.initialComplexity = options["complexity"];
-        this.intervalSamplingLength = 0;
-        this._stepped = false;
-        this._stepTime = options["test-interval"] / 2;
-    }, {
-
-    start: function(startTimestamp, stage)
-    {
-        Controller.prototype.start.call(this, startTimestamp, stage);
-        this._stepTime += startTimestamp;
-    },
-
-    tune: function(timestamp, stage)
-    {
-        if (this._stepped || timestamp < this._stepTime)
-            return;
-
-        this.mark(Strings.json.samplingEndTimeOffset, timestamp);
-        this._stepped = true;
-        stage.tune(stage.complexity() * 3);
-    }
-});
-
 AdaptiveController = Utilities.createSubclass(Controller,
     function(benchmark, options)
     {
@@ -628,19 +601,6 @@ RampController = Utilities.createSubclass(Controller,
     }
 });
 
-Ramp30Controller = Utilities.createSubclass(RampController,
-    function(benchmark, options)
-    {
-        RampController.call(this, benchmark, options);
-    }, {
-
-    frameLengthDesired: 1000/30,
-    frameLengthDesiredThreshold: 1000/29,
-    frameLengthTierThreshold: 1000/20,
-    frameLengthRampLowerThreshold: 1000/20,
-    frameLengthRampUpperThreshold: 1000/12
-});
-
 Stage = Utilities.createClass(
     function()
     {
@@ -875,17 +835,12 @@ Benchmark = Utilities.createClass(
         case "fixed":
             this._controller = new FixedController(this, options);
             break;
-        case "step":
-            this._controller = new StepController(this, options);
-            break;
         case "adaptive":
             this._controller = new AdaptiveController(this, options);
             break;
         case "ramp":
             this._controller = new RampController(this, options);
             break;
-        case "ramp30":
-            this._controller = new Ramp30Controller(this, options);
         }
     }, {