<!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>[192003] trunk/Source/JavaScriptCore</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/192003">192003</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 17:03:06 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add op_add tests to compare behavior of JIT generated code to the LLINT's.
https://bugs.webkit.org/show_bug.cgi?id=150864
Reviewed by Saam Barati.
* tests/stress/op_add.js: Added.
(o1.valueOf):
(generateScenarios):
(printScenarios):
(testCases.func):
(func):
(initializeTestCases):
(runTest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_addjs">trunk/Source/JavaScriptCore/tests/stress/op_add.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192002 => 192003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-04 01:01:48 UTC (rev 192002)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-04 01:03:06 UTC (rev 192003)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-11-03 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Add op_add tests to compare behavior of JIT generated code to the LLINT's.
+ https://bugs.webkit.org/show_bug.cgi?id=150864
+
+ Reviewed by Saam Barati.
+
+ * tests/stress/op_add.js: Added.
+ (o1.valueOf):
+ (generateScenarios):
+ (printScenarios):
+ (testCases.func):
+ (func):
+ (initializeTestCases):
+ (runTest):
+
+2015-11-03 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Rename DFG's compileAdd to compileArithAdd.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150866
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_addjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_add.js (0 => 192003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_add.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_add.js 2015-11-04 01:03:06 UTC (rev 192003)
</span><span class="lines">@@ -0,0 +1,356 @@
</span><ins>+//@ runFTLNoCJIT
+
+// This test module aims to test the addition operator by comparing its runtime
+// behavior (using the different tiers) with expected values computed at initialization
+// time using the LLINT / bytecode generator.
+//
+// It works by generating test scenarios from permutations of value pairs to exercise
+// the addition operator. It computes the expected results by evaluating an expression
+// to add the values in an initialization pass. The scenarios are later applied to
+// a set of test functions of the forms:
+//
+// variable + variable
+// constant + variable
+// variable + constant
+//
+// See generateScenarios() and initializeTestCases() for details on how the test
+// cases are generated.
+//
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors.
+
+var verbose = false;
+var abortOnFirstFail = false;
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var set1 = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'NaN',
+ '"abc"',
+];
+
+var set2 = [
+ '10',
+ '-10',
+ '2147483647',
+ '-2147483647',
+ '4294967296',
+ '-4294967296',
+ '100.2',
+ '-100.2',
+ 'true',
+ 'false',
+];
+
+// Assemble the values that we'll be testing with:
+var values = [];
+for (var i = 0; i < set1.length; i++)
+ values.push(set1[i]);
+for (var i = 0; i < set2.length; i++)
+ values.push(set2[i]);
+for (var i = 0; i < set2.length; i++)
+ values.push('"' + set2[i] + '"');
+
+function generateScenarios(xvalues, yvalues) {
+ var scenarios = [];
+ for (var i = 0; i < xvalues.length; i++) {
+ for (var j = 0; j < yvalues.length; j++) {
+ var xStr = xvalues[i];
+ var yStr = yvalues[j];
+ var x = eval(xStr);
+ var y = eval(yStr);
+ var name = "(" + xStr + " + " + yStr + ")";
+ var expected = eval("" + xStr + " + " + yStr);
+ var scenario = { name: name, x: x, y: y, expected: expected };
+
+ scenarios.push(scenario);
+ }
+ }
+ return scenarios;
+}
+
+function printScenarios(scenarios) {
+ for (var i = 0; i < scenarios.length; i++) {
+ var scenario = scenarios[i];
+ print("scenario[" + i + "]: { name: " + scenario.name + ", x: " + scenario.x, ", y: " + scenario.y + ", expected: " + scenario.expected + " }");
+ }
+}
+
+var testCases = [
+ {
+ name: "add",
+ func: function(x, y) { return x + y; },
+ xvalues: values,
+ yvalues: values
+ },
+ {
+ name: "addI32V",
+ func: function(x, y) { return 10 + y; },
+ xvalues: [ '10' ],
+ yvalues: values
+ },
+ {
+ name: "addVI32",
+ func: function(x, y) { return x + 10; },
+ xvalues: values,
+ yvalues: [ '10' ]
+ },
+ {
+ name: "addI32oV",
+ func: function(x, y) { return 2147483647 + y; },
+ xvalues: [ '2147483647' ],
+ yvalues: values
+ },
+ {
+ name: "addVI32o",
+ func: function(x, y) { return x + 2147483647; },
+ xvalues: values,
+ yvalues: [ '2147483647' ]
+ },
+ {
+ name: "addI32onV",
+ func: function(x, y) { return -2147483647 + y; },
+ xvalues: [ '-2147483647' ],
+ yvalues: values
+ },
+ {
+ name: "addVI32on",
+ func: function(x, y) { return x + (-2147483647); },
+ xvalues: values,
+ yvalues: [ '-2147483647' ]
+ },
+ {
+ name: "addI52V",
+ func: function(x, y) { return 4294967296 + y; },
+ xvalues: [ '4294967296' ],
+ yvalues: values
+ },
+ {
+ name: "addVI52",
+ func: function(x, y) { return x + 4294967296; },
+ xvalues: values,
+ yvalues: [ '4294967296' ]
+ },
+ {
+ name: "addI52nV",
+ func: function(x, y) { return -4294967296 + y; },
+ xvalues: [ '-4294967296' ],
+ yvalues: values
+ },
+ {
+ name: "addVI52n",
+ func: function(x, y) { return x + (-4294967296); },
+ xvalues: values,
+ yvalues: [ '-4294967296' ]
+ },
+ {
+ name: "addDV",
+ func: function(x, y) { return 100.2 + y; },
+ xvalues: [ '100.2' ],
+ yvalues: values
+ },
+ {
+ name: "addVD",
+ func: function(x, y) { return x + 100.2; },
+ xvalues: values,
+ yvalues: [ '100.2' ]
+ },
+ {
+ name: "addBV",
+ func: function(x, y) { return true + y; },
+ xvalues: [ 'true' ],
+ yvalues: values
+ },
+ {
+ name: "addVB",
+ func: function(x, y) { return x + true; },
+ xvalues: values,
+ yvalues: [ 'true' ]
+ },
+ {
+ name: "addSi32V",
+ func: function(x, y) { return "10" + y; },
+ xvalues: [ '"10"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSi32",
+ func: function(x, y) { return x + "10"; },
+ xvalues: values,
+ yvalues: [ '"10"' ]
+ },
+
+ {
+ name: "addSi32oV",
+ func: function(x, y) { return "2147483647" + y; },
+ xvalues: [ '"2147483647"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSi32o",
+ func: function(x, y) { return x + "2147483647"; },
+ xvalues: values,
+ yvalues: [ '"2147483647"' ]
+ },
+ {
+ name: "addSi32onV",
+ func: function(x, y) { return "-2147483647" + y; },
+ xvalues: [ '"-2147483647"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSi32on",
+ func: function(x, y) { return x + "-2147483647"; },
+ xvalues: values,
+ yvalues: [ '"-2147483647"' ]
+ },
+ {
+ name: "addSi52V",
+ func: function(x, y) { return "4294967296" + y; },
+ xvalues: [ '"4294967296"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSi52",
+ func: function(x, y) { return x + "4294967296"; },
+ xvalues: values,
+ yvalues: [ '"4294967296"' ]
+ },
+ {
+ name: "addSi52nV",
+ func: function(x, y) { return "-4294967296" + y; },
+ xvalues: [ '"-4294967296"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSi52n",
+ func: function(x, y) { return x + "-4294967296"; },
+ xvalues: values,
+ yvalues: [ '"-4294967296"' ]
+ },
+ {
+ name: "addSdV",
+ func: function(x, y) { return "100.2" + y; },
+ xvalues: [ '"100.2"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSd",
+ func: function(x, y) { return x + "100.2"; },
+ xvalues: values,
+ yvalues: [ '"100.2"' ]
+ },
+ {
+ name: "addSbV",
+ func: function(x, y) { return "true" + y; },
+ xvalues: [ '"true"' ],
+ yvalues: values
+ },
+ {
+ name: "addVSb",
+ func: function(x, y) { return x + "true"; },
+ xvalues: values,
+ yvalues: [ '"true"' ]
+ },
+
+ {
+ name: "addSV",
+ func: function(x, y) { return "abc" + y; },
+ xvalues: [ '"abc"' ],
+ yvalues: values
+ },
+ {
+ name: "addVS",
+ func: function(x, y) { return x + "abc"; },
+ xvalues: values,
+ yvalues: [ '"abc"' ]
+ },
+ {
+ name: "addNV",
+ func: function(x, y) { return null + y; },
+ xvalues: [ 'null' ],
+ yvalues: values
+ },
+ {
+ name: "addVN",
+ func: function(x, y) { return x + null; },
+ xvalues: values,
+ yvalues: [ 'null' ]
+ },
+ {
+ name: "addOV",
+ func: function(x, y) { return o1 + y; },
+ xvalues: [ 'o1' ],
+ yvalues: values
+ },
+ {
+ name: "addVO",
+ func: function(x, y) { return x + o1; },
+ xvalues: values,
+ yvalues: [ 'o1' ]
+ },
+ {
+ name: "addNaNV",
+ func: function(x, y) { return NaN + y; },
+ xvalues: [ 'NaN' ],
+ yvalues: values
+ },
+ {
+ name: "addVNaN",
+ func: function(x, y) { return x + NaN; },
+ xvalues: values,
+ yvalues: [ 'NaN' ]
+ },
+];
+
+function initializeTestCases() {
+ for (var test of testCases) {
+ noInline(test.func);
+ test.scenarios = generateScenarios(test.xvalues, test.yvalues);
+ }
+}
+initializeTestCases();
+
+var errorReport = "";
+
+function runTest(test) {
+ var failedScenario = [];
+ var scenarios = test.scenarios;
+ var testFunc = test.func;
+ try {
+ for (var i = 0; i < 10000; i++) {
+ for (var scenarioID = 0; scenarioID < scenarios.length; scenarioID++) {
+ var scenario = scenarios[scenarioID];
+ if (verbose)
+ print("Testing " + test.name + ":" + scenario.name + " on iteration " + i + ": expecting " + scenario.expected);
+
+ var result = testFunc(scenario.x, scenario.y);
+ if (result == scenario.expected)
+ continue;
+ if (Number.isNaN(result) && Number.isNaN(scenario.expected))
+ continue;
+ if (!failedScenario[scenarioID]) {
+ errorReport += "FAIL: " + test.name + ":" + scenario.name + " started failing on iteration " + i + ": expected " + scenario.expected + ", actual " + result + "\n";
+ if (abortOnFirstFail)
+ throw errorReport;
+ failedScenario[scenarioID] = scenario;
+ }
+ }
+ }
+ } catch(e) {
+ if (abortOnFirstFail)
+ throw e; // Negate the catch by re-throwing.
+ errorReport += "Unexpected exception: " + e + "\n";
+ }
+}
+
+for (var test of testCases)
+ runTest(test);
+
+if (errorReport !== "")
+ throw "Error: bad result:\n" + errorReport;
</ins></span></pre>
</div>
</div>
</body>
</html>