<!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>[192659] 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/192659">192659</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 14:18:15 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL->B3 lowering should support integer comparisons with the opcode abstracted and a few other things
https://bugs.webkit.org/show_bug.cgi?id=151463
Reviewed by Geoffrey Garen.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::signExt):
(JSC::FTL::Output::zeroExt):
(JSC::FTL::Output::zeroExtPtr):
(JSC::FTL::Output::fpToInt):
(JSC::FTL::Output::fpToUInt):
(JSC::FTL::Output::fpToInt32):
(JSC::FTL::Output::baseIndex):
(JSC::FTL::Output::absolute):
(JSC::FTL::Output::load32NonNegative):
(JSC::FTL::Output::equal):
(JSC::FTL::Output::notEqual):
(JSC::FTL::Output::above):
(JSC::FTL::Output::lessThan):
(JSC::FTL::Output::lessThanOrEqual):
(JSC::FTL::Output::doubleEqual):
(JSC::FTL::Output::doubleNotEqualOrUnordered):
(JSC::FTL::Output::doubleLessThan):
(JSC::FTL::Output::icmp): Deleted.
(JSC::FTL::Output::fcmp): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareEq):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareLess):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareLessEq):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareGreater):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCompareGreaterEq):
(JSC::FTL::DFG::LowerDFGToLLVM::compileLogicalNot):
(JSC::FTL::DFG::LowerDFGToLLVM::baseIndex):
(JSC::FTL::DFG::LowerDFGToLLVM::compare):
(JSC::FTL::DFG::LowerDFGToLLVM::speculateTruthyObject):
(JSC::FTL::DFG::LowerDFGToLLVM::nonSpeculativeCompare):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192658 => 192659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 22:05:36 UTC (rev 192658)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 22:18:15 UTC (rev 192659)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-11-19 Filip Pizlo <fpizlo@apple.com>
+
+ FTL->B3 lowering should support integer comparisons with the opcode abstracted and a few other things
+ https://bugs.webkit.org/show_bug.cgi?id=151463
+
+ Reviewed by Geoffrey Garen.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::signExt):
+ (JSC::FTL::Output::zeroExt):
+ (JSC::FTL::Output::zeroExtPtr):
+ (JSC::FTL::Output::fpToInt):
+ (JSC::FTL::Output::fpToUInt):
+ (JSC::FTL::Output::fpToInt32):
+ (JSC::FTL::Output::baseIndex):
+ (JSC::FTL::Output::absolute):
+ (JSC::FTL::Output::load32NonNegative):
+ (JSC::FTL::Output::equal):
+ (JSC::FTL::Output::notEqual):
+ (JSC::FTL::Output::above):
+ (JSC::FTL::Output::lessThan):
+ (JSC::FTL::Output::lessThanOrEqual):
+ (JSC::FTL::Output::doubleEqual):
+ (JSC::FTL::Output::doubleNotEqualOrUnordered):
+ (JSC::FTL::Output::doubleLessThan):
+ (JSC::FTL::Output::icmp): Deleted.
+ (JSC::FTL::Output::fcmp): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareEq):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareLess):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareLessEq):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareGreater):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCompareGreaterEq):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileLogicalNot):
+ (JSC::FTL::DFG::LowerDFGToLLVM::baseIndex):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compare):
+ (JSC::FTL::DFG::LowerDFGToLLVM::speculateTruthyObject):
+ (JSC::FTL::DFG::LowerDFGToLLVM::nonSpeculativeCompare):
+
</ins><span class="cx"> 2015-11-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] When the iterated allocator is forced to spill, nuke the Moves that were already proven to be useless
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (192658 => 192659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-19 22:05:36 UTC (rev 192658)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-19 22:18:15 UTC (rev 192659)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> LValue signExt(LValue value, LType type) { CRASH(); }
</span><span class="cx"> LValue zeroExt(LValue value, LType type) { return m_block->appendNew<B3::Value>(m_proc, B3::ZExt32, type, origin(), value); }
</span><del>- LValue zeroExtPtr(LValue value) { CRASH(); }
</del><ins>+ LValue zeroExtPtr(LValue value) { return zeroExt(value, B3::Int64); }
</ins><span class="cx"> LValue fpToInt(LValue value, LType type) { CRASH(); }
</span><span class="cx"> LValue fpToUInt(LValue value, LType type) { CRASH(); }
</span><span class="cx"> LValue fpToInt32(LValue value) { CRASH(); }
</span><span class="lines">@@ -247,8 +247,14 @@
</span><span class="cx">
</span><span class="cx"> LValue baseIndex(LValue base, LValue index, Scale, ptrdiff_t offset = 0) { CRASH(); }
</span><span class="cx">
</span><del>- TypedPointer baseIndex(const AbstractHeap& heap, LValue base, LValue index, Scale scale, ptrdiff_t offset = 0) { CRASH(); }
- TypedPointer baseIndex(IndexedAbstractHeap& heap, LValue base, LValue index, JSValue indexAsConstant = JSValue(), ptrdiff_t offset = 0) { CRASH(); }
</del><ins>+ TypedPointer baseIndex(const AbstractHeap& heap, LValue base, LValue index, Scale scale, ptrdiff_t offset = 0)
+ {
+ return TypedPointer(heap, baseIndex(base, index, scale, offset));
+ }
+ TypedPointer baseIndex(IndexedAbstractHeap& heap, LValue base, LValue index, JSValue indexAsConstant = JSValue(), ptrdiff_t offset = 0)
+ {
+ return heap.baseIndex(*this, base, index, indexAsConstant, offset);
+ }
</ins><span class="cx">
</span><span class="cx"> TypedPointer absolute(void* address)
</span><span class="cx"> {
</span><span class="lines">@@ -276,7 +282,6 @@
</span><span class="cx"> LValue load32NonNegative(TypedPointer pointer) { return load32(pointer); }
</span><span class="cx"> LValue load32NonNegative(LValue base, const AbstractField& field) { return load32(base, field); }
</span><span class="cx">
</span><del>- LValue icmp(LIntPredicate cond, LValue left, LValue right) { CRASH(); }
</del><span class="cx"> LValue equal(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Equal, origin(), left, right); }
</span><span class="cx"> LValue notEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::NotEqual, origin(), left, right); }
</span><span class="cx"> LValue above(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Above, origin(), left, right); }
</span><span class="lines">@@ -288,7 +293,6 @@
</span><span class="cx"> LValue lessThan(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessThan, origin(), left, right); }
</span><span class="cx"> LValue lessThanOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessEqual, origin(), left, right); }
</span><span class="cx">
</span><del>- LValue fcmp(LRealPredicate cond, LValue left, LValue right) { CRASH(); }
</del><span class="cx"> LValue doubleEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Equal, origin(), left, right); }
</span><span class="cx"> LValue doubleNotEqualOrUnordered(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::NotEqual, origin(), left, right); }
</span><span class="cx"> LValue doubleLessThan(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessThan, origin(), left, right); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192658 => 192659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-19 22:05:36 UTC (rev 192658)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-19 22:18:15 UTC (rev 192659)
</span><span class="lines">@@ -4522,7 +4522,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_node->isBinaryUseKind(UntypedUse)) {
</span><del>- nonSpeculativeCompare(LLVMIntEQ, operationCompareEq);
</del><ins>+ nonSpeculativeCompare(
+ [&] (LValue left, LValue right) {
+ return m_out.equal(left, right);
+ },
+ operationCompareEq);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4667,22 +4671,50 @@
</span><span class="cx">
</span><span class="cx"> void compileCompareLess()
</span><span class="cx"> {
</span><del>- compare(LLVMIntSLT, LLVMRealOLT, operationCompareLess);
</del><ins>+ compare(
+ [&] (LValue left, LValue right) {
+ return m_out.lessThan(left, right);
+ },
+ [&] (LValue left, LValue right) {
+ return m_out.doubleLessThan(left, right);
+ },
+ operationCompareLess);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareLessEq()
</span><span class="cx"> {
</span><del>- compare(LLVMIntSLE, LLVMRealOLE, operationCompareLessEq);
</del><ins>+ compare(
+ [&] (LValue left, LValue right) {
+ return m_out.lessThanOrEqual(left, right);
+ },
+ [&] (LValue left, LValue right) {
+ return m_out.doubleLessThanOrEqual(left, right);
+ },
+ operationCompareLessEq);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareGreater()
</span><span class="cx"> {
</span><del>- compare(LLVMIntSGT, LLVMRealOGT, operationCompareGreater);
</del><ins>+ compare(
+ [&] (LValue left, LValue right) {
+ return m_out.greaterThan(left, right);
+ },
+ [&] (LValue left, LValue right) {
+ return m_out.doubleGreaterThan(left, right);
+ },
+ operationCompareGreater);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareGreaterEq()
</span><span class="cx"> {
</span><del>- compare(LLVMIntSGE, LLVMRealOGE, operationCompareGreaterEq);
</del><ins>+ compare(
+ [&] (LValue left, LValue right) {
+ return m_out.greaterThanOrEqual(left, right);
+ },
+ [&] (LValue left, LValue right) {
+ return m_out.doubleGreaterThanOrEqual(left, right);
+ },
+ operationCompareGreaterEq);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileLogicalNot()
</span><span class="lines">@@ -6523,15 +6555,16 @@
</span><span class="cx"> return m_out.baseIndex(
</span><span class="cx"> heap, storage, m_out.zeroExtPtr(index), provenValue(edge), offset);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ template<typename IntFunctor, typename DoubleFunctor>
</ins><span class="cx"> void compare(
</span><del>- LIntPredicate intCondition, LRealPredicate realCondition,
</del><ins>+ const IntFunctor& intFunctor, const DoubleFunctor& doubleFunctor,
</ins><span class="cx"> S_JITOperation_EJJ helperFunction)
</span><span class="cx"> {
</span><span class="cx"> if (m_node->isBinaryUseKind(Int32Use)) {
</span><span class="cx"> LValue left = lowInt32(m_node->child1());
</span><span class="cx"> LValue right = lowInt32(m_node->child2());
</span><del>- setBoolean(m_out.icmp(intCondition, left, right));
</del><ins>+ setBoolean(intFunctor(left, right));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6539,19 +6572,19 @@
</span><span class="cx"> Int52Kind kind;
</span><span class="cx"> LValue left = lowWhicheverInt52(m_node->child1(), kind);
</span><span class="cx"> LValue right = lowInt52(m_node->child2(), kind);
</span><del>- setBoolean(m_out.icmp(intCondition, left, right));
</del><ins>+ setBoolean(intFunctor(left, right));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_node->isBinaryUseKind(DoubleRepUse)) {
</span><span class="cx"> LValue left = lowDouble(m_node->child1());
</span><span class="cx"> LValue right = lowDouble(m_node->child2());
</span><del>- setBoolean(m_out.fcmp(realCondition, left, right));
</del><ins>+ setBoolean(doubleFunctor(left, right));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_node->isBinaryUseKind(UntypedUse)) {
</span><del>- nonSpeculativeCompare(intCondition, helperFunction);
</del><ins>+ nonSpeculativeCompare(intFunctor, helperFunction);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6602,8 +6635,9 @@
</span><span class="cx"> m_out.load8ZeroExt32(cell, m_heaps.JSCell_typeInfoFlags),
</span><span class="cx"> m_out.constInt32(MasqueradesAsUndefined)));
</span><span class="cx"> }
</span><del>-
- void nonSpeculativeCompare(LIntPredicate intCondition, S_JITOperation_EJJ helperFunction)
</del><ins>+
+ template<typename IntFunctor>
+ void nonSpeculativeCompare(const IntFunctor& intFunctor, S_JITOperation_EJJ helperFunction)
</ins><span class="cx"> {
</span><span class="cx"> LValue left = lowJSValue(m_node->child1());
</span><span class="cx"> LValue right = lowJSValue(m_node->child2());
</span><span class="lines">@@ -6619,8 +6653,7 @@
</span><span class="cx"> m_out.branch(isNotInt32(right), rarely(slowPath), usually(fastPath));
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(fastPath, slowPath);
</span><del>- ValueFromBlock fastResult = m_out.anchor(
- m_out.icmp(intCondition, unboxInt32(left), unboxInt32(right)));
</del><ins>+ ValueFromBlock fastResult = m_out.anchor(intFunctor(unboxInt32(left), unboxInt32(right)));
</ins><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(slowPath, continuation);
</span></span></pre>
</div>
</div>
</body>
</html>