<!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>[194314] 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/194314">194314</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-19 08:52:11 -0800 (Sat, 19 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Add EqualOrUnordered to B3
https://bugs.webkit.org/show_bug.cgi?id=152425
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-12-19
Reviewed by Mark Lam.
Add EqualOrUnordered to B3 and use it to implements
FTL::Output's NotEqualAndOrdered.
* b3/B3ConstDoubleValue.cpp:
(JSC::B3::ConstDoubleValue::equalOrUnordered):
* b3/B3ConstDoubleValue.h:
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createGenericCompare):
(JSC::B3::Air::LowerToAir::lower):
* b3/B3Opcode.cpp:
(WTF::printInternal):
* b3/B3Opcode.h:
* b3/B3ReduceDoubleToFloat.cpp:
(JSC::B3::reduceDoubleToFloat):
* b3/B3ReduceStrength.cpp:
* b3/B3Validate.cpp:
* b3/B3Value.cpp:
(JSC::B3::Value::equalOrUnordered):
(JSC::B3::Value::returnsBool):
(JSC::B3::Value::effects):
(JSC::B3::Value::key):
(JSC::B3::Value::typeFor):
* b3/B3Value.h:
* b3/testb3.cpp:
(JSC::B3::testBranchEqualOrUnorderedArgs):
(JSC::B3::testBranchNotEqualAndOrderedArgs):
(JSC::B3::testBranchEqualOrUnorderedDoubleArgImm):
(JSC::B3::testBranchEqualOrUnorderedFloatArgImm):
(JSC::B3::testBranchEqualOrUnorderedDoubleImms):
(JSC::B3::testBranchEqualOrUnorderedFloatImms):
(JSC::B3::testBranchEqualOrUnorderedFloatWithUselessDoubleConversion):
(JSC::B3::run):
* ftl/FTLB3Output.h:
(JSC::FTL::Output::doubleNotEqualAndOrdered):
(JSC::FTL::Output::doubleNotEqual): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::boolify):
* ftl/FTLOutput.h:
(JSC::FTL::Output::doubleNotEqualAndOrdered):
(JSC::FTL::Output::doubleNotEqual): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ConstDoubleValuecpp">trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ConstDoubleValueh">trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Opcodecpp">trunk/Source/JavaScriptCore/b3/B3Opcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Opcodeh">trunk/Source/JavaScriptCore/b3/B3Opcode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp">trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp">trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Validatecpp">trunk/Source/JavaScriptCore/b3/B3Validate.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valuecpp">trunk/Source/JavaScriptCore/b3/B3Value.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valueh">trunk/Source/JavaScriptCore/b3/B3Value.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputh">trunk/Source/JavaScriptCore/ftl/FTLOutput.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2015-12-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Add EqualOrUnordered to B3
+ https://bugs.webkit.org/show_bug.cgi?id=152425
+
+ Reviewed by Mark Lam.
+
+ Add EqualOrUnordered to B3 and use it to implements
+ FTL::Output's NotEqualAndOrdered.
+
+ * b3/B3ConstDoubleValue.cpp:
+ (JSC::B3::ConstDoubleValue::equalOrUnordered):
+ * b3/B3ConstDoubleValue.h:
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createGenericCompare):
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/B3Opcode.cpp:
+ (WTF::printInternal):
+ * b3/B3Opcode.h:
+ * b3/B3ReduceDoubleToFloat.cpp:
+ (JSC::B3::reduceDoubleToFloat):
+ * b3/B3ReduceStrength.cpp:
+ * b3/B3Validate.cpp:
+ * b3/B3Value.cpp:
+ (JSC::B3::Value::equalOrUnordered):
+ (JSC::B3::Value::returnsBool):
+ (JSC::B3::Value::effects):
+ (JSC::B3::Value::key):
+ (JSC::B3::Value::typeFor):
+ * b3/B3Value.h:
+ * b3/testb3.cpp:
+ (JSC::B3::testBranchEqualOrUnorderedArgs):
+ (JSC::B3::testBranchNotEqualAndOrderedArgs):
+ (JSC::B3::testBranchEqualOrUnorderedDoubleArgImm):
+ (JSC::B3::testBranchEqualOrUnorderedFloatArgImm):
+ (JSC::B3::testBranchEqualOrUnorderedDoubleImms):
+ (JSC::B3::testBranchEqualOrUnorderedFloatImms):
+ (JSC::B3::testBranchEqualOrUnorderedFloatWithUselessDoubleConversion):
+ (JSC::B3::run):
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::doubleNotEqualAndOrdered):
+ (JSC::FTL::Output::doubleNotEqual): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::boolify):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::doubleNotEqualAndOrdered):
+ (JSC::FTL::Output::doubleNotEqual): Deleted.
+
+2015-12-19 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] B3: Add indexed addressing when lowering BitwiseCast
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152432
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ConstDoubleValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -158,6 +158,17 @@
</span><span class="cx"> return triState(m_value >= other->asDouble());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TriState ConstDoubleValue::equalOrUnorderedConstant(const Value* other) const
+{
+ if (std::isnan(m_value))
+ return TrueTriState;
+
+ if (!other->hasDouble())
+ return MixedTriState;
+ double otherValue = other->asDouble();
+ return triState(std::isunordered(m_value, otherValue) || m_value == otherValue);
+}
+
</ins><span class="cx"> void ConstDoubleValue::dumpMeta(CommaPrinter& comma, PrintStream& out) const
</span><span class="cx"> {
</span><span class="cx"> out.print(comma);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ConstDoubleValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.h (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.h 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3ConstDoubleValue.h 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> TriState greaterThanConstant(const Value* other) const override;
</span><span class="cx"> TriState lessEqualConstant(const Value* other) const override;
</span><span class="cx"> TriState greaterEqualConstant(const Value* other) const override;
</span><ins>+ TriState equalOrUnorderedConstant(const Value* other) const override;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void dumpMeta(CommaPrinter&, PrintStream&) const override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -1154,6 +1154,9 @@
</span><span class="cx"> return createRelCond(MacroAssembler::LessThanOrEqual, MacroAssembler::DoubleLessThanOrEqual);
</span><span class="cx"> case GreaterEqual:
</span><span class="cx"> return createRelCond(MacroAssembler::GreaterThanOrEqual, MacroAssembler::DoubleGreaterThanOrEqual);
</span><ins>+ case EqualOrUnordered:
+ // The integer condition is never used in this case.
+ return createRelCond(MacroAssembler::Equal, MacroAssembler::DoubleEqualOrUnordered);
</ins><span class="cx"> case Above:
</span><span class="cx"> // We use a bogus double condition because these integer comparisons won't got down that
</span><span class="cx"> // path anyway.
</span><span class="lines">@@ -1841,7 +1844,8 @@
</span><span class="cx"> case Above:
</span><span class="cx"> case Below:
</span><span class="cx"> case AboveEqual:
</span><del>- case BelowEqual: {
</del><ins>+ case BelowEqual:
+ case EqualOrUnordered: {
</ins><span class="cx"> m_insts.last().append(createCompare(m_value));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Opcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Opcode.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Opcode.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3Opcode.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -215,6 +215,9 @@
</span><span class="cx"> case BelowEqual:
</span><span class="cx"> out.print("BelowEqual");
</span><span class="cx"> return;
</span><ins>+ case EqualOrUnordered:
+ out.print("EqualOrUnordered");
+ return;
</ins><span class="cx"> case Select:
</span><span class="cx"> out.print("Select");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Opcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Opcode.h (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Opcode.h 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3Opcode.h 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -123,6 +123,9 @@
</span><span class="cx"> AboveEqual,
</span><span class="cx"> BelowEqual,
</span><span class="cx">
</span><ins>+ // Unordered floating point compare: values are equal or either one is NaN.
+ EqualOrUnordered,
+
</ins><span class="cx"> // SSA form of conditional move. The first child is evaluated for truthiness. If true, the second child
</span><span class="cx"> // is returned. Otherwise, the third child is returned.
</span><span class="cx"> Select,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> case GreaterThan:
</span><span class="cx"> case LessEqual:
</span><span class="cx"> case GreaterEqual:
</span><ins>+ case EqualOrUnordered:
</ins><span class="cx"> if (value->child(0)->opcode() == FloatToDouble && value->child(1)->opcode() == FloatToDouble) {
</span><span class="cx"> value->child(0) = value->child(0)->child(0);
</span><span class="cx"> value->child(1) = value->child(1)->child(0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -1010,6 +1010,19 @@
</span><span class="cx"> m_value->child(0)->belowEqualConstant(m_value->child(1))));
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case EqualOrUnordered:
+ handleCommutativity();
+
+ // Turn this: Equal(const1, const2)
+ // Into this: isunordered(const1, const2) || const1 == const2.
+ // Turn this: Equal(value, const_NaN)
+ // Into this: 1.
+ replaceWithNewValue(
+ m_proc.addBoolConstant(
+ m_value->origin(),
+ m_value->child(1)->equalOrUnorderedConstant(m_value->child(0))));
+ break;
+
</ins><span class="cx"> case CheckAdd:
</span><span class="cx"> if (replaceWithNewValue(m_value->child(0)->checkAddConstant(m_proc, m_value->child(1))))
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Validatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Validate.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Validate.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3Validate.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -255,6 +255,12 @@
</span><span class="cx"> VALIDATE(isInt(value->child(0)->type()), ("At ", *value));
</span><span class="cx"> VALIDATE(value->type() == Int32, ("At ", *value));
</span><span class="cx"> break;
</span><ins>+ case EqualOrUnordered:
+ VALIDATE(value->numChildren() == 2, ("At ", *value));
+ VALIDATE(value->child(0)->type() == value->child(1)->type(), ("At ", *value));
+ VALIDATE(isFloat(value->child(0)->type()), ("At ", *value));
+ VALIDATE(value->type() == Int32, ("At ", *value));
+ break;
</ins><span class="cx"> case Select:
</span><span class="cx"> VALIDATE(value->numChildren() == 3, ("At ", *value));
</span><span class="cx"> VALIDATE(isInt(value->child(0)->type()), ("At ", *value));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3Value.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -286,6 +286,11 @@
</span><span class="cx"> return MixedTriState;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TriState Value::equalOrUnorderedConstant(const Value*) const
+{
+ return MixedTriState;
+}
+
</ins><span class="cx"> Value* Value::invertedCompare(Procedure& proc) const
</span><span class="cx"> {
</span><span class="cx"> if (!numChildren())
</span><span class="lines">@@ -315,6 +320,7 @@
</span><span class="cx"> case Below:
</span><span class="cx"> case AboveEqual:
</span><span class="cx"> case BelowEqual:
</span><ins>+ case EqualOrUnordered:
</ins><span class="cx"> return true;
</span><span class="cx"> case Phi:
</span><span class="cx"> // FIXME: We should have a story here.
</span><span class="lines">@@ -390,6 +396,7 @@
</span><span class="cx"> case Below:
</span><span class="cx"> case AboveEqual:
</span><span class="cx"> case BelowEqual:
</span><ins>+ case EqualOrUnordered:
</ins><span class="cx"> case Select:
</span><span class="cx"> break;
</span><span class="cx"> case Div:
</span><span class="lines">@@ -484,6 +491,7 @@
</span><span class="cx"> case Below:
</span><span class="cx"> case AboveEqual:
</span><span class="cx"> case BelowEqual:
</span><ins>+ case EqualOrUnordered:
</ins><span class="cx"> case CheckAdd:
</span><span class="cx"> case CheckSub:
</span><span class="cx"> case CheckMul:
</span><span class="lines">@@ -578,6 +586,7 @@
</span><span class="cx"> case Below:
</span><span class="cx"> case AboveEqual:
</span><span class="cx"> case BelowEqual:
</span><ins>+ case EqualOrUnordered:
</ins><span class="cx"> return Int32;
</span><span class="cx"> case SExt32:
</span><span class="cx"> case ZExt32:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.h (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.h 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/B3Value.h 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx"> virtual TriState belowConstant(const Value* other) const;
</span><span class="cx"> virtual TriState aboveEqualConstant(const Value* other) const;
</span><span class="cx"> virtual TriState belowEqualConstant(const Value* other) const;
</span><ins>+ virtual TriState equalOrUnorderedConstant(const Value* other) const;
</ins><span class="cx">
</span><span class="cx"> // If the value is a comparison then this returns the inverted form of that comparison, if
</span><span class="cx"> // possible. It can be impossible for double comparisons, where for example LessThan and
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -5096,6 +5096,290 @@
</span><span class="cx"> CHECK(invoke<int>(*code, 0) == 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testBranchEqualOrUnorderedArgs(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* argumentB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, a, b) == expected);
+}
+
+void testBranchEqualOrUnorderedArgs(float a, float b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* argumentB = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, &a, &b) == expected);
+}
+
+void testBranchNotEqualAndOrderedArgs(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* argumentB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1);
+ Value* equalOrUnordered = root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB);
+ Value* notEqualAndOrdered = root->appendNew<Value>(
+ proc, Equal, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0),
+ equalOrUnordered);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ notEqualAndOrdered,
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (!std::isunordered(a, b) && a != b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, a, b) == expected);
+}
+
+void testBranchNotEqualAndOrderedArgs(float a, float b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* argumentB = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
+ Value* equalOrUnordered = root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB);
+ Value* notEqualAndOrdered = root->appendNew<Value>(
+ proc, Equal, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0),
+ equalOrUnordered);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ notEqualAndOrdered,
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (!std::isunordered(a, b) && a != b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, &a, &b) == expected);
+}
+
+void testBranchEqualOrUnorderedDoubleArgImm(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* argumentB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, a) == expected);
+}
+
+void testBranchEqualOrUnorderedFloatArgImm(float a, float b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* argumentB = root->appendNew<ConstFloatValue>(proc, Origin(), b);
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, &a) == expected);
+}
+
+void testBranchEqualOrUnorderedDoubleImms(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<ConstDoubleValue>(proc, Origin(), a);
+ Value* argumentB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc) == expected);
+}
+
+void testBranchEqualOrUnorderedFloatImms(float a, float b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argumentA = root->appendNew<ConstFloatValue>(proc, Origin(), a);
+ Value* argumentB = root->appendNew<ConstFloatValue>(proc, Origin(), b);
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argumentA,
+ argumentB),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc) == expected);
+}
+
+void testBranchEqualOrUnorderedFloatWithUselessDoubleConversion(float a, float b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* argument1 = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* argument2 = root->appendNew<MemoryValue>(proc, Load, Float, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
+ Value* argument1AsDouble = root->appendNew<Value>(proc, FloatToDouble, Origin(), argument1);
+ Value* argument2AsDouble = root->appendNew<Value>(proc, FloatToDouble, Origin(), argument2);
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(
+ proc, EqualOrUnordered, Origin(),
+ argument1AsDouble,
+ argument2AsDouble),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -13));
+
+ int64_t expected = (std::isunordered(a, b) || a == b) ? 42 : -13;
+ CHECK(compileAndRun<int64_t>(proc, &a, &b) == expected);
+}
+
</ins><span class="cx"> void testBranchFold(int value)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -9122,6 +9406,17 @@
</span><span class="cx"> RUN(testBranchEqualEqual());
</span><span class="cx"> RUN(testBranchEqualCommute());
</span><span class="cx"> RUN(testBranchEqualEqual1());
</span><ins>+ RUN_BINARY(testBranchEqualOrUnorderedArgs, floatingPointOperands<double>(), floatingPointOperands<double>());
+ RUN_BINARY(testBranchEqualOrUnorderedArgs, floatingPointOperands<float>(), floatingPointOperands<float>());
+ RUN_BINARY(testBranchNotEqualAndOrderedArgs, floatingPointOperands<double>(), floatingPointOperands<double>());
+ RUN_BINARY(testBranchNotEqualAndOrderedArgs, floatingPointOperands<float>(), floatingPointOperands<float>());
+ RUN_BINARY(testBranchEqualOrUnorderedDoubleArgImm, floatingPointOperands<double>(), floatingPointOperands<double>());
+ RUN_BINARY(testBranchEqualOrUnorderedFloatArgImm, floatingPointOperands<float>(), floatingPointOperands<float>());
+ RUN_BINARY(testBranchEqualOrUnorderedDoubleImms, floatingPointOperands<double>(), floatingPointOperands<double>());
+ RUN_BINARY(testBranchEqualOrUnorderedFloatImms, floatingPointOperands<float>(), floatingPointOperands<float>());
+ RUN_BINARY(testBranchEqualOrUnorderedFloatWithUselessDoubleConversion, floatingPointOperands<float>(), floatingPointOperands<float>());
+ RUN_BINARY(testBranchNotEqualAndOrderedArgs, floatingPointOperands<double>(), floatingPointOperands<double>());
+ RUN_BINARY(testBranchNotEqualAndOrderedArgs, floatingPointOperands<float>(), floatingPointOperands<float>());
</ins><span class="cx"> RUN(testBranchFold(42));
</span><span class="cx"> RUN(testBranchFold(0));
</span><span class="cx"> RUN(testDiamondFold(42));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -336,7 +336,11 @@
</span><span class="cx"> LValue doubleLessThanOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessEqual, origin(), left, right); }
</span><span class="cx"> LValue doubleGreaterThan(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::GreaterThan, origin(), left, right); }
</span><span class="cx"> LValue doubleGreaterThanOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::GreaterEqual, origin(), left, right); }
</span><del>- LValue doubleNotEqual(LValue left, LValue right) { CRASH(); }
</del><ins>+ LValue doubleNotEqualAndOrdered(LValue left, LValue right)
+ {
+ LValue equalOrUnordered = m_block->appendNew<B3::Value>(m_proc, B3::EqualOrUnordered, origin(), left, right);
+ return bitXor(equalOrUnordered, int32One);
+ }
</ins><span class="cx"> LValue doubleLessThanOrUnordered(LValue left, LValue right)
</span><span class="cx"> {
</span><span class="cx"> return m_block->appendNew<B3::Value>(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -7305,7 +7305,7 @@
</span><span class="cx"> case Int32Use:
</span><span class="cx"> return m_out.notZero32(lowInt32(edge));
</span><span class="cx"> case DoubleRepUse:
</span><del>- return m_out.doubleNotEqual(lowDouble(edge), m_out.doubleZero);
</del><ins>+ return m_out.doubleNotEqualAndOrdered(lowDouble(edge), m_out.doubleZero);
</ins><span class="cx"> case ObjectOrOtherUse:
</span><span class="cx"> return m_out.bitNot(
</span><span class="cx"> equalNullOrUndefined(
</span><span class="lines">@@ -7399,9 +7399,7 @@
</span><span class="cx"> unsure(doubleCase), unsure(notDoubleCase));
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(doubleCase, notDoubleCase);
</span><del>- // Note that doubleNotEqual() really means not-equal-and-ordered. It will return false
- // if value is NaN.
- LValue doubleIsTruthy = m_out.doubleNotEqual(
</del><ins>+ LValue doubleIsTruthy = m_out.doubleNotEqualAndOrdered(
</ins><span class="cx"> unboxDouble(value), m_out.constDouble(0));
</span><span class="cx"> results.append(m_out.anchor(doubleIsTruthy));
</span><span class="cx"> m_out.jump(continuation);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.h (194313 => 194314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-19 13:26:38 UTC (rev 194313)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-19 16:52:11 UTC (rev 194314)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> LValue doubleLessThanOrEqual(LValue left, LValue right) { return fcmp(LLVMRealOLE, left, right); }
</span><span class="cx"> LValue doubleGreaterThan(LValue left, LValue right) { return fcmp(LLVMRealOGT, left, right); }
</span><span class="cx"> LValue doubleGreaterThanOrEqual(LValue left, LValue right) { return fcmp(LLVMRealOGE, left, right); }
</span><del>- LValue doubleNotEqual(LValue left, LValue right) { return fcmp(LLVMRealONE, left, right); }
</del><ins>+ LValue doubleNotEqualAndOrdered(LValue left, LValue right) { return fcmp(LLVMRealONE, left, right); }
</ins><span class="cx"> LValue doubleLessThanOrUnordered(LValue left, LValue right) { return fcmp(LLVMRealULT, left, right); }
</span><span class="cx"> LValue doubleLessThanOrEqualOrUnordered(LValue left, LValue right) { return fcmp(LLVMRealULE, left, right); }
</span><span class="cx"> LValue doubleGreaterThanOrUnordered(LValue left, LValue right) { return fcmp(LLVMRealUGT, left, right); }
</span></span></pre>
</div>
</div>
</body>
</html>