diff --git a/taskcluster/ci/test/browsertime-desktop.yml b/taskcluster/ci/test/browsertime-desktop.yml index a6a1de03fbc0..aecb19d4de0a 100644 --- a/taskcluster/ci/test/browsertime-desktop.yml +++ b/taskcluster/ci/test/browsertime-desktop.yml @@ -314,6 +314,8 @@ browsertime-benchmark: - [jetstream2, js2] - [matrix-react-bench, mrb] - [motionmark-animometer, mm-a] + - [motionmark-animometer-ramp, mm-ar] + - [motionmark-htmlsuite-ramp, mm-hr] - [motionmark-htmlsuite, mm-h] - [speedometer, sp] - [speedometer3, sp3] @@ -329,6 +331,8 @@ browsertime-benchmark: # - [matrix-react-bench, mrb] Perma fails on osx 10.15.x machines (Bug 1807754) - [motionmark-animometer, mm-a] - [motionmark-htmlsuite, mm-h] + - [motionmark-animometer-ramp, mm-ar] + - [motionmark-htmlsuite-ramp, mm-hr] - [speedometer, sp] # - [speedometer3, sp3] Perma fails on osx 10.15.x machines (Bug 1809535) - [stylebench, sb] @@ -338,6 +342,8 @@ browsertime-benchmark: custom-car: - [speedometer, sp] - [speedometer3, sp3] + - [motionmark-animometer-ramp, mm-ar] + - [motionmark-htmlsuite-ramp, mm-hr] default: - ares6 - [assorted-dom, dom] @@ -345,6 +351,8 @@ browsertime-benchmark: - [matrix-react-bench, mrb] - [motionmark-animometer, mm-a] - [motionmark-htmlsuite, mm-h] + - [motionmark-animometer-ramp, mm-ar] + - [motionmark-htmlsuite-ramp, mm-hr] - [speedometer, sp] - [speedometer3, sp3] - [stylebench, sb] @@ -416,6 +424,8 @@ browsertime-benchmark: jetstream2: 8000 matrix-react-bench: 1500 motionmark-htmlsuite: 1500 + motionmark-htmlsuite-ramp: 3000 + motionmark-animometer-ramp: 2100 unity-webgl: 1500 speedometer3: 2100 speedometer: 2100 diff --git a/testing/raptor/raptor/output.py b/testing/raptor/raptor/output.py index 4ee7ebec3056..e954ee6b9231 100644 --- a/testing/raptor/raptor/output.py +++ b/testing/raptor/raptor/output.py @@ -729,7 +729,15 @@ class PerftestOutput(object): try: # pylint: disable=W1633 replicate = round( - float(page_cycle_results[suite][sub]["frameLength"]["average"]), + float( + page_cycle_results[suite][sub]["complexity"]["bootstrap"][ + "median" + ] + if "ramp" in test["name"] + else page_cycle_results[suite][sub]["frameLength"][ + "average" + ] + ), 3, ) except TypeError as e: diff --git a/testing/raptor/raptor/tests/benchmarks/motionmark-animometer.ini b/testing/raptor/raptor/tests/benchmarks/motionmark-animometer.ini index 2e7e4117b07f..5eca340e4049 100644 --- a/testing/raptor/raptor/tests/benchmarks/motionmark-animometer.ini +++ b/testing/raptor/raptor/tests/benchmarks/motionmark-animometer.ini @@ -19,3 +19,7 @@ type = benchmark unit = score [motionmark-animometer] + +[motionmark-animometer-ramp] +apps = firefox, chrome, chromium, safari, custom-car +test_url = http://:/MotionMark/developer.html?test-interval=30&display=minimal&tiles=big&controller=ramp&frame-rate=60&kalman-process-error=1&kalman-measurement-error=4&time-measurement=performance&suite-name=Animometer&raptor=true&oskey={platform} diff --git a/testing/raptor/raptor/tests/benchmarks/motionmark-htmlsuite.ini b/testing/raptor/raptor/tests/benchmarks/motionmark-htmlsuite.ini index 2c8e98265426..1d4a9b2a6c70 100644 --- a/testing/raptor/raptor/tests/benchmarks/motionmark-htmlsuite.ini +++ b/testing/raptor/raptor/tests/benchmarks/motionmark-htmlsuite.ini @@ -19,3 +19,7 @@ type = benchmark unit = score [motionmark-htmlsuite] + +[motionmark-htmlsuite-ramp] +apps = firefox, chrome, chromium, safari, custom-car +test_url = http://:/MotionMark/developer.html?test-interval=30&display=minimal&tiles=big&controller=ramp&frame-rate=60&kalman-process-error=1&kalman-measurement-error=4&time-measurement=performance&suite-name=HTMLsuite&raptor=true&oskey={platform} diff --git a/third_party/webkit/PerformanceTests/MotionMark/resources/debug-runner/animometer.js b/third_party/webkit/PerformanceTests/MotionMark/resources/debug-runner/animometer.js index 072cdcc7623a..ae35a5fbec42 100644 --- a/third_party/webkit/PerformanceTests/MotionMark/resources/debug-runner/animometer.js +++ b/third_party/webkit/PerformanceTests/MotionMark/resources/debug-runner/animometer.js @@ -217,7 +217,7 @@ window.optionsManager = document.body.classList.add("display-" + optionsManager.valueForOption("display")); }, - + updateTiles: function() { document.body.classList.remove("tiles-big"); @@ -671,7 +671,12 @@ Utilities.extendObject(window.benchmarkController, { for (var suite in item['testsResults']) { for (var subtest in item['testsResults'][suite.toString()]) { fullNames.push(suite.toString() + "-" + subtest.toString().replace(/ /g, '_')); - values.push(item['testsResults'][suite.toString()][subtest.toString()]['frameLength']['average']); + if (dashboard.options["controller"] === "fixed") { + values.push(item['testsResults'][suite.toString()][subtest.toString()]['frameLength']['average']); + } else if (dashboard.options["controller"] === "ramp") { + values.push(item['testsResults'][suite.toString()][subtest.toString()]['complexity']['bootstrap']['median']); + } + } } if (typeof tpRecordTime !== "undefined") {