Changeset 251882 in webkit

Timestamp:

Oct 31, 2019 2:53:18 PM (4 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Make String#localeCompare faster by inlining JSGlobalObject::defaultCollator
​https://bugs.webkit.org/show_bug.cgi?id=203696

Reviewed by Mark Lam.

We found that JSGlobalObject::defaultCollator is not inlined and it takes some time in JetStream2/cdjs.
We use LazyProperty mechanism here and make JSGlobalObject::defaultCollator function inlinable simple one.
This patch improves JetStream2/cdjs by 2%.

• runtime/IntlCollator.cpp:

(JSC::IntlCollator::initializeCollator):

• runtime/IntlObject.cpp:

(JSC::intlBooleanOption):
(JSC::intlStringOption):
(JSC::intlNumberOption):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):
(JSC::JSGlobalObject::defaultCollator): Deleted.

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::defaultCollator const):

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncLocaleCompare):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/IntlCollator.cpp (modified) (1 diff)
• runtime/IntlObject.cpp (modified) (3 diffs)
• runtime/JSGlobalObject.cpp (modified) (3 diffs)
• runtime/JSGlobalObject.h (modified) (2 diffs)
• runtime/StringPrototype.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-10-31  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Make String#localeCompare faster by inlining JSGlobalObject::defaultCollator
+        https://bugs.webkit.org/show_bug.cgi?id=203696
+
+        Reviewed by Mark Lam.
+
+        We found that JSGlobalObject::defaultCollator is not inlined and it takes some time in JetStream2/cdjs.
+        We use LazyProperty mechanism here and make JSGlobalObject::defaultCollator function inlinable simple one.
+        This patch improves JetStream2/cdjs by 2%.
+
+        * runtime/IntlCollator.cpp:
+        (JSC::IntlCollator::initializeCollator):
+        * runtime/IntlObject.cpp:
+        (JSC::intlBooleanOption):
+        (JSC::intlStringOption):
+        (JSC::intlNumberOption):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::init):
+        (JSC::JSGlobalObject::visitChildren):
+        (JSC::JSGlobalObject::defaultCollator): Deleted.
+        * runtime/JSGlobalObject.h:
+        (JSC::JSGlobalObject::defaultCollator const):
+        * runtime/StringPrototype.cpp:
+        (JSC::stringProtoFuncLocaleCompare):
+
 2019-10-31  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp

@@ -185 +185 @@
     RETURN_IF_EXCEPTION(scope, void());
 
-    JSObject* options;
-    if (optionsValue.isUndefined())
-        options = constructEmptyObject(vm, globalObject->nullPrototypeObjectStructure());
-    else {
+    JSValue options = optionsValue;
+    if (!optionsValue.isUndefined()) {
         options = optionsValue.toObject(globalObject);
         RETURN_IF_EXCEPTION(scope, void());

trunk/Source/JavaScriptCore/runtime/IntlObject.cpp

@@ -152 +152 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
 
+    if (options.isUndefined()) {
+        usesFallback = true;
+        return false;
+    }
+
     JSObject* opts = options.toObject(globalObject);
     RETURN_IF_EXCEPTION(scope, false);
@@ -177 +182 @@
     auto scope = DECLARE_THROW_SCOPE(vm);
 
+    if (options.isUndefined())
+        return fallback;
+
     JSObject* opts = options.toObject(globalObject);
     RETURN_IF_EXCEPTION(scope, String());
@@ -204 +212 @@
     VM& vm = globalObject->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
+
+    if (options.isUndefined())
+        return fallback;
 
     JSObject* opts = options.toObject(globalObject);

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -894 +894 @@
             init.set(IntlPluralRules::createStructure(init.vm, globalObject, pluralRulesPrototype));
         });
+    m_defaultCollator.initLater(
+        [] (const Initializer<IntlCollator>& init) {
+            JSGlobalObject* globalObject = jsCast<JSGlobalObject*>(init.owner);
+            VM& vm = init.vm;
+            auto scope = DECLARE_CATCH_SCOPE(vm);
+            IntlCollator* collator = IntlCollator::create(vm, globalObject->collatorStructure());
+            collator->initializeCollator(globalObject, jsUndefined(), jsUndefined());
+            scope.releaseAssertNoException();
+            init.set(collator);
+        });
 
     IntlObject* intl = IntlObject::create(vm, IntlObject::createStructure(vm, this, m_objectPrototype.get()));
@@ -1691 +1701 @@
 
 #if ENABLE(INTL)
-    visitor.append(thisObject->m_defaultCollator);
+    thisObject->m_defaultCollator.visit(visitor);
     thisObject->m_collatorStructure.visit(visitor);
     thisObject->m_numberFormatStructure.visit(visitor);
@@ -2061 +2071 @@
 }
 
-IntlCollator* JSGlobalObject::defaultCollator(JSGlobalObject* globalObject)
-{
-    VM& vm = globalObject->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-
-    if (m_defaultCollator)
-        return m_defaultCollator.get();
-
-    IntlCollator* collator = IntlCollator::create(vm, collatorStructure());
-    collator->initializeCollator(globalObject, jsUndefined(), jsUndefined());
-    RETURN_IF_EXCEPTION(scope, nullptr);
-    m_defaultCollator.set(vm, this, collator);
-    return collator;
-}
-
 #endif // ENABLE(INTL)
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -286 +286 @@
 
 #if ENABLE(INTL)
-    WriteBarrier<IntlCollator> m_defaultCollator;
+    LazyProperty<JSGlobalObject, IntlCollator> m_defaultCollator;
     LazyProperty<JSGlobalObject, Structure> m_collatorStructure;
     LazyProperty<JSGlobalObject, Structure> m_numberFormatStructure;
@@ -607 +607 @@
 
 #if ENABLE(INTL)
-    IntlCollator* defaultCollator(JSGlobalObject*);
+    IntlCollator* defaultCollator() const { return m_defaultCollator.get(this); }
 #endif
 

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -1504 +1504 @@
     JSValue options = callFrame->argument(2);
     IntlCollator* collator = nullptr;
-    if (locales.isUndefined() && options.isUndefined()) {
-        collator = globalObject->defaultCollator(globalObject);
-        RETURN_IF_EXCEPTION(scope, encodedJSValue());
-    } else {
+    if (locales.isUndefined() && options.isUndefined())
+        collator = globalObject->defaultCollator();
+    else {
         collator = IntlCollator::create(vm, globalObject->collatorStructure());
         collator->initializeCollator(globalObject, locales, options);