Changeset 115290 in webkit

Timestamp:

Apr 25, 2012, 10:27:52 PM (13 years ago)

Author:

benjamin@webkit.org

Message:

Add a version of StringImpl::find() without offset
​https://bugs.webkit.org/show_bug.cgi?id=83968

Source/JavaScriptCore:

Reviewed by Sam Weinig.

Add support for the new StringImpl::find() to UString.

Change stringProtoFuncIndexOf() to specifically take advatage of the feature.
This gives a 12% gains on a distribution of strings between 30 and 100 characters.

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferences):
(JSC::stringProtoFuncIndexOf):

• runtime/UString.h:

(UString):
(JSC::UString::find):

Source/WebCore:

Reviewed by Sam Weinig.

Remove the zero offset of the find() functions on strings.

• html/parser/XSSAuditor.cpp:

(WebCore::XSSAuditor::init):

• platform/network/ResourceResponseBase.cpp:

(WebCore::trimToNextSeparator):
(WebCore::parseCacheHeader):

Source/WebKit2:

Update the symbols files.

• win/WebKit2.def:
• win/WebKit2CFLite.def:

Source/WTF:

Reviewed by Sam Weinig.

This patch add a version of StringImpl::find() without offset, Instead of using the default
value for the index.

By not having the index, we can skip a couple of branches and a few instructions. This gives
significant gains when the strings are short-ish.

The case of empty string is moved below (matchLength == 1) since it is a less common operation.

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::find):
(WTF):

• wtf/text/StringImpl.h:

(StringImpl):

• wtf/text/WTFString.h:

(String):
(WTF::String::find):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/StringPrototype.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/UString.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/StringImpl.cpp (modified) (3 diffs)
• WTF/wtf/text/StringImpl.h (modified) (1 diff)
• WTF/wtf/text/WTFString.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/parser/XSSAuditor.cpp (modified) (2 diffs)
• WebCore/platform/network/ResourceResponseBase.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/win/WebKit2.def (modified) (1 diff)
• WebKit2/win/WebKit2CFLite.def (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-04-25  Benjamin Poulain  <benjamin@webkit.org>
+
+        Add a version of StringImpl::find() without offset
+        https://bugs.webkit.org/show_bug.cgi?id=83968
+
+        Reviewed by Sam Weinig.
+
+        Add support for the new StringImpl::find() to UString.
+
+        Change stringProtoFuncIndexOf() to specifically take advatage of the feature.
+        This gives a 12% gains on a distribution of strings between 30 and 100 characters.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::substituteBackreferences):
+        (JSC::stringProtoFuncIndexOf):
+        * runtime/UString.h:
+        (UString):
+        (JSC::UString::find):
+
 2012-04-25  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -241 +241 @@
 static inline UString substituteBackreferences(const UString& replacement, const UString& source, const int* ovector, RegExp* reg)
 {
-    size_t i = replacement.find('$', 0);
+    size_t i = replacement.find('$');
     if (UNLIKELY(i != notFound)) {
         if (replacement.is8Bit() && source.is8Bit())
@@ -755 +755 @@
         return throwVMTypeError(exec);
     UString s = thisValue.toString(exec)->value(exec);
-    int len = s.length();
 
     JSValue a0 = exec->argument(0);
     JSValue a1 = exec->argument(1);
     UString u2 = a0.toString(exec)->value(exec);
-    int pos;
+
+    size_t result;
     if (a1.isUndefined())
-        pos = 0;
-    else if (a1.isUInt32())
-        pos = min<uint32_t>(a1.asUInt32(), len);
+        result = s.find(u2);
     else {
-        double dpos = a1.toInteger(exec);
-        if (dpos < 0)
-            dpos = 0;
-        else if (dpos > len)
-            dpos = len;
-        pos = static_cast<int>(dpos);
-    }
-
-    size_t result = s.find(u2, pos);
+        unsigned pos;
+        int len = s.length();
+        if (a1.isUInt32())
+            pos = min<uint32_t>(a1.asUInt32(), len);
+        else {
+            double dpos = a1.toInteger(exec);
+            if (dpos < 0)
+                dpos = 0;
+            else if (dpos > len)
+                dpos = len;
+            pos = static_cast<unsigned>(dpos);
+        }
+        result = s.find(u2, pos);
+    }
+
     if (result == notFound)
         return JSValue::encode(jsNumber(-1));

trunk/Source/JavaScriptCore/runtime/UString.h

@@ -122 +122 @@
     size_t find(UChar c, unsigned start = 0) const
         { return m_impl ? m_impl->find(c, start) : notFound; }
-    size_t find(const UString& str, unsigned start = 0) const
+
+    size_t find(const UString& str) const
+        { return m_impl ? m_impl->find(str.impl()) : notFound; }
+    size_t find(const UString& str, unsigned start) const
         { return m_impl ? m_impl->find(str.impl(), start) : notFound; }
+
     size_t find(const LChar* str, unsigned start = 0) const
         { return m_impl ? m_impl->find(str, start) : notFound; }

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-04-25  Benjamin Poulain  <benjamin@webkit.org>
+
+        Add a version of StringImpl::find() without offset
+        https://bugs.webkit.org/show_bug.cgi?id=83968
+
+        Reviewed by Sam Weinig.
+
+        This patch add a version of StringImpl::find() without offset, Instead of using the default
+        value for the index.
+
+        By not having the index, we can skip a couple of branches and a few instructions. This gives
+        significant gains when the strings are short-ish.
+
+        The case of empty string is moved below (matchLength == 1) since it is a less common operation.
+
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::find):
+        (WTF):
+        * wtf/text/StringImpl.h:
+        (StringImpl):
+        * wtf/text/WTFString.h:
+        (String):
+        (WTF::String::find):
+
 2012-04-25  Darin Adler  <darin@apple.com>
 

trunk/Source/WTF/wtf/text/StringImpl.cpp

@@ -895 +895 @@
 }
 
+size_t StringImpl::find(StringImpl* matchString)
+{
+    // Check for null string to match against
+    if (UNLIKELY(!matchString))
+        return notFound;
+    unsigned matchLength = matchString->length();
+
+    // Optimization 1: fast case for strings of length 1.
+    if (matchLength == 1) {
+        if (is8Bit()) {
+            if (matchString->is8Bit())
+                return WTF::find(characters8(), length(), matchString->characters8()[0]);
+            return WTF::find(characters8(), length(), matchString->characters16()[0]);
+        }
+        if (matchString->is8Bit())
+            return WTF::find(characters16(), length(), matchString->characters8()[0]);
+        return WTF::find(characters16(), length(), matchString->characters16()[0]);
+    }
+
+    // Check matchLength is in range.
+    if (matchLength > length())
+        return notFound;
+
+    // Check for empty string to match against
+    if (UNLIKELY(!matchLength))
+        return 0;
+
+    if (is8Bit() && matchString->is8Bit())
+        return findInner(characters8(), matchString->characters8(), 0, length(), matchLength);
+
+    return findInner(characters(), matchString->characters(), 0, length(), matchLength);
+}
+
 size_t StringImpl::find(StringImpl* matchString, unsigned index)
 {
     // Check for null or empty string to match against
-    if (!matchString)
-        return notFound;
+    if (UNLIKELY(!matchString))
+        return notFound;
+
     unsigned matchLength = matchString->length();
-    if (!matchLength)
-        return min(index, length());
 
     // Optimization 1: fast case for strings of length 1.
@@ -916 +948 @@
     }
 
+    if (UNLIKELY(!matchLength))
+        return min(index, length());
+
     // Check index & matchLength are in range.
     if (index > length())
@@ -927 +962 @@
 
     return findInner(characters() + index, matchString->characters(), index, searchLength, matchLength);
-
 }
 

trunk/Source/WTF/wtf/text/StringImpl.h

@@ -488 +488 @@
     size_t find(const LChar*, unsigned index = 0);
     ALWAYS_INLINE size_t find(const char* s, unsigned index = 0) { return find(reinterpret_cast<const LChar*>(s), index); };
-    WTF_EXPORT_PRIVATE size_t find(StringImpl*, unsigned index = 0);
+    WTF_EXPORT_PRIVATE size_t find(StringImpl*);
+    WTF_EXPORT_PRIVATE size_t find(StringImpl*, unsigned index);
     size_t findIgnoringCase(const LChar*, unsigned index = 0);
     ALWAYS_INLINE size_t findIgnoringCase(const char* s, unsigned index = 0) { return findIgnoringCase(reinterpret_cast<const LChar*>(s), index); };

trunk/Source/WTF/wtf/text/WTFString.h

@@ -206 +206 @@
     size_t find(UChar c, unsigned start = 0) const
         { return m_impl ? m_impl->find(c, start) : notFound; }
-    size_t find(const String& str, unsigned start = 0) const
+
+    size_t find(const String& str) const
+        { return m_impl ? m_impl->find(str.impl()) : notFound; }
+    size_t find(const String& str, unsigned start) const
         { return m_impl ? m_impl->find(str.impl(), start) : notFound; }
+
     size_t find(CharacterMatchFunctionPtr matchFunction, unsigned start = 0) const
         { return m_impl ? m_impl->find(matchFunction, start) : notFound; }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-25  Benjamin Poulain  <benjamin@webkit.org>
+
+        Add a version of StringImpl::find() without offset
+        https://bugs.webkit.org/show_bug.cgi?id=83968
+
+        Reviewed by Sam Weinig.
+
+        Remove the zero offset of the find() functions on strings.
+
+        * html/parser/XSSAuditor.cpp:
+        (WebCore::XSSAuditor::init):
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::trimToNextSeparator):
+        (WebCore::parseCacheHeader):
+
 2012-04-25  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebCore/html/parser/XSSAuditor.cpp

@@ -212 +212 @@
     TextResourceDecoder* decoder = m_parser->document()->decoder();
     m_decodedURL = fullyDecodeString(url.string(), decoder);
-    if (m_decodedURL.find(isRequiredForInjection, 0) == notFound)
+    if (m_decodedURL.find(isRequiredForInjection) == notFound)
         m_decodedURL = String();
 
@@ -224 +224 @@
             if (!httpBodyAsString.isEmpty()) {
                 m_decodedHTTPBody = fullyDecodeString(httpBodyAsString, decoder);
-                if (m_decodedHTTPBody.find(isRequiredForInjection, 0) == notFound)
+                if (m_decodedHTTPBody.find(isRequiredForInjection) == notFound)
                     m_decodedHTTPBody = String();
                 if (m_decodedHTTPBody.length() >= miniumLengthForSuffixTree)

trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

@@ -631 +631 @@
 static inline String trimToNextSeparator(const String& str)
 {
-    return str.substring(0, str.find(isCacheHeaderSeparator, 0));
+    return str.substring(0, str.find(isCacheHeaderSeparator));
 }
 
@@ -667 +667 @@
             } else {
                 // The value is a token until the next comma
-                size_t nextCommaPosition2 = value.find(',', 0);
+                size_t nextCommaPosition2 = value.find(',');
                 if (nextCommaPosition2 != notFound) {
                     // The value is delimited by the next comma

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-04-25  Benjamin Poulain  <benjamin@webkit.org>
+
+        Add a version of StringImpl::find() without offset
+        https://bugs.webkit.org/show_bug.cgi?id=83968
+
+        Update the symbols files.
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-04-25  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebKit2/win/WebKit2.def

@@ -169 +169 @@
         ?externalRepresentation@WebCore@@YA?AVString@WTF@@PAVElement@1@I@Z
         ?find@StringImpl@WTF@@QAEIPAV12@I@Z
+        ?find@StringImpl@WTF@@QAEIPAV12@@Z
         ?frameDestroyed@FrameDestructionObserver@WebCore@@UAEXXZ
         ?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z

trunk/Source/WebKit2/win/WebKit2CFLite.def

@@ -162 +162 @@
         ?externalRepresentation@WebCore@@YA?AVString@WTF@@PAVElement@1@I@Z
         ?find@StringImpl@WTF@@QAEIPAV12@I@Z
+        ?find@StringImpl@WTF@@QAEIPAV12@@Z
         ?frameDestroyed@FrameDestructionObserver@WebCore@@UAEXXZ
         ?fromUTF8WithLatin1Fallback@String@WTF@@SA?AV12@PBEI@Z