<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[244973] trunk/PerformanceTests</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/244973">244973</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2019-05-06 13:36:40 -0700 (Mon, 06 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>JS2 should print scores for different categories
https://bugs.webkit.org/show_bug.cgi?id=197605

Reviewed by Yusuke Suzuki.

* JetStream2/JetStreamDriver.js:
(displayCategoryScores):
(isInBrowser.document.onkeydown):
(Driver.prototype.async.start):
(Driver.prototype.async.reportScoreToRunBenchmarkRunner):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsJetStream2JetStreamDriverjs">trunk/PerformanceTests/JetStream2/JetStreamDriver.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (244972 => 244973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2019-05-06 20:27:53 UTC (rev 244972)
+++ trunk/PerformanceTests/ChangeLog    2019-05-06 20:36:40 UTC (rev 244973)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-05-06  Saam Barati  <sbarati@apple.com>
+
+        JS2 should print scores for different categories
+        https://bugs.webkit.org/show_bug.cgi?id=197605
+
+        Reviewed by Yusuke Suzuki.
+
+        * JetStream2/JetStreamDriver.js:
+        (displayCategoryScores):
+        (isInBrowser.document.onkeydown):
+        (Driver.prototype.async.start):
+        (Driver.prototype.async.reportScoreToRunBenchmarkRunner):
+
</ins><span class="cx"> 2019-04-16  Jon Lee  <jonlee@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MotionMark] The text "kkkj" is causing Firefox console warning: `unreachable code after return statement`
</span></span></pre></div>
<a id="trunkPerformanceTestsJetStream2JetStreamDriverjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/JetStream2/JetStreamDriver.js (244972 => 244973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/JetStream2/JetStreamDriver.js     2019-05-06 20:27:53 UTC (rev 244972)
+++ trunk/PerformanceTests/JetStream2/JetStreamDriver.js        2019-05-06 20:36:40 UTC (rev 244973)
</span><span class="lines">@@ -41,6 +41,31 @@
</span><span class="cx"> const defaultIterationCount = 120;
</span><span class="cx"> const defaultWorstCaseCount = 4;
</span><span class="cx"> 
</span><ins>+let showScoreDetails = false;
+let categoryScores = null;
+
+function displayCategoryScores() {
+    if (!categoryScores)
+        return;
+
+    let summaryElement = document.getElementById("result-summary");
+    for (let [category, scores] of categoryScores)
+        summaryElement.innerHTML += `<p> ${category}: ${uiFriendlyNumber(geomean(scores))}</p>`
+
+    categoryScores = null;
+}
+
+if (isInBrowser) {
+    document.onkeydown = (keyboardEvent) => {
+        let key = keyboardEvent.key;
+        if (key === "d" || key === "D") {
+            showScoreDetails = true;
+
+            displayCategoryScores();
+        }
+    };
+}
+
</ins><span class="cx"> function assert(b, m = "") {
</span><span class="cx">     if (!b)
</span><span class="cx">         throw new Error("Bad assertion: " + m);
</span><span class="lines">@@ -174,7 +199,6 @@
</span><span class="cx">             await updateUI();
</span><span class="cx"> 
</span><span class="cx">             try {
</span><del>-
</del><span class="cx">                 await benchmark.run();
</span><span class="cx">             } catch(e) {
</span><span class="cx">                 JetStream.reportError(benchmark);
</span><span class="lines">@@ -197,12 +221,33 @@
</span><span class="cx">         for (let benchmark of this.benchmarks)
</span><span class="cx">             allScores.push(benchmark.score);
</span><span class="cx"> 
</span><ins>+        categoryScores = new Map;
+        for (let benchmark of this.benchmarks) {
+            for (let category of Object.keys(benchmark.subTimes()))
+                categoryScores.set(category, []);
+        }
+
+        for (let benchmark of this.benchmarks) {
+            for (let [category, value] of Object.entries(benchmark.subTimes())) {
+                let arr = categoryScores.get(category);
+                arr.push(value);
+            }
+        }
+
</ins><span class="cx">         if (isInBrowser) {
</span><span class="cx">             summaryElement.classList.add('done');
</span><span class="cx">             summaryElement.innerHTML = "<div class=\"score\">" + uiFriendlyNumber(geomean(allScores)) + "</div><label>Score</label>";
</span><ins>+            summaryElement.onclick = displayCategoryScores;
+            if (showScoreDetails)
+                displayCategoryScores();
</ins><span class="cx">             statusElement.innerHTML = '';
</span><del>-        } else
</del><ins>+        } else {
+            console.log("\n");
+            for (let [category, scores] of categoryScores)
+                console.log(`${category}: ${uiFriendlyNumber(geomean(scores))}`);
+
</ins><span class="cx">             console.log("\nTotal Score: ", uiFriendlyNumber(geomean(allScores)), "\n");
</span><ins>+        }
</ins><span class="cx"> 
</span><span class="cx">         this.reportScoreToRunBenchmarkRunner();
</span><span class="cx">     }
</span><span class="lines">@@ -331,7 +376,7 @@
</span><span class="cx">                     "Time": ["Geometric"],
</span><span class="cx">                 },
</span><span class="cx">                 "tests": subResults,
</span><del>-            };;
</del><ins>+            };
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         results = {"JetStream2.0": {"metrics" : {"Score" : ["Geometric"]}, "tests" : results}};
</span></span></pre>
</div>
</div>

</body>
</html>