Changeset 36006 in webkit for trunk/JavaScriptCore/kjs/JSString.h


Ignore:
Timestamp:
Aug 30, 2008, 11:58:07 PM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

2008-08-30 Darin Adler <Darin Adler>

Reviewed by Maciej.

1.035x as fast on SunSpider overall.
1.127x as fast on SunSpider string tests.
1.910x as fast on SunSpider string-base64 test.

  • API/JSObjectRef.cpp: (JSObjectMakeFunction): Removed unneeded explicit construction of UString.
  • GNUmakefile.am: Added SmallStrings.h and SmallStrings.cpp.
  • JavaScriptCore.pri: Ditto.
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Ditto.
  • JavaScriptCore.xcodeproj/project.pbxproj: Ditto.
  • JavaScriptCoreSources.bkl: Ditto.
  • VM/Machine.cpp: (KJS::jsAddSlowCase): Changed to use a code path that doesn't involve a UString constructor. This avoids an extra jump caused by the "in charge" vs. "not in charge" constructors. (KJS::jsAdd): Ditto. (KJS::jsTypeStringForValue): Adopted jsNontrivialString.
  • kjs/ArrayPrototype.cpp: (KJS::arrayProtoFuncToString): Adopted jsEmptyString. (KJS::arrayProtoFuncToLocaleString): Ditto. (KJS::arrayProtoFuncJoin): Ditto.
  • kjs/BooleanPrototype.cpp: (KJS::booleanProtoFuncToString): Adopted jsNontrivialString.
  • kjs/DateConstructor.cpp: (KJS::callDate): Ditto.
  • kjs/DatePrototype.cpp: (KJS::formatLocaleDate): Adopted jsEmptyString and jsNontrivialString. (KJS::dateProtoFuncToString): Ditto. (KJS::dateProtoFuncToUTCString): Ditto. (KJS::dateProtoFuncToDateString): Ditto. (KJS::dateProtoFuncToTimeString): Ditto. (KJS::dateProtoFuncToLocaleString): Ditto. (KJS::dateProtoFuncToLocaleDateString): Ditto. (KJS::dateProtoFuncToLocaleTimeString): Ditto. (KJS::dateProtoFuncToGMTString): Ditto.
  • kjs/ErrorPrototype.cpp: (KJS::ErrorPrototype::ErrorPrototype): Ditto. (KJS::errorProtoFuncToString): Ditto.
  • kjs/JSGlobalData.h: Added SmallStrings.
  • kjs/JSString.cpp: (KJS::jsString): Eliminated the overload that takes a const char*. Added code to use SmallStrings to get strings of small sizes rather than creating a new JSString every time. (KJS::jsSubstring): Added. Used when creating a string from a substring to avoid creating a JSString in cases where the substring will end up empty or as one character. (KJS::jsOwnedString): Added the same code as in jsString.
  • kjs/JSString.h: Added new functions jsEmptyString, jsSingleCharacterString, jsSingleCharacterSubstring, jsSubstring, and jsNontrivialString for various cases where we want to create JSString, and want special handling for small strings. (KJS::JSString::JSString): Added an overload that takes a PassRefPtr of a UString::Rep so you don't have to construct a UString; PassRefPtr can be more efficient. (KJS::jsEmptyString): Added. (KJS::jsSingleCharacterString): Added. (KJS::jsSingleCharacterSubstring): Added. (KJS::jsNontrivialString): Added. (KJS::JSString::getIndex): Adopted jsSingleCharacterSubstring. (KJS::JSString::getStringPropertySlot): Ditto.
  • kjs/NumberPrototype.cpp: (KJS::numberProtoFuncToFixed): Adopted jsNontrivialString. (KJS::numberProtoFuncToExponential): Ditto. (KJS::numberProtoFuncToPrecision): Ditto.
  • kjs/ObjectPrototype.cpp: (KJS::objectProtoFuncToLocaleString): Adopted toThisJSString. (KJS::objectProtoFuncToString): Adopted jsNontrivialString.
  • kjs/RegExpConstructor.cpp: Separated the lastInput value that's used with the lastOvector to return matches from the input value that can be changed via JavaScript. They will be equal in many cases, but not all. (KJS::RegExpConstructor::performMatch): Set input. (KJS::RegExpMatchesArray::RegExpMatchesArray): Ditto. (KJS::RegExpMatchesArray::fillArrayInstance): Adopted jsSubstring. Also, use input rather than lastInput in the appropriate place. (KJS::RegExpConstructor::getBackref): Adopted jsSubstring and jsEmptyString. Added code to handle the case where there is no backref -- before this depended on range checking in UString::substr which is not present in jsSubstring. (KJS::RegExpConstructor::getLastParen): Ditto. (KJS::RegExpConstructor::getLeftContext): Ditto. (KJS::RegExpConstructor::getRightContext): Ditto. (KJS::RegExpConstructor::getValueProperty): Use input rather than lastInput. Also adopt jsEmptyString. (KJS::RegExpConstructor::putValueProperty): Ditto. (KJS::RegExpConstructor::input): Ditto.
  • kjs/RegExpPrototype.cpp: (KJS::regExpProtoFuncToString): Adopt jsNonTrivialString. Also changed to use UString::append to append single characters rather than using += and a C-style string.
  • kjs/SmallStrings.cpp: Added. (KJS::SmallStringsStorage::SmallStringsStorage): Construct the buffer and UString::Rep for all 256 single-character strings for the U+0000 through U+00FF. This covers all the values used in the base64 test as well as most values seen elsewhere on the web as well. It's possible that later we might fix this to only work for U+0000 through U+007F but the others are used quite a bit in the current version of the base64 test. (KJS::SmallStringsStorage::~SmallStringsStorage): Free memory. (KJS::SmallStrings::SmallStrings): Create a set of small strings, initially not created; created later when they are used. (KJS::SmallStrings::~SmallStrings): Deallocate. Not left compiler generated because the SmallStringsStorage class's destructor needs to be visible. (KJS::SmallStrings::mark): Mark all the strings. (KJS::SmallStrings::createEmptyString): Create a cell for the empty string. Called only the first time. (KJS::SmallStrings::createSingleCharacterString): Create a cell for one of the single-character strings. Called only the first time.
  • kjs/SmallStrings.h: Added.
  • kjs/StringConstructor.cpp: (KJS::stringFromCharCodeSlowCase): Factored out of strinFromCharCode. Only used for cases where the caller does not pass exactly one argument. (KJS::stringFromCharCode): Adopted jsSingleCharacterString. (KJS::callStringConstructor): Adopted jsEmptyString.
  • kjs/StringObject.cpp: (KJS::StringObject::StringObject): Adopted jsEmptyString.
  • kjs/StringPrototype.cpp: (KJS::stringProtoFuncReplace): Adopted jsSubstring. (KJS::stringProtoFuncCharAt): Adopted jsEmptyString and jsSingleCharacterSubstring and also added a special case when the index is an immediate number to avoid conversion to and from floating point, since that's the common case. (KJS::stringProtoFuncCharCodeAt): Ditto. (KJS::stringProtoFuncMatch): Adopted jsSubstring and jsEmptyString. (KJS::stringProtoFuncSlice): Adopted jsSubstring and jsSingleCharacterSubstring. Also got rid of some unneeded locals and removed unneeded code to set the length property of the array, since it is automatically updated as values are added to the array. (KJS::stringProtoFuncSplit): Adopted jsEmptyString. (KJS::stringProtoFuncSubstr): Adopted jsSubstring. (KJS::stringProtoFuncSubstring): Ditto.
  • kjs/collector.cpp: (KJS::Heap::collect): Added a call to mark SmallStrings.
  • kjs/ustring.cpp: (KJS::UString::expandedSize): Made this a static member function since it doesn't need to look at any data members. (KJS::UString::expandCapacity): Use a non-inline function, makeNull, to set the rep to null in failure cases. This avoids adding a PIC branch for the normal case when there is no failure. (KJS::UString::expandPreCapacity): Ditto. (KJS::UString::UString): Ditto. (KJS::concatenate): Refactored the concatenation constructor into this separate function. Calling the concatenation constructor was leading to an extra branch because of the in-charge vs. not-in-charge versions not both being inlined, and this was showing up as nearly 1% on Shark. Also added a special case for when the second string is a single character, since it's a common idiom to build up a string that way and we can do things much more quickly, without involving memcpy for example. Also adopted the non-inline function, nullRep, for the same reason given for makeNull above. (KJS::UString::append): Adopted makeNull for failure cases. (KJS::UString::operator=): Ditto. (KJS::UString::toDouble): Added a special case for converting single character strings to numbers. We're doing this a ton of times while running the base64 test. (KJS::operator==): Added special cases so we can compare single-character strings without calling memcmp. Later we might want to special case other short lengths similarly. (KJS::UString::makeNull): Added. (KJS::UString::nullRep): Added.
  • kjs/ustring.h: Added declarations for the nullRep and makeNull. Changed expandedSize to be a static member function. Added a declaration of the concatenate function. Removed the concatenation constructor. Rewrote operator+ to use the concatenate function.

WebCore:

2008-08-30 Darin Adler <Darin Adler>

Reviewed by Maciej.

  • bindings/js/JSDOMWindowBase.cpp: (WebCore::windowProtoFuncAToB): Adopted jsEmptyString. (WebCore::windowProtoFuncBToA): Ditto.
  • bindings/js/JSEventListener.cpp: (WebCore::JSLazyEventListener::eventParameterName): Adopted jsNontrivialString.
  • bindings/js/JSSVGLazyEventListener.cpp: (WebCore::JSSVGLazyEventListener::eventParameterName): Ditto.

LayoutTests:

2008-08-30 Darin Adler <Darin Adler>

Reviewed by Maciej.

  • updated incorrect results that reflected a bug in the RegExp object
  • fast/js/regexp-caching-expected.txt: Updated results to correctly show that $1 through $9, lastMatch, lastParen, leftContext, and rightContext are left alone both when a program changes the value of RegExp.input and when it performs an unsuccessful match. The new results match Gecko behavior (I tested both Firefox 2 and 3).
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/JSString.h

    r35900 r36006  
    2626#include "CommonIdentifiers.h"
    2727#include "ExecState.h"
    28 #include "JSCell.h"
    2928#include "JSNumberCell.h"
    3029#include "PropertySlot.h"
    3130#include "identifier.h"
    32 #include "ustring.h"
    3331
    3432namespace KJS {
     33
     34    class JSString;
     35
     36    JSString* jsEmptyString(ExecState*);
     37    JSString* jsString(ExecState*, const UString&); // returns empty string if passed null string
     38
     39    JSString* jsSingleCharacterString(ExecState*, UChar);
     40    JSString* jsSingleCharacterSubstring(ExecState*, const UString&, unsigned offset);
     41    JSString* jsSubstring(ExecState*, const UString&, unsigned offset, unsigned length);
     42
     43    // Non-trivial strings are two or more characters long.
     44    // These functions are faster than just calling jsString.
     45    JSString* jsNontrivialString(ExecState*, const UString&);
     46    JSString* jsNontrivialString(ExecState*, const char*);
     47
     48    // Should be used for strings that are owned by an object that will
     49    // likely outlive the JSValue this makes, such as the parse tree or a
     50    // DOM object that contains a UString
     51    JSString* jsOwnedString(ExecState*, const UString&);
    3552
    3653    class JSString : public JSCell {
    … …  
    4764        {
    4865        }
    49 
     66        JSString(PassRefPtr<UString::Rep> value, HasOtherOwnerType)
     67            : m_value(value)
     68        {
     69        }
     70       
    5071        const UString& value() const { return m_value; }
    5172
    … …  
    5475
    5576        bool canGetIndex(unsigned i) { return i < static_cast<unsigned>(m_value.size()); }
    56         JSValue* getIndex(ExecState* exec, unsigned i)
    57         {
    58             ASSERT(canGetIndex(i));
    59             return new (exec) JSString(m_value.substr(i, 1));
    60         }
     77        JSString* getIndex(ExecState*, unsigned);
    6178
    6279    private:
    … …  
    8198    };
    8299
    83     JSString* jsString(ExecState*, const UString&); // returns empty string if passed null string
    84     JSString* jsString(ExecState*, const char* = ""); // returns empty string if passed 0
     100    inline JSString* jsEmptyString(ExecState* exec)
     101    {
     102        return exec->globalData().smallStrings.emptyString(exec);
     103    }
    85104
    86     // Should be used for strings that are owned by an object that will
    87     // likely outlive the JSValue this makes, such as the parse tree or a
    88     // DOM object that contains a UString
    89     JSString* jsOwnedString(ExecState*, const UString&);
     105    inline JSString* jsSingleCharacterString(ExecState* exec, UChar c)
     106    {
     107        if (c <= 0xFF)
     108            return exec->globalData().smallStrings.singleCharacterString(exec, c);
     109        return new (exec) JSString(UString(&c, 1));
     110    }
     111
     112    inline JSString* jsSingleCharacterSubstring(ExecState* exec, const UString& s, unsigned offset)
     113    {
     114        ASSERT(offset < static_cast<unsigned>(s.size()));
     115        UChar c = s.data()[offset];
     116        if (c <= 0xFF)
     117            return exec->globalData().smallStrings.singleCharacterString(exec, c);
     118        return new (exec) JSString(UString::Rep::create(s.rep(), offset, 1));
     119    }
     120
     121    inline JSString* jsNontrivialString(ExecState* exec, const char* s)
     122    {
     123        ASSERT(s);
     124        ASSERT(s[0]);
     125        ASSERT(s[1]);
     126        return new (exec) JSString(s);
     127    }
     128
     129    inline JSString* jsNontrivialString(ExecState* exec, const UString& s)
     130    {
     131        ASSERT(s.size() > 1);
     132        return new (exec) JSString(s);
     133    }
     134
     135    inline JSString* JSString::getIndex(ExecState* exec, unsigned i)
     136    {
     137        ASSERT(canGetIndex(i));
     138        return jsSingleCharacterSubstring(exec, m_value, i);
     139    }
    90140
    91141    ALWAYS_INLINE bool JSString::getStringPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    92142    {
    93143        if (propertyName == exec->propertyNames().length) {
    94             slot.setValue(jsNumber(exec, value().size()));
     144            slot.setValue(jsNumber(exec, m_value.size()));
    95145            return true;
    96146        }
    … …  
    99149        unsigned i = propertyName.toStrictUInt32(&isStrictUInt32);
    100150        if (isStrictUInt32 && i < static_cast<unsigned>(m_value.size())) {
    101             slot.setValue(jsString(exec, value().substr(i, 1)));
     151            slot.setValue(jsSingleCharacterSubstring(exec, m_value, i));
    102152            return true;
    103153        }
    … …  
    109159    {
    110160        if (propertyName < static_cast<unsigned>(m_value.size())) {
    111             slot.setValue(jsString(exec, value().substr(propertyName, 1)));
     161            slot.setValue(jsSingleCharacterSubstring(exec, m_value, propertyName));
    112162            return true;
    113163        }
Note: See TracChangeset for help on using the changeset viewer.