<!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>[192654] 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/192654">192654</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 13:00:53 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL->B3 lowering should support lazy slow paths, patchpoints, all integer comparisons, and more load/stores
https://bugs.webkit.org/show_bug.cgi?id=151459
Reviewed by Benjamin Poulain.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::absolute):
(JSC::FTL::Output::load8SignExt32):
(JSC::FTL::Output::load8ZeroExt32):
(JSC::FTL::Output::load16SignExt32):
(JSC::FTL::Output::load16ZeroExt32):
(JSC::FTL::Output::load32):
(JSC::FTL::Output::load64):
(JSC::FTL::Output::loadPtr):
(JSC::FTL::Output::loadDouble):
(JSC::FTL::Output::store32):
(JSC::FTL::Output::store64):
(JSC::FTL::Output::storePtr):
(JSC::FTL::Output::storeDouble):
(JSC::FTL::Output::ascribeRange):
(JSC::FTL::Output::nonNegative32):
(JSC::FTL::Output::load32NonNegative):
(JSC::FTL::Output::icmp):
(JSC::FTL::Output::equal):
(JSC::FTL::Output::notEqual):
(JSC::FTL::Output::above):
(JSC::FTL::Output::aboveOrEqual):
(JSC::FTL::Output::below):
(JSC::FTL::Output::belowOrEqual):
(JSC::FTL::Output::greaterThan):
(JSC::FTL::Output::greaterThanOrEqual):
(JSC::FTL::Output::lessThan):
(JSC::FTL::Output::lessThanOrEqual):
(JSC::FTL::Output::fcmp):
(JSC::FTL::Output::doubleEqual):
(JSC::FTL::Output::speculateMul):
(JSC::FTL::Output::patchpoint):
(JSC::FTL::Output::trap):
(JSC::FTL::Output::anchor):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):</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 (192653 => 192654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 20:43:48 UTC (rev 192653)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-19 21:00:53 UTC (rev 192654)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2015-11-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL->B3 lowering should support lazy slow paths, patchpoints, all integer comparisons, and more load/stores
+ https://bugs.webkit.org/show_bug.cgi?id=151459
+
+ Reviewed by Benjamin Poulain.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::absolute):
+ (JSC::FTL::Output::load8SignExt32):
+ (JSC::FTL::Output::load8ZeroExt32):
+ (JSC::FTL::Output::load16SignExt32):
+ (JSC::FTL::Output::load16ZeroExt32):
+ (JSC::FTL::Output::load32):
+ (JSC::FTL::Output::load64):
+ (JSC::FTL::Output::loadPtr):
+ (JSC::FTL::Output::loadDouble):
+ (JSC::FTL::Output::store32):
+ (JSC::FTL::Output::store64):
+ (JSC::FTL::Output::storePtr):
+ (JSC::FTL::Output::storeDouble):
+ (JSC::FTL::Output::ascribeRange):
+ (JSC::FTL::Output::nonNegative32):
+ (JSC::FTL::Output::load32NonNegative):
+ (JSC::FTL::Output::icmp):
+ (JSC::FTL::Output::equal):
+ (JSC::FTL::Output::notEqual):
+ (JSC::FTL::Output::above):
+ (JSC::FTL::Output::aboveOrEqual):
+ (JSC::FTL::Output::below):
+ (JSC::FTL::Output::belowOrEqual):
+ (JSC::FTL::Output::greaterThan):
+ (JSC::FTL::Output::greaterThanOrEqual):
+ (JSC::FTL::Output::lessThan):
+ (JSC::FTL::Output::lessThanOrEqual):
+ (JSC::FTL::Output::fcmp):
+ (JSC::FTL::Output::doubleEqual):
+ (JSC::FTL::Output::speculateMul):
+ (JSC::FTL::Output::patchpoint):
+ (JSC::FTL::Output::trap):
+ (JSC::FTL::Output::anchor):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):
+
+2015-11-19 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL->B3 lowering should support absolute(), double comparisons, and intToDouble()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151457
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (192653 => 192654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-19 20:43:48 UTC (rev 192653)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-19 21:00:53 UTC (rev 192654)
</span><span class="lines">@@ -255,37 +255,38 @@
</span><span class="cx"> return TypedPointer(m_heaps->absolute[address], constIntPtr(address));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue load8SignExt32(LValue base, const AbstractField& field) { CRASH(); }
- LValue load8ZeroExt32(LValue base, const AbstractField& field) { CRASH(); }
- LValue load16SignExt32(LValue base, const AbstractField& field) { CRASH(); }
- LValue load16ZeroExt32(LValue base, const AbstractField& field) { CRASH(); }
- LValue load32(LValue base, const AbstractField& field) { CRASH(); }
- LValue load64(LValue base, const AbstractField& field) { CRASH(); }
- LValue loadPtr(LValue base, const AbstractField& field) { CRASH(); }
- LValue loadDouble(LValue base, const AbstractField& field) { CRASH(); }
- void store32(LValue value, LValue base, const AbstractField& field) { CRASH(); }
- void store64(LValue value, LValue base, const AbstractField& field) { CRASH(); }
- void storePtr(LValue value, LValue base, const AbstractField& field) { CRASH(); }
- void storeDouble(LValue value, LValue base, const AbstractField& field) { CRASH(); }
</del><ins>+ LValue load8SignExt32(LValue base, const AbstractField& field) { return load8SignExt32(address(base, field)); }
+ LValue load8ZeroExt32(LValue base, const AbstractField& field) { return load8ZeroExt32(address(base, field)); }
+ LValue load16SignExt32(LValue base, const AbstractField& field) { return load16SignExt32(address(base, field)); }
+ LValue load16ZeroExt32(LValue base, const AbstractField& field) { return load16ZeroExt32(address(base, field)); }
+ LValue load32(LValue base, const AbstractField& field) { return load32(address(base, field)); }
+ LValue load64(LValue base, const AbstractField& field) { return load64(address(base, field)); }
+ LValue loadPtr(LValue base, const AbstractField& field) { return loadPtr(address(base, field)); }
+ LValue loadDouble(LValue base, const AbstractField& field) { return loadDouble(address(base, field)); }
+ void store32(LValue value, LValue base, const AbstractField& field) { store32(value, address(base, field)); }
+ void store64(LValue value, LValue base, const AbstractField& field) { store64(value, address(base, field)); }
+ void storePtr(LValue value, LValue base, const AbstractField& field) { storePtr(value, address(base, field)); }
+ void storeDouble(LValue value, LValue base, const AbstractField& field) { storeDouble(value, address(base, field)); }
</ins><span class="cx">
</span><del>- void ascribeRange(LValue loadInstruction, const ValueRange& range) { CRASH(); }
</del><ins>+ // FIXME: Explore adding support for value range constraints to B3. Maybe it could be as simple as having
+ // a load instruction that guarantees that its result is non-negative.
+ // https://bugs.webkit.org/show_bug.cgi?id=151458
+ void ascribeRange(LValue, const ValueRange&) { }
+ LValue nonNegative32(LValue loadInstruction) { return loadInstruction; }
+ LValue load32NonNegative(TypedPointer pointer) { return load32(pointer); }
+ LValue load32NonNegative(LValue base, const AbstractField& field) { return load32(base, field); }
</ins><span class="cx">
</span><del>- LValue nonNegative32(LValue loadInstruction) { CRASH(); }
-
- LValue load32NonNegative(TypedPointer pointer) { CRASH(); }
- LValue load32NonNegative(LValue base, const AbstractField& field) { CRASH(); }
-
</del><span class="cx"> LValue icmp(LIntPredicate cond, LValue left, LValue right) { CRASH(); }
</span><del>- LValue equal(LValue left, LValue right) { CRASH(); }
- LValue notEqual(LValue left, LValue right) { CRASH(); }
- LValue above(LValue left, LValue right) { CRASH(); }
- LValue aboveOrEqual(LValue left, LValue right) { CRASH(); }
</del><ins>+ LValue equal(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Equal, origin(), left, right); }
+ LValue notEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::NotEqual, origin(), left, right); }
+ LValue above(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Above, origin(), left, right); }
+ LValue aboveOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::AboveEqual, origin(), left, right); }
</ins><span class="cx"> LValue below(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Below, origin(), left, right); }
</span><del>- LValue belowOrEqual(LValue left, LValue right) { CRASH(); }
- LValue greaterThan(LValue left, LValue right) { CRASH(); }
- LValue greaterThanOrEqual(LValue left, LValue right) { CRASH(); }
- LValue lessThan(LValue left, LValue right) { CRASH(); }
- LValue lessThanOrEqual(LValue left, LValue right) { CRASH(); }
</del><ins>+ LValue belowOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::BelowEqual, origin(), left, right); }
+ LValue greaterThan(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::GreaterThan, origin(), left, right); }
+ LValue greaterThanOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::GreaterEqual, origin(), left, right); }
+ LValue lessThan(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessThan, origin(), left, right); }
+ LValue lessThanOrEqual(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::LessEqual, origin(), left, right); }
</ins><span class="cx">
</span><span class="cx"> LValue fcmp(LRealPredicate cond, LValue left, LValue right) { CRASH(); }
</span><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="lines">@@ -411,6 +412,11 @@
</span><span class="cx"> return m_block->appendNew<B3::CheckValue>(m_proc, B3::CheckMul, origin(), left, right);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ B3::PatchpointValue* patchpoint(LType type)
+ {
+ return m_block->appendNew<B3::PatchpointValue>(m_proc, type, origin());
+ }
+
</ins><span class="cx"> void trap() { CRASH(); }
</span><span class="cx">
</span><span class="cx"> ValueFromBlock anchor(LValue value)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192653 => 192654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-19 20:43:48 UTC (rev 192653)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-19 21:00:53 UTC (rev 192654)
</span><span class="lines">@@ -7734,11 +7734,15 @@
</span><span class="cx"> {
</span><span class="cx"> #if FTL_USES_B3
</span><span class="cx"> UNUSED_PARAM(functor);
</span><del>- UNUSED_PARAM(userArguments);
</del><span class="cx">
</span><del>- if (verboseCompilationEnabled() || !verboseCompilationEnabled())
- CRASH();
- return nullptr;
</del><ins>+ B3::PatchpointValue* result = m_out.patchpoint(B3::Int64);
+ for (LValue arg : userArguments)
+ result->append(ConstrainedValue(arg, ValueRep::SomeRegister));
+ result->setGenerator(
+ [&] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {
+ jit.oops();
+ });
+ return result;
</ins><span class="cx"> #else
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>