<!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>[167577] trunk/Source</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/167577">167577</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-20 21:19:07 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speed up jsStringWithCache() through WeakGCMap inlining.
<https://webkit.org/b/131923>
Source/JavaScriptCore:
Always inline WeakGCMap::add() but move the slow garbage collecting
path out-of-line.
Reviewed by Darin Adler.
* runtime/WeakGCMap.h:
(JSC::WeakGCMap::add):
(JSC::WeakGCMap::gcMap):
Source/WebCore:
Inline the common path of WeakGCMap::add() in jsStringWithCache().
26% progression on Bindings/id-getter.html
Reviewed by Darin Adler.
* WebCore.exp.in:
* bindings/js/JSDOMBinding.h:
* bindings/js/JSDOMBinding.cpp:
(WebCore::jsStringWithCache):
Move jsStringWithCache() out of line since we're now blowing up
its size quite a bit.
Source/WTF:
Add HashMap::fastAdd(), which is the same as add() except we'll tell
the compiler to aggressively inline it.
Reviewed by Darin Adler.
* wtf/HashMap.h:
* wtf/HashTable.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakGCMaph">trunk/Source/JavaScriptCore/runtime/WeakGCMap.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashMaph">trunk/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTableh">trunk/Source/WTF/wtf/HashTable.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-20 Andreas Kling <akling@apple.com>
+
+ Speed up jsStringWithCache() through WeakGCMap inlining.
+ <https://webkit.org/b/131923>
+
+ Always inline WeakGCMap::add() but move the slow garbage collecting
+ path out-of-line.
+
+ Reviewed by Darin Adler.
+
+ * runtime/WeakGCMap.h:
+ (JSC::WeakGCMap::add):
+ (JSC::WeakGCMap::gcMap):
+
</ins><span class="cx"> 2014-04-20 László Langó <llango.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore: ARM build fix after r167094.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakGCMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakGCMap.h (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakGCMap.h 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/JavaScriptCore/runtime/WeakGCMap.h 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx"> return m_map.set(key, std::move(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AddResult add(const KeyType& key, ValueType value)
</del><ins>+ ALWAYS_INLINE AddResult add(const KeyType& key, ValueType value)
</ins><span class="cx"> {
</span><span class="cx"> gcMapIfNeeded();
</span><del>- AddResult addResult = m_map.add(key, nullptr);
</del><ins>+ AddResult addResult = m_map.fastAdd(key, nullptr);
</ins><span class="cx"> if (!addResult.iterator->value) { // New value or found a zombie value.
</span><span class="cx"> addResult.isNewEntry = true;
</span><span class="cx"> addResult.iterator->value = std::move(value);
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> private:
</span><span class="cx"> static const int minGCThreshold = 3;
</span><span class="cx">
</span><del>- void gcMap()
</del><ins>+ NEVER_INLINE void gcMap()
</ins><span class="cx"> {
</span><span class="cx"> Vector<KeyType, 4> zombies;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WTF/ChangeLog 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-20 Andreas Kling <akling@apple.com>
+
+ Speed up jsStringWithCache() through WeakGCMap inlining.
+ <https://webkit.org/b/131923>
+
+ Add HashMap::fastAdd(), which is the same as add() except we'll tell
+ the compiler to aggressively inline it.
+
+ Reviewed by Darin Adler.
+
+ * wtf/HashMap.h:
+ * wtf/HashTable.h:
+
</ins><span class="cx"> 2014-04-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it easier to check if an integer sum would overflow
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashMap.h (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashMap.h 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WTF/wtf/HashMap.h 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -114,6 +114,10 @@
</span><span class="cx"> template<typename V> AddResult add(const KeyType&, V&&);
</span><span class="cx"> template<typename V> AddResult add(KeyType&&, V&&);
</span><span class="cx">
</span><ins>+ // Same as add(), but aggressively inlined.
+ template<typename V> AddResult fastAdd(const KeyType&, V&&);
+ template<typename V> AddResult fastAdd(KeyType&&, V&&);
+
</ins><span class="cx"> bool remove(const KeyType&);
</span><span class="cx"> bool remove(iterator);
</span><span class="cx"> void clear();
</span><span class="lines">@@ -276,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
</span><span class="cx"> template<typename K, typename V>
</span><del>-auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::inlineAdd(K&& key, V&& value) -> AddResult
</del><ins>+ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::inlineAdd(K&& key, V&& value) -> AddResult
</ins><span class="cx"> {
</span><span class="cx"> return m_impl.template add<HashMapTranslator<KeyValuePairTraits, HashFunctions>>(std::forward<K>(key), std::forward<V>(value));
</span><span class="cx"> }
</span><span class="lines">@@ -316,6 +320,20 @@
</span><span class="cx"> return inlineAdd(std::move(key), std::forward<T>(mapped));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
+template<typename T>
+ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::fastAdd(const KeyType& key, T&& mapped) -> AddResult
+{
+ return inlineAdd(key, std::forward<T>(mapped));
+}
+
+template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
+template<typename T>
+ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::fastAdd(KeyType&& key, T&& mapped) -> AddResult
+{
+ return inlineAdd(std::move(key), std::forward<T>(mapped));
+}
+
</ins><span class="cx"> template<typename T, typename U, typename V, typename W, typename MappedTraits>
</span><span class="cx"> auto HashMap<T, U, V, W, MappedTraits>::get(const KeyType& key) const -> MappedPeekType
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTable.h (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTable.h 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WTF/wtf/HashTable.h 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><span class="cx"> template<typename HashTranslator, typename T, typename Extra>
</span><del>- inline auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::add(T&& key, Extra&& extra) -> AddResult
</del><ins>+ ALWAYS_INLINE auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::add(T&& key, Extra&& extra) -> AddResult
</ins><span class="cx"> {
</span><span class="cx"> checkKey<HashTranslator>(key);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-20 Andreas Kling <akling@apple.com>
+
+ Speed up jsStringWithCache() through WeakGCMap inlining.
+ <https://webkit.org/b/131923>
+
+ Inline the common path of WeakGCMap::add() in jsStringWithCache().
+ 26% progression on Bindings/id-getter.html
+
+ Reviewed by Darin Adler.
+
+ * WebCore.exp.in:
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::jsStringWithCache):
+
+ Move jsStringWithCache() out of line since we're now blowing up
+ its size quite a bit.
+
</ins><span class="cx"> 2014-04-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the build after r167574
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -746,6 +746,7 @@
</span><span class="cx"> __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
</span><span class="cx"> __ZN7WebCore17drawLayerContentsEP9CGContextPNS_15PlatformCALayerERN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore17encodeForFileNameERKN3WTF6StringE
</span><ins>+__ZN7WebCore17jsStringWithCacheEPN3JSC9ExecStateERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore17languageDidChangeEv
</span><span class="cx"> __ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
</span><span class="cx"> __ZN7WebCore17sRGBColorSpaceRefEv
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -63,6 +63,27 @@
</span><span class="cx"> return DOMObjectHashTableMap::mapFor(vm).get(staticTable);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSC::JSValue jsStringWithCache(JSC::ExecState* exec, const String& s)
+{
+ StringImpl* stringImpl = s.impl();
+ if (!stringImpl || !stringImpl->length())
+ return jsEmptyString(exec);
+
+ if (stringImpl->length() == 1) {
+ UChar singleCharacter = (*stringImpl)[0u];
+ if (singleCharacter <= JSC::maxSingleCharacterString) {
+ JSC::VM* vm = &exec->vm();
+ return vm->smallStrings.singleCharacterString(static_cast<unsigned char>(singleCharacter));
+ }
+ }
+
+ JSStringCache& stringCache = currentWorld(exec).m_stringCache;
+ JSStringCache::AddResult addResult = stringCache.add(stringImpl, nullptr);
+ if (addResult.isNewEntry)
+ addResult.iterator->value = JSC::jsString(exec, String(stringImpl));
+ return JSC::JSValue(addResult.iterator->value.get());
+}
+
</ins><span class="cx"> JSValue jsStringOrNull(ExecState* exec, const String& s)
</span><span class="cx"> {
</span><span class="cx"> if (s.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (167576 => 167577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-04-20 22:45:38 UTC (rev 167576)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-04-21 04:19:07 UTC (rev 167577)
</span><span class="lines">@@ -559,27 +559,6 @@
</span><span class="cx"> void printErrorMessageForFrame(Frame*, const String& message);
</span><span class="cx"> JSC::EncodedJSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx">
</span><del>-inline JSC::JSValue jsStringWithCache(JSC::ExecState* exec, const String& s)
-{
- StringImpl* stringImpl = s.impl();
- if (!stringImpl || !stringImpl->length())
- return jsEmptyString(exec);
-
- if (stringImpl->length() == 1) {
- UChar singleCharacter = (*stringImpl)[0u];
- if (singleCharacter <= JSC::maxSingleCharacterString) {
- JSC::VM* vm = &exec->vm();
- return vm->smallStrings.singleCharacterString(static_cast<unsigned char>(singleCharacter));
- }
- }
-
- JSStringCache& stringCache = currentWorld(exec).m_stringCache;
- JSStringCache::AddResult addResult = stringCache.add(stringImpl, nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = JSC::jsString(exec, String(stringImpl));
- return JSC::JSValue(addResult.iterator->value.get());
-}
-
</del><span class="cx"> inline String propertyNameToString(JSC::PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> return propertyName.publicName();
</span></span></pre>
</div>
</div>
</body>
</html>