<!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>[150828] branches/dfgFourthTier/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/150828">150828</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-05-28 13:50:56 -0700 (Tue, 28 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>fourthTier: FTL should support ArithMin/ArithMax
https://bugs.webkit.org/show_bug.cgi?id=116885

Reviewed by Oliver Hunt.

* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(LowerDFGToLLVM):
(JSC::FTL::LowerDFGToLLVM::compileArithMinOrMax):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreChangeLog">branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreftlFTLCapabilitiescpp">branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdfgFourthTierSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog (150827 => 150828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-05-28 20:17:47 UTC (rev 150827)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-05-28 20:50:56 UTC (rev 150828)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2013-05-28  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        fourthTier: FTL should support ArithMin/ArithMax
+        https://bugs.webkit.org/show_bug.cgi?id=116885
+
+        Reviewed by Oliver Hunt.
+
+        * ftl/FTLCapabilities.cpp:
+        (JSC::FTL::canCompile):
+        * ftl/FTLLowerDFGToLLVM.cpp:
+        (JSC::FTL::LowerDFGToLLVM::compileNode):
+        (LowerDFGToLLVM):
+        (JSC::FTL::LowerDFGToLLVM::compileArithMinOrMax):
+
+2013-05-28  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
</ins><span class="cx">         testRunner should have a way of disabling inlining of functions
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116875
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (150827 => 150828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2013-05-28 20:17:47 UTC (rev 150827)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2013-05-28 20:50:56 UTC (rev 150828)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx">     case ArithMul:
</span><span class="cx">     case ArithDiv:
</span><span class="cx">     case ArithMod:
</span><ins>+    case ArithMin:
+    case ArithMax:
</ins><span class="cx">     case ArithNegate:
</span><span class="cx">     case UInt32ToNumber:
</span><span class="cx">     case Int32ToDouble:
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (150827 => 150828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2013-05-28 20:17:47 UTC (rev 150827)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2013-05-28 20:50:56 UTC (rev 150828)
</span><span class="lines">@@ -314,6 +314,10 @@
</span><span class="cx">         case ArithMod:
</span><span class="cx">             compileArithMod();
</span><span class="cx">             break;
</span><ins>+        case ArithMin:
+        case ArithMax:
+            compileArithMinOrMax();
+            break;
</ins><span class="cx">         case ArithNegate:
</span><span class="cx">             compileArithNegate();
</span><span class="cx">             break;
</span><span class="lines">@@ -878,6 +882,58 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">     }
</span><ins>+
+    void compileArithMinOrMax()
+    {
+        switch (m_node-&gt;binaryUseKind()) {
+        case Int32Use: {
+            LValue left = lowInt32(m_node-&gt;child1());
+            LValue right = lowInt32(m_node-&gt;child2());
+            
+            m_int32Values.add(
+                m_node,
+                m_out.select(
+                    m_node-&gt;op() == ArithMin
+                        ? m_out.lessThan(left, right)
+                        : m_out.lessThan(right, left),
+                    left, right));
+            break;
+        }
+            
+        case NumberUse: {
+            LValue left = lowDouble(m_node-&gt;child1());
+            LValue right = lowDouble(m_node-&gt;child2());
+            
+            LBasicBlock notLessThan = FTL_NEW_BLOCK(m_out, (&quot;ArithMin/ArithMax not less than&quot;));
+            LBasicBlock continuation = FTL_NEW_BLOCK(m_out, (&quot;ArithMin/ArithMax continuation&quot;));
+            
+            Vector&lt;ValueFromBlock, 2&gt; results;
+            
+            results.append(m_out.anchor(left));
+            m_out.branch(
+                m_node-&gt;op() == ArithMin
+                    ? m_out.doubleLessThan(left, right)
+                    : m_out.doubleGreaterThan(left, right),
+                continuation, notLessThan);
+            
+            LBasicBlock lastNext = m_out.appendTo(notLessThan, continuation);
+            results.append(m_out.anchor(m_out.select(
+                m_node-&gt;op() == ArithMin
+                    ? m_out.doubleGreaterThanOrEqual(left, right)
+                    : m_out.doubleLessThanOrEqual(left, right),
+                right, m_out.constDouble(0.0 / 0.0))));
+            m_out.jump(continuation);
+            
+            m_out.appendTo(continuation, lastNext);
+            m_doubleValues.add(m_node, m_out.phi(m_out.doubleType, results));
+            break;
+        }
+            
+        default:
+            RELEASE_ASSERT_NOT_REACHED();
+            break;
+        }
+    }
</ins><span class="cx">     
</span><span class="cx">     void compileArithNegate()
</span><span class="cx">     {
</span></span></pre>
</div>
</div>

</body>
</html>