Diff
Modified: trunk/PerformanceTests/Animation/balls.html (134636 => 134637)
--- trunk/PerformanceTests/Animation/balls.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Animation/balls.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -106,7 +106,7 @@
var particles = [];
window._onload_ = function () {
- PerfTestRunner.prepareToMeasureValuesAsync({runCount: 10, done: onCompletedRun, unit: 'fps'});
+ PerfTestRunner.prepareToMeasureValuesAsync({iterationCount: 10, done: onCompletedRun, unit: 'fps'});
// Create the particles
for (var i = 0; i < MAX_PARTICLES; i++)
Modified: trunk/PerformanceTests/ChangeLog (134636 => 134637)
--- trunk/PerformanceTests/ChangeLog 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/ChangeLog 2012-11-14 19:34:49 UTC (rev 134637)
@@ -1,3 +1,35 @@
+2012-11-14 Ryosuke Niwa <[email protected]>
+
+ runCount in runner.js should be renamed to iterationCount
+ https://bugs.webkit.org/show_bug.cgi?id=102208
+
+ Reviewed by Tony Chang.
+
+ Prior to this patch, there were terminology confusions between "runs" and "iterations".
+ The term "run" should refer to running a performance test once, and "iteration" should
+ refer to one measurement in the test. i.e. Executing run-perf-should once will result in
+ a single "run" of performance tests and each test may execute multiple "iterations"
+ to complete the run.
+
+ Unfortunately, we still overload the meaning of "runs" in "runs/s" (is "function calls/s")
+ but that could be addressed in a separate patch.
+
+ * Animation/balls.html:
+ * DOM/DOMTable.html:
+ * DOM/resources/dom-perf.js:
+ * Layout/floats_100_100.html:
+ * Layout/floats_100_100_nested.html:
+ * Layout/floats_20_100.html:
+ * Layout/floats_20_100_nested.html:
+ * Layout/floats_2_100.html:
+ * Layout/floats_2_100_nested.html:
+ * Layout/floats_50_100.html:
+ * Layout/floats_50_100_nested.html:
+ * Layout/subtree-detaching.html:
+ * Parser/html5-full-render.html:
+ * SVG/SvgHitTesting.html:
+ * resources/runner.js:
+
2012-11-13 Dimitri Glazkov <[email protected]>
Unreviewed, rolling out r134367.
Modified: trunk/PerformanceTests/DOM/DOMTable.html (134636 => 134637)
--- trunk/PerformanceTests/DOM/DOMTable.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/DOM/DOMTable.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -7,7 +7,7 @@
<script type="text/_javascript_" src=""
<script>
runBenchmarkSuite(DOMTableTest, 10);
-// runCount = 10 since this test is very slow (~12m per run on Core i5 2.53Hz MacBookPro)
+// iterationCount: 10 since this test is very slow (~12m per run on Core i5 2.53Hz MacBookPro)
</script>
</body>
</html>
Modified: trunk/PerformanceTests/DOM/resources/dom-perf.js (134636 => 134637)
--- trunk/PerformanceTests/DOM/resources/dom-perf.js 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/DOM/resources/dom-perf.js 2012-11-14 19:34:49 UTC (rev 134637)
@@ -330,7 +330,7 @@
return this.generateDOMTree(26, 26, 4);
};
-function runBenchmarkSuite(suite, runCount) {
+function runBenchmarkSuite(suite, iterationCount) {
PerfTestRunner.measureTime({run: function () {
var container = document.getElementById('container');
var content = document.getElementById('benchmark_content');
@@ -346,7 +346,7 @@
}
return totalMeanTime;
},
- runCount: runCount,
+ iterationCount: iterationCount,
done: function () {
var container = document.getElementById('container');
if (container.firstChild)
Modified: trunk/PerformanceTests/Layout/floats_100_100.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_100_100.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_100_100.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(100, 100, 0, 3),
- runCount: 2});
+ iterationCount: 2});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_100_100_nested.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_100_100_nested.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_100_100_nested.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(100, 100, 100, 3),
- runCount: 2});
+ iterationCount: 2});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_20_100.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_20_100.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_20_100.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(20, 100, 0, 100),
- runCount: 7});
+ iterationCount: 7});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_20_100_nested.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_20_100_nested.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_20_100_nested.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(20, 100, 100, 100),
- runCount: 6});
+ iterationCount: 6});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_2_100.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_2_100.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_2_100.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(2, 100, 0, 500),
- runCount: 10});
+ iterationCount: 10});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_2_100_nested.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_2_100_nested.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_2_100_nested.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(2, 100, 100, 250),
- runCount: 10});
+ iterationCount: 10});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_50_100.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_50_100.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_50_100.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(50, 100, 0, 20),
- runCount: 5});
+ iterationCount: 5});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/floats_50_100_nested.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/floats_50_100_nested.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/floats_50_100_nested.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -10,7 +10,7 @@
<pre id="log"></pre>
<script>
PerfTestRunner.measureTime({run: createFloatsLayoutTestFunction(50, 100, 100, 20),
- runCount: 5});
+ iterationCount: 5});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Layout/subtree-detaching.html (134636 => 134637)
--- trunk/PerformanceTests/Layout/subtree-detaching.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Layout/subtree-detaching.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -36,7 +36,7 @@
buildTree();
-PerfTestRunner.measureTime({run: runTest, runCount: 20, description: "This benchmark checks the time spend in detaching an tree." });
+PerfTestRunner.measureTime({run: runTest, iterationCount: 20, description: "This benchmark checks the time spend in detaching an tree." });
</script>
</body>
</html>
Modified: trunk/PerformanceTests/Parser/html5-full-render.html (134636 => 134637)
--- trunk/PerformanceTests/Parser/html5-full-render.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/Parser/html5-full-render.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -6,7 +6,7 @@
window._onload_ = function() {
PerfTestRunner.measurePageLoadTime({path: "resources/html5.html",
chunkSize: 500000, // 6.09mb / 500k = approx 13 chunks (thus 13 forced layouts/style resolves).
- runCount: 5 }); // Depending on the chosen chunk size, iterations can take over 60s to run on a fast machine, so we only run 5.
+ iterationCount: 5 }); // Depending on the chosen chunk size, iterations can take over 60s to run on a fast machine, so we only run 5.
}
</script>
Modified: trunk/PerformanceTests/SVG/SvgHitTesting.html (134636 => 134637)
--- trunk/PerformanceTests/SVG/SvgHitTesting.html 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/SVG/SvgHitTesting.html 2012-11-14 19:34:49 UTC (rev 134637)
@@ -111,7 +111,7 @@
var wrapper = document.getElementById('wrapper');
if (wrapper)
wrapper.parentNode.removeChild(wrapper);
- }, runCount: 10});
+ }, iterationCount: 10});
</script>
</body>
</html>
Modified: trunk/PerformanceTests/resources/runner.js (134636 => 134637)
--- trunk/PerformanceTests/resources/runner.js 2012-11-14 19:29:25 UTC (rev 134636)
+++ trunk/PerformanceTests/resources/runner.js 2012-11-14 19:34:49 UTC (rev 134637)
@@ -11,13 +11,13 @@
(function () {
var logLines = null;
- var completedRuns = -1;
+ var completedIterations = -1;
var callsPerIteration = 1;
var currentTest = null;
var results = [];
var jsHeapResults = [];
var mallocHeapResults = [];
- var runCount = undefined;
+ var iterationCount = undefined;
var PerfTestRunner = {};
@@ -167,9 +167,9 @@
return;
}
currentTest = test;
- runCount = test.runCount || 20;
+ iterationCount = test.iterationCount || 20;
logLines = window.testRunner ? [] : null;
- PerfTestRunner.log("Running " + runCount + " times");
+ PerfTestRunner.log("Running " + iterationCount + " times");
if (runner)
scheduleNextRun(runner);
}
@@ -184,7 +184,7 @@
return;
}
- completedRuns++;
+ completedIterations++;
try {
ignoreWarmUpAndLog(measuredValue);
@@ -193,7 +193,7 @@
return;
}
- if (completedRuns < runCount)
+ if (completedIterations < iterationCount)
scheduleNextRun(runner);
else
finish();
@@ -202,7 +202,7 @@
function ignoreWarmUpAndLog(measuredValue) {
var labeledResult = measuredValue + " " + PerfTestRunner.unit;
- if (completedRuns <= 0)
+ if (completedIterations <= 0)
PerfTestRunner.log("Ignoring warm-up run (" + labeledResult + ")");
else {
results.push(measuredValue);
@@ -241,7 +241,7 @@
}
PerfTestRunner.measureValueAync = function (measuredValue) {
- completedRuns++;
+ completedIterations++;
try {
ignoreWarmUpAndLog(measuredValue);
@@ -250,7 +250,7 @@
return;
}
- if (completedRuns >= runCount)
+ if (completedIterations >= iterationCount)
finish();
}
@@ -289,7 +289,7 @@
while (totalTime < timeToRun) {
totalTime += callRunAndMeasureTime(callsPerIteration);
numberOfRuns += callsPerIteration;
- if (completedRuns < 0 && totalTime < 100)
+ if (completedIterations < 0 && totalTime < 100)
callsPerIteration = Math.max(10, 2 * callsPerIteration);
}
