<!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>[192519] 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/192519">192519</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-17 11:41:27 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Support Doubles with B3's Sub.
https://bugs.webkit.org/show_bug.cgi?id=151322
Reviewed by Filip Pizlo.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::lower):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testSubImmArg32):
(JSC::B3::testSubArgDouble):
(JSC::B3::testSubArgsDouble):
(JSC::B3::testSubArgImmDouble):
(JSC::B3::testSubImmArgDouble):
(JSC::B3::testSubImmsDouble):
(JSC::B3::testBitAndArgs):
(JSC::B3::negativeZero):
(JSC::B3::posInfinity):
(JSC::B3::negInfinity):
(JSC::B3::doubleOperands):
(JSC::B3::run):
- Added RUN_UNARY and RUN_BINARY macros to auto generate permutations
of operands for the tests.
- Added SubDouble tests using the new macros.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192518 => 192519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-17 19:41:26 UTC (rev 192518)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-17 19:41:27 UTC (rev 192519)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-11-16 Mark Lam <mark.lam@apple.com>
+
+ [JSC] Support Doubles with B3's Sub.
+ https://bugs.webkit.org/show_bug.cgi?id=151322
+
+ Reviewed by Filip Pizlo.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/air/AirOpcode.opcodes:
+
+ * b3/testb3.cpp:
+ (JSC::B3::testSubImmArg32):
+ (JSC::B3::testSubArgDouble):
+ (JSC::B3::testSubArgsDouble):
+ (JSC::B3::testSubArgImmDouble):
+ (JSC::B3::testSubImmArgDouble):
+ (JSC::B3::testSubImmsDouble):
+ (JSC::B3::testBitAndArgs):
+ (JSC::B3::negativeZero):
+ (JSC::B3::posInfinity):
+ (JSC::B3::negInfinity):
+ (JSC::B3::doubleOperands):
+ (JSC::B3::run):
+ - Added RUN_UNARY and RUN_BINARY macros to auto generate permutations
+ of operands for the tests.
+ - Added SubDouble tests using the new macros.
+
</ins><span class="cx"> 2015-11-17 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] IteratedRegisterCoalescingAllocator's freeze can add zombie Tmps to our coloring algorithm
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192518 => 192519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-17 19:41:26 UTC (rev 192518)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-17 19:41:27 UTC (rev 192519)
</span><span class="lines">@@ -1255,7 +1255,7 @@
</span><span class="cx"> if (m_value->child(0)->isInt(0))
</span><span class="cx"> appendUnOp<Neg32, Neg64, Air::Oops>(m_value->child(1));
</span><span class="cx"> else
</span><del>- appendBinOp<Sub32, Sub64, Air::Oops>(m_value->child(0), m_value->child(1));
</del><ins>+ appendBinOp<Sub32, Sub64, SubDouble>(m_value->child(0), m_value->child(1));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (192518 => 192519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-17 19:41:26 UTC (rev 192518)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-17 19:41:27 UTC (rev 192519)
</span><span class="lines">@@ -93,6 +93,10 @@
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Imm, Tmp
</span><span class="cx">
</span><ins>+SubDouble U:F, UD:F
+ Tmp, Tmp
+ Addr, Tmp
+
</ins><span class="cx"> Neg32 UD:G
</span><span class="cx"> Tmp
</span><span class="cx"> Addr
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192518 => 192519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-17 19:41:26 UTC (rev 192518)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-17 19:41:27 UTC (rev 192519)
</span><span class="lines">@@ -42,8 +42,10 @@
</span><span class="cx"> #include "InitializeThreading.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><ins>+#include "PureNaN.h"
</ins><span class="cx"> #include "VM.h"
</span><span class="cx"> #include <cmath>
</span><ins>+#include <string>
</ins><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/NumberOfCores.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -552,6 +554,70 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc, b) == a - b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testSubArgDouble(double a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* value = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Sub, Origin(), value, value));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a - a));
+}
+
+void testSubArgsDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* valueB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Sub, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a, b), a - b));
+}
+
+void testSubArgImmDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* valueB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Sub, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a - b));
+}
+
+void testSubImmArgDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ConstDoubleValue>(proc, Origin(), a);
+ Value* valueB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Sub, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, b), a - b));
+}
+
+void testSubImmsDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ConstDoubleValue>(proc, Origin(), a);
+ Value* valueB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Sub, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc), a - b));
+}
+
</ins><span class="cx"> void testBitAndArgs(int64_t a, int64_t b)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -4167,6 +4233,39 @@
</span><span class="cx"> return -zero();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Some convenience functions for brevity of the test output.
+double posInfinity()
+{
+ return std::numeric_limits<double>::infinity();
+}
+
+double negInfinity()
+{
+ return -std::numeric_limits<double>::infinity();
+}
+
+
+struct DoubleOperand {
+ const char* name;
+ double value;
+};
+
+static const std::array<DoubleOperand, 9>& doubleOperands()
+{
+ static const std::array<DoubleOperand, 9> operands = {{
+ { "M_PI", M_PI },
+ { "-M_PI", -M_PI },
+ { "1", 1 },
+ { "-1", -1 },
+ { "0", 0 },
+ { "negativeZero()", negativeZero() },
+ { "posInfinity()", posInfinity() },
+ { "negInfinity()", negInfinity() },
+ { "PNaN", PNaN },
+ }};
+ return operands;
+};
+
</ins><span class="cx"> #define RUN(test) do { \
</span><span class="cx"> if (!shouldRun(#test)) \
</span><span class="cx"> break; \
</span><span class="lines">@@ -4179,6 +4278,34 @@
</span><span class="cx"> })); \
</span><span class="cx"> } while (false);
</span><span class="cx">
</span><ins>+#define RUN_UNARY(test, values) \
+ for (auto a : values) { \
+ CString testStr = toCString(#test, "(", a.name, ")"); \
+ if (!shouldRun(testStr.data())) \
+ continue; \
+ tasks.append(createSharedTask<void()>( \
+ [=] () { \
+ dataLog(testStr, "...\n"); \
+ test(a.value); \
+ dataLog(testStr, ": OK!\n"); \
+ })); \
+ }
+
+#define RUN_BINARY(test, valuesA, valuesB) \
+ for (auto a : valuesA) { \
+ for (auto b : valuesB) { \
+ CString testStr = toCString(#test, "(", a.name, ", ", b.name, ")"); \
+ if (!shouldRun(testStr.data())) \
+ continue; \
+ tasks.append(createSharedTask<void()>( \
+ [=] () { \
+ dataLog(testStr, "...\n"); \
+ test(a.value, b.value); \
+ dataLog(testStr, ": OK!\n"); \
+ })); \
+ } \
+ }
+
</ins><span class="cx"> void run(const char* filter)
</span><span class="cx"> {
</span><span class="cx"> JSC::initializeThreading();
</span><span class="lines">@@ -4321,6 +4448,12 @@
</span><span class="cx"> RUN(testSubImmArg32(13, -42));
</span><span class="cx"> RUN(testSubImmArg32(-13, 42));
</span><span class="cx">
</span><ins>+ RUN_UNARY(testSubArgDouble, doubleOperands());
+ RUN_BINARY(testSubArgsDouble, doubleOperands(), doubleOperands());
+ RUN_BINARY(testSubArgImmDouble, doubleOperands(), doubleOperands());
+ RUN_BINARY(testSubImmArgDouble, doubleOperands(), doubleOperands());
+ RUN_BINARY(testSubImmsDouble, doubleOperands(), doubleOperands());
+
</ins><span class="cx"> RUN(testBitAndArgs(43, 43));
</span><span class="cx"> RUN(testBitAndArgs(43, 0));
</span><span class="cx"> RUN(testBitAndArgs(10, 3));
</span></span></pre>
</div>
</div>
</body>
</html>