<!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>[207060] trunk</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/207060">207060</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 00:28:08 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ValueAdd should be constant folded if the operands are constant String,Primitive or Primitive,String
https://bugs.webkit.org/show_bug.cgi?id=163182
Reviewed by Filip Pizlo.
JSTests:
* microbenchmarks/string-add-constant-folding.js: Added.
(assert):
(runTests):
(add):
(test):
Source/JavaScriptCore:
This code pattern shows up in Dromaeo, so it's worth optimizing for.
This might also show up in real world JS code due to inlining and other
types of constant folding.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGLazyJSValue.cpp:
(JSC::DFG::LazyJSValue::getValue):
* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGLazyJSValuecpp">trunk/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsmicrobenchmarksstringaddconstantfoldingjs">trunk/JSTests/microbenchmarks/string-add-constant-folding.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207059 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-11 07:14:34 UTC (rev 207059)
+++ trunk/JSTests/ChangeLog 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-11 Saam Barati <sbarati@apple.com>
+
+ ValueAdd should be constant folded if the operands are constant String,Primitive or Primitive,String
+ https://bugs.webkit.org/show_bug.cgi?id=163182
+
+ Reviewed by Filip Pizlo.
+
+ * microbenchmarks/string-add-constant-folding.js: Added.
+ (assert):
+ (runTests):
+ (add):
+ (test):
+
</ins><span class="cx"> 2016-10-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Object.freeze() and seal() should throw if [[PreventExtensions]]() fails.
</span></span></pre></div>
<a id="trunkJSTestsmicrobenchmarksstringaddconstantfoldingjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/microbenchmarks/string-add-constant-folding.js (0 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/microbenchmarks/string-add-constant-folding.js (rev 0)
+++ trunk/JSTests/microbenchmarks/string-add-constant-folding.js 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion.");
+}
+
+let tests = [];
+function test(f) {
+ noInline(f);
+ tests.push(f);
+}
+
+function runTests() {
+ let start = Date.now();
+ for (let f of tests) {
+ for (let i = 0; i < 40000; i++)
+ f();
+ }
+ const verbose = false;
+ if (verbose)
+ print(Date.now() - start);
+}
+
+function add(a,b) { return a + b; }
+noInline(add);
+
+test(function() {
+ let a = "foo";
+ let b = 20;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+test(function() {
+ let a = "foo";
+ let b = null;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+test(function() {
+ let a = "foo";
+ let b = undefined;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+test(function() {
+ let a = "foo";
+ let b = 20.81239012821;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+test(function() {
+ let a = "foo";
+ let b = true;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+test(function() {
+ let a = "foo";
+ let b = false;
+ assert(a + b === add(a, b));
+ assert(b + a === add(b, a));
+});
+
+runTests();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207059 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-11 07:14:34 UTC (rev 207059)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-11 Saam Barati <sbarati@apple.com>
+
+ ValueAdd should be constant folded if the operands are constant String,Primitive or Primitive,String
+ https://bugs.webkit.org/show_bug.cgi?id=163182
+
+ Reviewed by Filip Pizlo.
+
+ This code pattern shows up in Dromaeo, so it's worth optimizing for.
+ This might also show up in real world JS code due to inlining and other
+ types of constant folding.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGLazyJSValue.cpp:
+ (JSC::DFG::LazyJSValue::getValue):
+ * dfg/DFGStrengthReductionPhase.cpp:
+ (JSC::DFG::StrengthReductionPhase::handleNode):
+
</ins><span class="cx"> 2016-10-10 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add ENABLE_ENCRYPTED_MEDIA configuration option
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (207059 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-10-11 07:14:34 UTC (rev 207059)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -4239,7 +4239,12 @@
</span><span class="cx"> ByValInfo* byValInfo = m_inlineStackTop->m_byValInfos.get(CodeOrigin(currentCodeOrigin().bytecodeIndex));
</span><span class="cx"> // FIXME: When the bytecode is not compiled in the baseline JIT, byValInfo becomes null.
</span><span class="cx"> // At that time, there is no information.
</span><del>- if (byValInfo && byValInfo->stubInfo && !byValInfo->tookSlowPath && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent) && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
</del><ins>+ if (byValInfo
+ && byValInfo->stubInfo
+ && !byValInfo->tookSlowPath
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadType)
+ && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadCell)) {
</ins><span class="cx"> compiledAsPutById = true;
</span><span class="cx"> unsigned identifierNumber = m_graph.identifiers().ensure(byValInfo->cachedId.impl());
</span><span class="cx"> UniquedStringImpl* uid = m_graph.identifiers()[identifierNumber];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGLazyJSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp (207059 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp 2016-10-11 07:14:34 UTC (rev 207059)
+++ trunk/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -51,8 +51,9 @@
</span><span class="cx"> case SingleCharacterString:
</span><span class="cx"> return jsSingleCharacterString(&vm, u.character);
</span><span class="cx"> case KnownStringImpl:
</span><ins>+ return jsString(&vm, u.stringImpl);
</ins><span class="cx"> case NewStringImpl:
</span><del>- return jsString(&vm, u.stringImpl);
</del><ins>+ return jsString(&vm, AtomicStringImpl::add(u.stringImpl));
</ins><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return JSValue();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp (207059 => 207060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-10-11 07:14:34 UTC (rev 207059)
+++ trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-10-11 07:28:08 UTC (rev 207060)
</span><span class="lines">@@ -322,8 +322,48 @@
</span><span class="cx"> // move these to the abstract interpreter once AbstractValue can support LazyJSValue.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=155204
</span><span class="cx">
</span><ins>+ case ValueAdd: {
+ if (m_node->child1()->isConstant()
+ && m_node->child2()->isConstant()
+ && (!!m_node->child1()->tryGetString(m_graph) || !!m_node->child2()->tryGetString(m_graph))) {
+ auto tryGetConstantString = [&] (Node* node) -> String {
+ String string = node->tryGetString(m_graph);
+ if (!string.isEmpty())
+ return string;
+ JSValue value = node->constant()->value();
+ if (!value)
+ return String();
+ if (value.isInt32())
+ return String::number(value.asInt32());
+ if (value.isNumber())
+ return String::numberToStringECMAScript(value.asNumber());
+ if (value.isBoolean())
+ return value.asBoolean() ? ASCIILiteral("true") : ASCIILiteral("false");
+ if (value.isNull())
+ return ASCIILiteral("null");
+ if (value.isUndefined())
+ return ASCIILiteral("undefined");
+ return String();
+ };
+
+ String leftString = tryGetConstantString(m_node->child1().node());
+ if (!leftString)
+ break;
+ String rightString = tryGetConstantString(m_node->child2().node());
+ if (!rightString)
+ break;
+
+ StringBuilder builder;
+ builder.append(leftString);
+ builder.append(rightString);
+ m_node->convertToLazyJSConstant(
+ m_graph, LazyJSValue::newString(m_graph, builder.toString()));
+ m_changed = true;
+ }
+ break;
+ }
+
</ins><span class="cx"> case MakeRope:
</span><del>- case ValueAdd:
</del><span class="cx"> case StrCat: {
</span><span class="cx"> String leftString = m_node->child1()->tryGetString(m_graph);
</span><span class="cx"> if (!leftString)
</span></span></pre>
</div>
</div>
</body>
</html>