<!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>[192664] 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/192664">192664</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 15:32:09 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create correctness tests for binary snippet operators.
https://bugs.webkit.org/show_bug.cgi?id=151465
Reviewed by Geoffrey Garen.
Implement a common infrastructure for generating and running tests on binary
operators. Also re-implemented the op_add, op_sub, and op_mul tests to be based
on this new infrastructure.
* tests/stress/op_add.js:
* tests/stress/op_mul.js:
* tests/stress/op_sub.js:
- These were reimplemented using binary-op-test.js.
* tests/stress/op_div.js: Added.
* tests/stress/op_mod.js: Added.
* tests/stress/op_bitand.js: Added.
* tests/stress/op_bitor.js: Added.
* tests/stress/op_bitxor.js: Added.
* tests/stress/op_lshift.js: Added.
* tests/stress/op_rshift.js: Added.
* tests/stress/op_urshift.js: Added.
* tests/stress/resources/binary-op-test.js: Added.
- Common code for generating and running tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_addjs">trunk/Source/JavaScriptCore/tests/stress/op_add.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_muljs">trunk/Source/JavaScriptCore/tests/stress/op_mul.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_subjs">trunk/Source/JavaScriptCore/tests/stress/op_sub.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_bitandjs">trunk/Source/JavaScriptCore/tests/stress/op_bitand.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_bitorjs">trunk/Source/JavaScriptCore/tests/stress/op_bitor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_bitxorjs">trunk/Source/JavaScriptCore/tests/stress/op_bitxor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_divjs">trunk/Source/JavaScriptCore/tests/stress/op_div.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_lshiftjs">trunk/Source/JavaScriptCore/tests/stress/op_lshift.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_modjs">trunk/Source/JavaScriptCore/tests/stress/op_mod.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_rshiftjs">trunk/Source/JavaScriptCore/tests/stress/op_rshift.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_urshiftjs">trunk/Source/JavaScriptCore/tests/stress/op_urshift.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressresourcesbinaryoptestjs">trunk/Source/JavaScriptCore/tests/stress/resources/binary-op-test.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192663 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 23:14:55 UTC (rev 192663)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-11-19 Mark Lam <mark.lam@apple.com>
+
+ Create correctness tests for binary snippet operators.
+ https://bugs.webkit.org/show_bug.cgi?id=151465
+
+ Reviewed by Geoffrey Garen.
+
+ Implement a common infrastructure for generating and running tests on binary
+ operators. Also re-implemented the op_add, op_sub, and op_mul tests to be based
+ on this new infrastructure.
+
+ * tests/stress/op_add.js:
+ * tests/stress/op_mul.js:
+ * tests/stress/op_sub.js:
+ - These were reimplemented using binary-op-test.js.
+
+ * tests/stress/op_div.js: Added.
+ * tests/stress/op_mod.js: Added.
+
+ * tests/stress/op_bitand.js: Added.
+ * tests/stress/op_bitor.js: Added.
+ * tests/stress/op_bitxor.js: Added.
+
+ * tests/stress/op_lshift.js: Added.
+ * tests/stress/op_rshift.js: Added.
+ * tests/stress/op_urshift.js: Added.
+
+ * tests/stress/resources/binary-op-test.js: Added.
+ - Common code for generating and running tests.
+
</ins><span class="cx"> 2015-11-19 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Fix AssignmentElement parsing
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_addjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/op_add.js (192663 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_add.js 2015-11-19 23:14:55 UTC (rev 192663)
+++ trunk/Source/JavaScriptCore/tests/stress/op_add.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -1,363 +1,63 @@
</span><span class="cx"> //@ runFTLNoCJIT
</span><span class="cx">
</span><del>-// 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.
-//
</del><span class="cx"> // If all goes well, this test module will terminate silently. If not, it will print
</span><del>-// errors.
</del><ins>+// errors. See binary-op-test.js for debugging options if needed.
</ins><span class="cx">
</span><del>-var verbose = false;
-var abortOnFirstFail = false;
</del><ins>+load("./resources/binary-op-test.js");
</ins><span class="cx">
</span><ins>+//============================================================================
+// Test configuration data:
+
+var opName = "add";
+var op = "+";
+
</ins><span class="cx"> var o1 = {
</span><span class="cx"> valueOf: function() { return 10; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-var set1 = [
</del><ins>+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
</ins><span class="cx"> 'o1',
</span><span class="cx"> 'null',
</span><span class="cx"> 'undefined',
</span><del>- 'NaN',
- '"abc"',
-];
-
-var set2 = [
- '10',
- '-10',
- '2147483647',
- '-2147483647',
- '4294967296',
- '-4294967296',
- '100.2',
- '-100.2',
</del><span class="cx"> 'true',
</span><span class="cx"> 'false',
</span><del>-];
</del><span class="cx">
</span><del>-// 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] + '"');
</del><ins>+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
</ins><span class="cx">
</span><del>-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 };
</del><ins>+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
</ins><span class="cx">
</span><del>- 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' ]
- },
</del><ins>+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
</ins><span class="cx"> ];
</span><span class="cx">
</span><del>-function initializeTestCases() {
- for (var test of testCases) {
- noInline(test.func);
- test.scenarios = generateScenarios(test.xvalues, test.yvalues);
- }
-}
-initializeTestCases();
</del><ins>+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
</ins><span class="cx">
</span><del>-var errorReport = "";
-
-function stringifyIfNeeded(x) {
- if (typeof x == "string")
- return '"' + x + '"';
- return x;
-}
-
-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 " + stringifyIfNeeded(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 " + stringifyIfNeeded(scenario.expected) + ", actual " + stringifyIfNeeded(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;
</del><ins>+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_bitandjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_bitand.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_bitand.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_bitand.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "bitand";
+var op = "&";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0xa5a5a5a5',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0xa5a5a5a5"',
+ '"0x100000000"',
+ '"-0x100000000"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_bitorjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_bitor.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_bitor.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_bitor.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "bitor";
+var op = "|";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0xa5a5a5a5',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0xa5a5a5a5"',
+ '"0x100000000"',
+ '"-0x100000000"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_bitxorjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_bitxor.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_bitxor.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_bitxor.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "bitxor";
+var op = "^";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0xa5a5a5a5',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0xa5a5a5a5"',
+ '"0x100000000"',
+ '"-0x100000000"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_divjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_div.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_div.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_div.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "div";
+var op = "/";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x3fff"',
+ '"-0x3fff"',
+ '"0x7fff"',
+ '"-0x7fff"',
+ '"0x10000"',
+ '"-0x10000"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0x100000000"',
+ '"-0x100000000"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_lshiftjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_lshift.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_lshift.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_lshift.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "lshift";
+var op = "<<";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '5',
+ '-5',
+ '31',
+ '-31',
+ '32',
+ '-32',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"5"',
+ '"-5"',
+ '"31"',
+ '"-31"',
+ '"32"',
+ '"-32"',
+ '"0x3fff"',
+ '"-0x3fff"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_modjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_mod.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_mod.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_mod.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "mod";
+var op = "%";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x3fff"',
+ '"-0x3fff"',
+ '"0x7fff"',
+ '"-0x7fff"',
+ '"0x10000"',
+ '"-0x10000"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0x100000000"',
+ '"-0x100000000"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_muljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/op_mul.js (192663 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_mul.js 2015-11-19 23:14:55 UTC (rev 192663)
+++ trunk/Source/JavaScriptCore/tests/stress/op_mul.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -1,27 +1,16 @@
</span><span class="cx"> //@ runFTLNoCJIT
</span><span class="cx">
</span><del>-// This test module aims to test the multiplication 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 multiplication operator. It computes the expected results by evaluating an
-// expression to multiply 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.
-//
</del><span class="cx"> // If all goes well, this test module will terminate silently. If not, it will print
</span><del>-// errors.
</del><ins>+// errors. See binary-op-test.js for debugging options if needed.
</ins><span class="cx">
</span><del>-var verbose = false;
-var abortOnFirstFail = false;
</del><ins>+load("./resources/binary-op-test.js");
</ins><span class="cx">
</span><ins>+//============================================================================
+// Test configuration data:
+
+var opName = "mul";
+var op = "*";
+
</ins><span class="cx"> var o1 = {
</span><span class="cx"> valueOf: function() { return 10; }
</span><span class="cx"> };
</span><span class="lines">@@ -29,17 +18,21 @@
</span><span class="cx"> var posInfinity = 1 / 0;
</span><span class="cx"> var negInfinity = -1 / 0;
</span><span class="cx">
</span><del>-var set1 = [
</del><ins>+var values = [
</ins><span class="cx"> 'o1',
</span><span class="cx"> 'null',
</span><span class="cx"> 'undefined',
</span><ins>+ 'true',
+ 'false',
+
</ins><span class="cx"> 'NaN',
</span><span class="cx"> 'posInfinity',
</span><span class="cx"> 'negInfinity',
</span><del>- '"abc"',
-];
</del><ins>+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
</ins><span class="cx">
</span><del>-var set2 = [
</del><span class="cx"> '0',
</span><span class="cx"> '-0',
</span><span class="cx"> '1',
</span><span class="lines">@@ -50,337 +43,31 @@
</span><span class="cx"> '-0x7fff',
</span><span class="cx"> '0x10000',
</span><span class="cx"> '-0x10000',
</span><del>- '2147483647',
- '-2147483647',
- '4294967296',
- '-4294967296',
- '100.2',
- '-100.2',
- 'true',
- 'false',
-];
</del><ins>+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
</ins><span class="cx">
</span><del>-// 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: "mul",
- func: function(x, y) { return x * y; },
- xvalues: values,
- yvalues: values
- },
- {
- name: "mulI32V",
- func: function(x, y) { return 1 * y; },
- xvalues: [ '1' ],
- yvalues: values
- },
- {
- name: "mulVI32",
- func: function(x, y) { return x * 1; },
- xvalues: values,
- yvalues: [ '1' ]
- },
- {
- name: "mulI32oV",
- func: function(x, y) { return 2147483647 * y; },
- xvalues: [ '2147483647' ],
- yvalues: values
- },
- {
- name: "mulVI32o",
- func: function(x, y) { return x * 2147483647; },
- xvalues: values,
- yvalues: [ '2147483647' ]
- },
- {
- name: "mulI32onV",
- func: function(x, y) { return -2147483647 * y; },
- xvalues: [ '-2147483647' ],
- yvalues: values
- },
- {
- name: "mulVI32on",
- func: function(x, y) { return x * (-2147483647); },
- xvalues: values,
- yvalues: [ '-2147483647' ]
- },
- {
- name: "mulI52V",
- func: function(x, y) { return 4294967296 * y; },
- xvalues: [ '4294967296' ],
- yvalues: values
- },
- {
- name: "mulVI52",
- func: function(x, y) { return x * 4294967296; },
- xvalues: values,
- yvalues: [ '4294967296' ]
- },
- {
- name: "mulI52nV",
- func: function(x, y) { return -4294967296 * y; },
- xvalues: [ '-4294967296' ],
- yvalues: values
- },
- {
- name: "mulVI52n",
- func: function(x, y) { return x * (-4294967296); },
- xvalues: values,
- yvalues: [ '-4294967296' ]
- },
- {
- name: "mulDV",
- func: function(x, y) { return 100.2 * y; },
- xvalues: [ '100.2' ],
- yvalues: values
- },
- {
- name: "mulVD",
- func: function(x, y) { return x * 100.2; },
- xvalues: values,
- yvalues: [ '100.2' ]
- },
- {
- name: "mulBV",
- func: function(x, y) { return true * y; },
- xvalues: [ 'true' ],
- yvalues: values
- },
- {
- name: "mulVB",
- func: function(x, y) { return x * true; },
- xvalues: values,
- yvalues: [ 'true' ]
- },
- {
- name: "mulSi32V",
- func: function(x, y) { return "10" * y; },
- xvalues: [ '"10"' ],
- yvalues: values
- },
- {
- name: "mulVSi32",
- func: function(x, y) { return x * "10"; },
- xvalues: values,
- yvalues: [ '"10"' ]
- },
-
- {
- name: "mulSi32oV",
- func: function(x, y) { return "2147483647" * y; },
- xvalues: [ '"2147483647"' ],
- yvalues: values
- },
- {
- name: "mulVSi32o",
- func: function(x, y) { return x * "2147483647"; },
- xvalues: values,
- yvalues: [ '"2147483647"' ]
- },
- {
- name: "mulSi32onV",
- func: function(x, y) { return "-2147483647" * y; },
- xvalues: [ '"-2147483647"' ],
- yvalues: values
- },
- {
- name: "mulVSi32on",
- func: function(x, y) { return x * "-2147483647"; },
- xvalues: values,
- yvalues: [ '"-2147483647"' ]
- },
- {
- name: "mulSi52V",
- func: function(x, y) { return "4294967296" * y; },
- xvalues: [ '"4294967296"' ],
- yvalues: values
- },
- {
- name: "mulVSi52",
- func: function(x, y) { return x * "4294967296"; },
- xvalues: values,
- yvalues: [ '"4294967296"' ]
- },
- {
- name: "mulSi52nV",
- func: function(x, y) { return "-4294967296" * y; },
- xvalues: [ '"-4294967296"' ],
- yvalues: values
- },
- {
- name: "mulVSi52n",
- func: function(x, y) { return x * "-4294967296"; },
- xvalues: values,
- yvalues: [ '"-4294967296"' ]
- },
- {
- name: "mulSdV",
- func: function(x, y) { return "100.2" * y; },
- xvalues: [ '"100.2"' ],
- yvalues: values
- },
- {
- name: "mulVSd",
- func: function(x, y) { return x * "100.2"; },
- xvalues: values,
- yvalues: [ '"100.2"' ]
- },
- {
- name: "mulSbV",
- func: function(x, y) { return "true" * y; },
- xvalues: [ '"true"' ],
- yvalues: values
- },
- {
- name: "mulVSb",
- func: function(x, y) { return x * "true"; },
- xvalues: values,
- yvalues: [ '"true"' ]
- },
-
- {
- name: "mulSV",
- func: function(x, y) { return "abc" * y; },
- xvalues: [ '"abc"' ],
- yvalues: values
- },
- {
- name: "mulVS",
- func: function(x, y) { return x * "abc"; },
- xvalues: values,
- yvalues: [ '"abc"' ]
- },
- {
- name: "mulNV",
- func: function(x, y) { return null * y; },
- xvalues: [ 'null' ],
- yvalues: values
- },
- {
- name: "mulVN",
- func: function(x, y) { return x * null; },
- xvalues: values,
- yvalues: [ 'null' ]
- },
- {
- name: "mulOV",
- func: function(x, y) { return o1 * y; },
- xvalues: [ 'o1' ],
- yvalues: values
- },
- {
- name: "mulVO",
- func: function(x, y) { return x * o1; },
- xvalues: values,
- yvalues: [ 'o1' ]
- },
- {
- name: "mulNaNV",
- func: function(x, y) { return NaN * y; },
- xvalues: [ 'NaN' ],
- yvalues: values
- },
- {
- name: "mulVNaN",
- func: function(x, y) { return x * NaN; },
- xvalues: values,
- yvalues: [ 'NaN' ]
- },
</del><ins>+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x3fff"',
+ '"-0x3fff"',
+ '"0x7fff"',
+ '"-0x7fff"',
+ '"0x10000"',
+ '"-0x10000"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0x100000000"',
+ '"-0x100000000"',
</ins><span class="cx"> ];
</span><span class="cx">
</span><del>-function initializeTestCases() {
- for (var test of testCases) {
- noInline(test.func);
- test.scenarios = generateScenarios(test.xvalues, test.yvalues);
- }
-}
-initializeTestCases();
</del><ins>+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
</ins><span class="cx">
</span><del>-var errorReport = "";
-
-function stringifyIfNeeded(x) {
- if (typeof x == "string")
- return '"' + x + '"';
- return x;
-}
-
-function isIdentical(x, y) {
- if (x == y) {
- if (x)
- return true;
- // Distinguish between 0 and negative 0.
- if (1 / x == 1 / y)
- return true;
- } else if (Number.isNaN(x) && Number.isNaN(y))
- return true;
- return false;
-}
-
-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 " + stringifyIfNeeded(scenario.expected));
-
- var result = testFunc(scenario.x, scenario.y);
- if (isIdentical(result, scenario.expected))
- continue;
- if (!failedScenario[scenarioID]) {
- errorReport += "FAIL: " + test.name + ":" + scenario.name + " started failing on iteration " + i
- + ": expected " + stringifyIfNeeded(scenario.expected) + ", actual " + stringifyIfNeeded(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;
</del><ins>+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_rshiftjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_rshift.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_rshift.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_rshift.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "rshift";
+var op = ">>";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '5',
+ '-5',
+ '31',
+ '-31',
+ '32',
+ '-32',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"5"',
+ '"-5"',
+ '"31"',
+ '"-31"',
+ '"32"',
+ '"-32"',
+ '"0x3fff"',
+ '"-0x3fff"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_subjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/op_sub.js (192663 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_sub.js 2015-11-19 23:14:55 UTC (rev 192663)
+++ trunk/Source/JavaScriptCore/tests/stress/op_sub.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -1,308 +1,73 @@
</span><span class="cx"> //@ runFTLNoCJIT
</span><span class="cx">
</span><del>-// This test module aims to test the subtraction 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 subtraction operator. It computes the expected results by evaluating an expression
-// to subtract 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.
-//
</del><span class="cx"> // If all goes well, this test module will terminate silently. If not, it will print
</span><del>-// errors.
</del><ins>+// errors. See binary-op-test.js for debugging options if needed.
</ins><span class="cx">
</span><del>-var verbose = false;
-var abortOnFirstFail = false;
</del><ins>+load("./resources/binary-op-test.js");
</ins><span class="cx">
</span><ins>+//============================================================================
+// Test configuration data:
+
+var opName = "sub";
+var op = "-";
+
</ins><span class="cx"> var o1 = {
</span><span class="cx"> valueOf: function() { return 10; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-var set1 = [
</del><ins>+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
</ins><span class="cx"> 'o1',
</span><span class="cx"> 'null',
</span><span class="cx"> 'undefined',
</span><del>- 'NaN',
- '"abc"',
-];
-
-var set2 = [
- '10',
- '-10',
- '2147483647',
- '-2147483647',
- '4294967296',
- '-4294967296',
- '100.2',
- '-100.2',
</del><span class="cx"> 'true',
</span><span class="cx"> 'false',
</span><del>-];
</del><span class="cx">
</span><del>-// 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] + '"');
</del><ins>+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
</ins><span class="cx">
</span><del>-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 };
</del><ins>+ '0',
+ '-0',
+ '1',
+ '-1',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
</ins><span class="cx">
</span><del>- 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: "sub",
- func: function(x, y) { return x - y; },
- xvalues: values,
- yvalues: values
- },
- {
- name: "subI32V",
- func: function(x, y) { return 10 - y; },
- xvalues: [ '10' ],
- yvalues: values
- },
- {
- name: "subVI32",
- func: function(x, y) { return x - 10; },
- xvalues: values,
- yvalues: [ '10' ]
- },
- {
- name: "subI32oV",
- func: function(x, y) { return -2147483647 - y; },
- xvalues: [ '-2147483647' ],
- yvalues: values
- },
- {
- name: "subVI32o",
- func: function(x, y) { return x - 2147483647; },
- xvalues: values,
- yvalues: [ '2147483647' ]
- },
- {
- name: "subI52V",
- func: function(x, y) { return 4294967296 - y; },
- xvalues: [ '4294967296' ],
- yvalues: values
- },
- {
- name: "subVI52",
- func: function(x, y) { return x - 4294967296; },
- xvalues: values,
- yvalues: [ '4294967296' ]
- },
- {
- name: "subDV",
- func: function(x, y) { return 100.2 - y; },
- xvalues: [ '100.2' ],
- yvalues: values
- },
- {
- name: "subVD",
- func: function(x, y) { return x - 100.2; },
- xvalues: values,
- yvalues: [ '100.2' ]
- },
- {
- name: "subBV",
- func: function(x, y) { return true - y; },
- xvalues: [ 'true' ],
- yvalues: values
- },
- {
- name: "subVB",
- func: function(x, y) { return x - true; },
- xvalues: values,
- yvalues: [ 'true' ]
- },
- {
- name: "subSi32V",
- func: function(x, y) { return "10" - y; },
- xvalues: [ '"10"' ],
- yvalues: values
- },
- {
- name: "subVSi32",
- func: function(x, y) { return x - "10"; },
- xvalues: values,
- yvalues: [ '"10"' ]
- },
-
- {
- name: "subSi32oV",
- func: function(x, y) { return "-2147483647" - y; },
- xvalues: [ '"-2147483647"' ],
- yvalues: values
- },
- {
- name: "subVSi32o",
- func: function(x, y) { return x - "2147483647"; },
- xvalues: values,
- yvalues: [ '"2147483647"' ]
- },
- {
- name: "subSi52V",
- func: function(x, y) { return "4294967296" - y; },
- xvalues: [ '"4294967296"' ],
- yvalues: values
- },
- {
- name: "subVSi52",
- func: function(x, y) { return x - "4294967296"; },
- xvalues: values,
- yvalues: [ '"4294967296"' ]
- },
- {
- name: "subSdV",
- func: function(x, y) { return "100.2" - y; },
- xvalues: [ '"100.2"' ],
- yvalues: values
- },
- {
- name: "subVSd",
- func: function(x, y) { return x - "100.2"; },
- xvalues: values,
- yvalues: [ '"100.2"' ]
- },
- {
- name: "subSbV",
- func: function(x, y) { return "true" - y; },
- xvalues: [ '"true"' ],
- yvalues: values
- },
- {
- name: "subVSb",
- func: function(x, y) { return x - "true"; },
- xvalues: values,
- yvalues: [ '"true"' ]
- },
-
- {
- name: "subSV",
- func: function(x, y) { return "abc" - y; },
- xvalues: [ '"abc"' ],
- yvalues: values
- },
- {
- name: "subVS",
- func: function(x, y) { return x - "abc"; },
- xvalues: values,
- yvalues: [ '"abc"' ]
- },
- {
- name: "subNV",
- func: function(x, y) { return null - y; },
- xvalues: [ 'null' ],
- yvalues: values
- },
- {
- name: "subVN",
- func: function(x, y) { return x - null; },
- xvalues: values,
- yvalues: [ 'null' ]
- },
- {
- name: "subOV",
- func: function(x, y) { return o1 - y; },
- xvalues: [ 'o1' ],
- yvalues: values
- },
- {
- name: "subVO",
- func: function(x, y) { return x - o1; },
- xvalues: values,
- yvalues: [ 'o1' ]
- },
- {
- name: "subNaNV",
- func: function(x, y) { return NaN - y; },
- xvalues: [ 'NaN' ],
- yvalues: values
- },
- {
- name: "subVNaN",
- func: function(x, y) { return x - NaN; },
- xvalues: values,
- yvalues: [ 'NaN' ]
- },
</del><ins>+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"0x3fff"',
+ '"-0x3fff"',
+ '"0x7fff"',
+ '"-0x7fff"',
+ '"0x10000"',
+ '"-0x10000"',
+ '"0x7ffffff"',
+ '"-0x7ffffff"',
+ '"0x100000000"',
+ '"-0x100000000"',
</ins><span class="cx"> ];
</span><span class="cx">
</span><del>-function initializeTestCases() {
- for (var test of testCases) {
- noInline(test.func);
- test.scenarios = generateScenarios(test.xvalues, test.yvalues);
- }
-}
-initializeTestCases();
</del><ins>+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
</ins><span class="cx">
</span><del>-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;
</del><ins>+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_urshiftjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op_urshift.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_urshift.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op_urshift.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+//@ runFTLNoCJIT
+
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors. See binary-op-test.js for debugging options if needed.
+
+load("./resources/binary-op-test.js");
+
+//============================================================================
+// Test configuration data:
+
+var opName = "urshift";
+var op = ">>>";
+
+var o1 = {
+ valueOf: function() { return 10; }
+};
+
+var posInfinity = 1 / 0;
+var negInfinity = -1 / 0;
+
+var values = [
+ 'o1',
+ 'null',
+ 'undefined',
+ 'true',
+ 'false',
+
+ 'NaN',
+ 'posInfinity',
+ 'negInfinity',
+ '100.2', // Some random small double value.
+ '-100.2',
+ '54294967296.2923', // Some random large double value.
+ '-54294967296.2923',
+
+ '0',
+ '-0',
+ '1',
+ '-1',
+ '5',
+ '-5',
+ '31',
+ '-31',
+ '32',
+ '-32',
+ '0x3fff',
+ '-0x3fff',
+ '0x7fff',
+ '-0x7fff',
+ '0x10000',
+ '-0x10000',
+ '0x7ffffff',
+ '-0x7ffffff',
+ '0x100000000',
+ '-0x100000000',
+
+ '"abc"',
+ '"0"',
+ '"-0"',
+ '"1"',
+ '"-1"',
+ '"5"',
+ '"-5"',
+ '"31"',
+ '"-31"',
+ '"32"',
+ '"-32"',
+ '"0x3fff"',
+ '"-0x3fff"',
+];
+
+tests = [];
+generateBinaryTests(tests, opName, op, "VarVar", values, values);
+generateBinaryTests(tests, opName, op, "VarConst", values, values);
+generateBinaryTests(tests, opName, op, "ConstVar", values, values);
+
+run();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressresourcesbinaryoptestjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/resources/binary-op-test.js (0 => 192664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/resources/binary-op-test.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/resources/binary-op-test.js 2015-11-19 23:32:09 UTC (rev 192664)
</span><span class="lines">@@ -0,0 +1,131 @@
</span><ins>+// This test module provides infrastructure for generating and running tests on a binary
+// operator.
+//
+// It works by generating test functions to exercise the specified operator using
+// from permutations of operand value pairs. For each test, it computes the expected
+// result by exercising the test function once (using the LLINT) at test generation time.
+// The test runner later compares the result produced by the function (as it tiers up)
+// against the expected result.
+//
+// The generated tests can exercise the operator using the following operand types.
+// variable * variable
+// constant * variable
+// variable * constant
+//
+// If all goes well, this test module will terminate silently. If not, it will print
+// errors.
+
+//============================================================================
+// Debugging options:
+
+var verbose = false;
+var abortOnFirstFail = false;
+var testFilterStr = undefined; // Define a filter string to filter tests to run.
+
+var verboseTestGeneration = false;
+
+//============================================================================
+// Test generation:
+
+function stringifyIfNeeded(x) {
+ if (typeof x == "string")
+ return '"' + x + '"';
+ return x;
+}
+
+// operandTypes are "VarVar", "VarConst", and "ConstVar".
+function generateBinaryTests(tests, opName, op, operandTypes, leftValues, rightValues) {
+ var funcName = opName + operandTypes;
+ for (var i = 0; i < leftValues.length; i++) {
+ for (var j = 0; j < rightValues.length; j++) {
+ var test = { };
+ xStr = leftValues[i];
+ yStr = rightValues[j];
+ test.x = eval(xStr);
+ test.y = eval(yStr);
+
+ if (operandTypes == "VarVar") {
+ test.signature = funcName + "(x, y) { return x " + op + " y }";
+ test.name = test.signature + " with x:" + xStr + ", y:" + yStr;
+ } else if (operandTypes == "VarConst") {
+ test.signature = funcName + "(x, _) { return x " + op + " " + yStr + " }";
+ test.name = test.signature + " with x:" + xStr;
+ } else if (operandTypes == "ConstVar") {
+ test.signature = funcName + "(_, y) { return " + xStr + " " + op + " y }";
+ test.name = test.signature + " with y:" + yStr;
+ }
+
+ test.func = eval("(function " + test.signature + ")");
+ noInline(test.func);
+
+ test.expectedResult = test.func(test.x, test.y);
+ test.name += ", expected:" + stringifyIfNeeded(test.expectedResult);
+
+ tests.push(test);
+ if (verboseTestGeneration)
+ print("Generated " + test.name);
+ }
+ }
+}
+
+//============================================================================
+// Test running and reporting:
+
+var errorReport = "";
+
+function isIdentical(x, y) {
+ if (typeof x != typeof y)
+ return false;
+ if (x == y) {
+ if (x)
+ return true;
+ // Distinguish between 0 and negative 0.
+ if (1 / x == 1 / y)
+ return true;
+ } else if (Number.isNaN(x) && Number.isNaN(y))
+ return true;
+ return false;
+}
+
+function runTest(test) {
+ if (testFilterStr && !test.name.includes(testFilterStr))
+ return;
+
+ var firstFailed = -1;
+ try {
+ if (verbose)
+ print(test.name);
+ for (var i = 0; i < 10000; i++) {
+ var result = test.func(test.x, test.y);
+ if (isIdentical(result, test.expectedResult))
+ continue;
+ if (firstFailed < 0) {
+ errorReport += "FAILED: " + test.name + " started failing on iteration " + i
+ + ": actual " + stringifyIfNeeded(result) + "\n";
+ if (abortOnFirstFail)
+ throw errorReport;
+ firstFailed = i;
+ }
+ }
+ } catch(e) {
+ if (abortOnFirstFail)
+ throw e; // Negate the catch by re-throwing.
+ errorReport += "FAILED: Unexpected exception: " + e + "\n";
+ }
+}
+
+function run() {
+ if (verbose)
+ print("Start testing");
+
+ for (var test of tests)
+ runTest(test);
+ // for (var i = 0; i < tests.length; i++)
+ // runTest(tests[i]);
+
+ if (errorReport !== "")
+ throw "Found failures:\n" + errorReport;
+
+ if (verbose)
+ print("Done testing");
+}
</ins></span></pre>
</div>
</div>
</body>
</html>