<!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>[192347] 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/192347">192347</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-11 21:12:20 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Support Doubles with B3's Add
https://bugs.webkit.org/show_bug.cgi?id=151164
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-11-11
Reviewed by Filip Pizlo.
I tweaked ReduceStrength a bit to maintain correctness.
Nothing fancy otherwise.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::lower):
* b3/B3ReduceStrength.cpp:
* b3/B3Value.h:
* b3/B3ValueInlines.h:
(JSC::B3::Value::isInteger):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::bitWiseEqual):
(JSC::B3::testAddArgDouble):
(JSC::B3::testAddArgsDouble):
(JSC::B3::testAddArgImmDouble):
(JSC::B3::testAddImmArgDouble):
(JSC::B3::testAddImmsDouble):
(JSC::B3::run):</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="#trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp">trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valueh">trunk/Source/JavaScriptCore/b3/B3Value.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ValueInlinesh">trunk/Source/JavaScriptCore/b3/B3ValueInlines.h</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 (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-11-11 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Support Doubles with B3's Add
+ https://bugs.webkit.org/show_bug.cgi?id=151164
+
+ Reviewed by Filip Pizlo.
+
+ I tweaked ReduceStrength a bit to maintain correctness.
+ Nothing fancy otherwise.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/B3ReduceStrength.cpp:
+ * b3/B3Value.h:
+ * b3/B3ValueInlines.h:
+ (JSC::B3::Value::isInteger):
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::bitWiseEqual):
+ (JSC::B3::testAddArgDouble):
+ (JSC::B3::testAddArgsDouble):
+ (JSC::B3::testAddArgImmDouble):
+ (JSC::B3::testAddImmArgDouble):
+ (JSC::B3::testAddImmsDouble):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2015-11-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3 should be able to compile a program with Switch
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -1218,9 +1218,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case Add: {
</span><del>- // FIXME: Need a story for doubles.
- // https://bugs.webkit.org/show_bug.cgi?id=150991
- appendBinOp<Add32, Add64, Air::Oops, Commutative>(
</del><ins>+ appendBinOp<Add32, Add64, AddDouble, Commutative>(
</ins><span class="cx"> m_value->child(0), m_value->child(1));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -156,10 +156,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Turn this: Add(value, value)
</del><ins>+ // Turn this: Integer Add(value, value)
</ins><span class="cx"> // Into this: Shl(value, 1)
</span><span class="cx"> // This is a useful canonicalization. It's not meant to be a strength reduction.
</span><del>- if (m_value->child(0) == m_value->child(1)) {
</del><ins>+ if (m_value->isInteger() && m_value->child(0) == m_value->child(1)) {
</ins><span class="cx"> replaceWithNewValue(
</span><span class="cx"> m_proc.add<Value>(
</span><span class="cx"> Shl, m_value->origin(), m_value->child(0),
</span><span class="lines">@@ -169,7 +169,13 @@
</span><span class="cx">
</span><span class="cx"> // Turn this: Add(value, zero)
</span><span class="cx"> // Into an Identity.
</span><del>- if (m_value->child(1)->isInt(0)) {
</del><ins>+ //
+ // Addition is subtle with doubles. Zero is not the neutral value, negative zero is:
+ // 0 + 0 = 0
+ // 0 + -0 = 0
+ // -0 + 0 = 0
+ // -0 + -0 = -0
+ if (m_value->child(1)->isInt(0) || m_value->child(1)->isNegativeZero()) {
</ins><span class="cx"> m_value->replaceWithIdentity(m_value->child(0));
</span><span class="cx"> m_changed = true;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.h (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.h        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/B3Value.h        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> // ourselves to any particular idiom.
</span><span class="cx">
</span><span class="cx"> bool isConstant() const;
</span><ins>+ bool isInteger() const;
</ins><span class="cx">
</span><span class="cx"> virtual Value* negConstant(Procedure&) const;
</span><span class="cx"> virtual Value* addConstant(Procedure&, int32_t other) const;
</span><span class="lines">@@ -167,6 +168,8 @@
</span><span class="cx"> // possible return values are 0 or 1. It's OK for this method to conservatively return false.
</span><span class="cx"> bool returnsBool() const;
</span><span class="cx">
</span><ins>+ bool isNegativeZero() const;
+
</ins><span class="cx"> TriState asTriState() const;
</span><span class="cx"> bool isLikeZero() const { return asTriState() == FalseTriState; }
</span><span class="cx"> bool isLikeNonZero() const { return asTriState() == TrueTriState; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ValueInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ValueInlines.h (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ValueInlines.h        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/B3ValueInlines.h        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool Value::isInteger() const
+{
+ return type() == Int32 || type() == Int64;
+}
+
</ins><span class="cx"> inline bool Value::hasInt32() const
</span><span class="cx"> {
</span><span class="cx"> return !!as<Const32Value>();
</span><span class="lines">@@ -148,6 +153,15 @@
</span><span class="cx"> return hasInt() || hasDouble();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool Value::isNegativeZero() const
+{
+ if (hasDouble()) {
+ double value = asDouble();
+ return !value && std::signbit(value);
+ }
+ return false;
+}
+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> inline bool Value::representableAs() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -132,6 +132,10 @@
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Imm, Tmp
</span><span class="cx">
</span><ins>+AddDouble U:F, UD:F
+ Tmp, Tmp
+ Addr, Tmp
+
</ins><span class="cx"> Lshift32 U:G, UD:G
</span><span class="cx"> Tmp*, Tmp
</span><span class="cx"> Imm, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192346 => 192347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp        2015-11-12 04:08:46 UTC (rev 192346)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp        2015-11-12 05:12:20 UTC (rev 192347)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="cx"> #include "VM.h"
</span><ins>+#include <cmath>
</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">@@ -226,6 +227,70 @@
</span><span class="cx"> test(1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testAddArgDouble(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, Add, Origin(), value, value));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a + a));
+}
+
+void testAddArgsDouble(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, Add, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a, b), a + b));
+}
+
+void testAddArgImmDouble(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, Add, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a + b));
+}
+
+void testAddImmArgDouble(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, Add, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, b), a + b));
+}
+
+void testAddImmsDouble(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, Add, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc), a + b));
+}
+
</ins><span class="cx"> void testMulArg(int a)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -3272,6 +3337,17 @@
</span><span class="cx"> CHECK(!invoke<int32_t>(*code, degree * gap + 1, 42, 11));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Make sure the compiler does not try to optimize anything out.
+NEVER_INLINE double zero()
+{
+ return 0.;
+}
+
+double negativeZero()
+{
+ return -zero();
+}
+
</ins><span class="cx"> #define RUN(test) do { \
</span><span class="cx"> if (!shouldRun(#test)) \
</span><span class="cx"> break; \
</span><span class="lines">@@ -3314,6 +3390,30 @@
</span><span class="cx"> RUN(testAddArgs32(1, 2));
</span><span class="cx"> RUN(testAddLoadTwice());
</span><span class="cx">
</span><ins>+ RUN(testAddArgDouble(M_PI));
+ RUN(testAddArgsDouble(M_PI, 1));
+ RUN(testAddArgsDouble(M_PI, -M_PI));
+ RUN(testAddArgImmDouble(M_PI, 1));
+ RUN(testAddArgImmDouble(M_PI, 0));
+ RUN(testAddArgImmDouble(M_PI, negativeZero()));
+ RUN(testAddArgImmDouble(0, 0));
+ RUN(testAddArgImmDouble(0, negativeZero()));
+ RUN(testAddArgImmDouble(negativeZero(), 0));
+ RUN(testAddArgImmDouble(negativeZero(), negativeZero()));
+ RUN(testAddImmArgDouble(M_PI, 1));
+ RUN(testAddImmArgDouble(M_PI, 0));
+ RUN(testAddImmArgDouble(M_PI, negativeZero()));
+ RUN(testAddImmArgDouble(0, 0));
+ RUN(testAddImmArgDouble(0, negativeZero()));
+ RUN(testAddImmArgDouble(negativeZero(), 0));
+ RUN(testAddImmArgDouble(negativeZero(), negativeZero()));
+ RUN(testAddImmsDouble(M_PI, 1));
+ RUN(testAddImmsDouble(M_PI, 0));
+ RUN(testAddImmsDouble(M_PI, negativeZero()));
+ RUN(testAddImmsDouble(0, 0));
+ RUN(testAddImmsDouble(0, negativeZero()));
+ RUN(testAddImmsDouble(negativeZero(), negativeZero()));
+
</ins><span class="cx"> RUN(testMulArg(5));
</span><span class="cx"> RUN(testMulArgs(1, 1));
</span><span class="cx"> RUN(testMulArgs(1, 2));
</span><span class="lines">@@ -3787,7 +3887,7 @@
</span><span class="cx"> RUN(testCallFunctionWithHellaArguments());
</span><span class="cx">
</span><span class="cx"> RUN(testReturnDouble(0.0));
</span><del>- RUN(testReturnDouble(-0.0));
</del><ins>+ RUN(testReturnDouble(negativeZero()));
</ins><span class="cx"> RUN(testReturnDouble(42.5));
</span><span class="cx">
</span><span class="cx"> RUN(testCallSimpleDouble(1, 2));
</span></span></pre>
</div>
</div>
</body>
</html>