Changeset 225362 in webkit

Timestamp:

Nov 30, 2017, 3:44:24 PM (8 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Remove easy toRemove & map.remove() use
​https://bugs.webkit.org/show_bug.cgi?id=180208

Reviewed by Mark Lam.

Source/JavaScriptCore:

In this patch, we replace Vector<> toRemove & map.remove loop with removeIf,
to optimize this common pattern. This patch only modifies apparent ones.
But we can apply this refactoring further to OAS phase in the future.

• b3/B3MoveConstants.cpp:
• dfg/DFGArgumentsEliminationPhase.cpp:
• dfg/DFGObjectAllocationSinkingPhase.cpp:
• wasm/WasmSignature.cpp:

(JSC::Wasm::SignatureInformation::tryCleanup):

Source/WTF:

Return bool from removeIf. It is true if removeIf removes at least one entry.
This interface is similar to existing HashSet::remove, which returns true
if it actually removes entry.

• wtf/HashMap.h:

(WTF::X>::removeIf):

• wtf/HashSet.h:

(WTF::V>::removeIf):

• wtf/HashTable.h:

(WTF::KeyTraits>::removeIf):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/b3/B3MoveConstants.cpp (modified) (1 diff)
• JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp (modified) (1 diff)
• JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (modified) (3 diffs)
• JavaScriptCore/wasm/WasmSignature.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/HashMap.h (modified) (2 diffs)
• WTF/wtf/HashSet.h (modified) (2 diffs)
• WTF/wtf/HashTable.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-11-30  Yusuke Suzuki  <[email protected]>
+
+        [JSC] Remove easy toRemove & map.remove() use
+        https://bugs.webkit.org/show_bug.cgi?id=180208
+
+        Reviewed by Mark Lam.
+
+        In this patch, we replace Vector<> toRemove & map.remove loop with removeIf,
+        to optimize this common pattern. This patch only modifies apparent ones.
+        But we can apply this refactoring further to OAS phase in the future.
+
+        * b3/B3MoveConstants.cpp:
+        * dfg/DFGArgumentsEliminationPhase.cpp:
+        * dfg/DFGObjectAllocationSinkingPhase.cpp:
+        * wasm/WasmSignature.cpp:
+        (JSC::Wasm::SignatureInformation::tryCleanup):
+
 2017-11-29  Yusuke Suzuki  <[email protected]>
 

trunk/Source/JavaScriptCore/b3/B3MoveConstants.cpp

@@ -343 +343 @@
 
     Procedure& m_proc;
-    Vector<Value*> m_toRemove;
     HashMap<ValueKey, unsigned> m_constTable;
     int64_t* m_dataSection;
-    HashMap<ValueKey, Value*> m_constants;
     InsertionSet m_insertionSet;
 };

trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp

@@ -193 +193 @@
         bool changed;
         do {
-            changed = false;
-            Vector<Node*, 1> toRemove;
-
-            for (Node* candidate : m_candidates) {
-                if (!isStillValidCandidate(candidate))
-                    toRemove.append(candidate);
-            }
-
-            if (toRemove.size()) {
-                changed = true;
-                for (Node* node : toRemove)
-                    m_candidates.remove(node);
-            }
-
+            changed = m_candidates.removeIf(
+                [&] (Node* candidate) {
+                    return !isStillValidCandidate(candidate);
+                });
         } while (changed);
     }

trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp

@@ -508 +508 @@
     void pruneByLiveness(const NodeSet& live)
     {
-        Vector<Node*> toRemove;
-        for (const auto& entry : m_pointers) {
-            if (!live.contains(entry.key))
-                toRemove.append(entry.key);
-        }
-        for (Node* node : toRemove)
-            m_pointers.remove(node);
-
+        m_pointers.removeIf(
+            [&] (const auto& entry) {
+                return !live.contains(entry.key);
+            });
         prune();
     }
@@ -683 +679 @@
 
         // Remove unreachable allocations
-        {
-            Vector<Node*> toRemove;
-            for (const auto& entry : m_allocations) {
-                if (!reachable.contains(entry.key))
-                    toRemove.append(entry.key);
-            }
-            for (Node* identifier : toRemove)
-                m_allocations.remove(identifier);
-        }
+        m_allocations.removeIf(
+            [&] (const auto& entry) {
+                return !reachable.contains(entry.key);
+            });
     }
 
@@ -1250 +1241 @@
         // We don't create materializations if the escapee is not a
         // sink candidate
-        Vector<Node*> toRemove;
-        for (const auto& entry : escapees) {
-            if (!m_sinkCandidates.contains(entry.key))
-                toRemove.append(entry.key);
-        }
-        for (Node* identifier : toRemove)
-            escapees.remove(identifier);
-
+        escapees.removeIf(
+            [&] (const auto& entry) {
+                return !m_sinkCandidates.contains(entry.key);
+            });
         if (escapees.isEmpty())
             return;

trunk/Source/JavaScriptCore/wasm/WasmSignature.cpp

@@ -145 +145 @@
     LockHolder lock(info.m_lock);
 
-    Vector<std::pair<SignatureIndex, Signature*>> toRemove;
-    for (const auto& pair : info.m_indexMap) {
-        const Ref<Signature>& signature = pair.value;
-        if (signature->refCount() == 1) {
-            // We're the only owner.
-            toRemove.append(std::make_pair(pair.key, signature.ptr()));
-        }
-    }
-    for (const auto& pair : toRemove) {
-        bool removed = info.m_signatureMap.remove(SignatureHash { pair.second });
-        ASSERT_UNUSED(removed, removed);
-        removed = info.m_indexMap.remove(pair.first);
-        ASSERT_UNUSED(removed, removed);
-    }
+    info.m_indexMap.removeIf(
+        [&] (const auto& pair) {
+            const Ref<Signature>& signature = pair.value;
+            if (signature->refCount() == 1) {
+                // We're the only owner.
+                bool removed = info.m_signatureMap.remove(SignatureHash { signature.ptr() });
+                ASSERT_UNUSED(removed, removed);
+                return true;
+            }
+            return false;
+        });
+
     if (info.m_signatureMap.isEmpty()) {
         ASSERT(info.m_indexMap.isEmpty());

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-11-30  Yusuke Suzuki  <[email protected]>
+
+        [JSC] Remove easy toRemove & map.remove() use
+        https://bugs.webkit.org/show_bug.cgi?id=180208
+
+        Reviewed by Mark Lam.
+
+        Return bool from removeIf. It is true if removeIf removes at least one entry.
+        This interface is similar to existing HashSet::remove, which returns true
+        if it actually removes entry.
+
+        * wtf/HashMap.h:
+        (WTF::X>::removeIf):
+        * wtf/HashSet.h:
+        (WTF::V>::removeIf):
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::removeIf):
+
 2017-11-30  Chris Dumez  <[email protected]>
 

trunk/Source/WTF/wtf/HashMap.h

@@ -136 +136 @@
     bool remove(iterator);
     template<typename Functor>
-    void removeIf(Functor&&);
+    bool removeIf(Functor&&);
     void clear();
 
@@ -444 +444 @@
 template<typename T, typename U, typename V, typename W, typename X>
 template<typename Functor>
-inline void HashMap<T, U, V, W, X>::removeIf(Functor&& functor)
-{
-    m_impl.removeIf(std::forward<Functor>(functor));
+inline bool HashMap<T, U, V, W, X>::removeIf(Functor&& functor)
+{
+    return m_impl.removeIf(std::forward<Functor>(functor));
 }
 

trunk/Source/WTF/wtf/HashSet.h

@@ -106 +106 @@
     bool remove(iterator);
     template<typename Functor>
-    void removeIf(const Functor&);
+    bool removeIf(const Functor&);
     void clear();
 
@@ -276 +276 @@
 template<typename T, typename U, typename V>
 template<typename Functor>
-inline void HashSet<T, U, V>::removeIf(const Functor& functor)
-{
-    m_impl.removeIf(functor);
+inline bool HashSet<T, U, V>::removeIf(const Functor& functor)
+{
+    return m_impl.removeIf(functor);
 }
 

trunk/Source/WTF/wtf/HashTable.h

@@ -406 +406 @@
         void removeWithoutEntryConsistencyCheck(const_iterator);
         template<typename Functor>
-        void removeIf(const Functor&);
+        bool removeIf(const Functor&);
         void clear();
 
@@ -1109 +1109 @@
     template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
     template<typename Functor>
-    inline void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::removeIf(const Functor& functor)
+    inline bool HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::removeIf(const Functor& functor)
     {
         // We must use local copies in case "functor" or "deleteBucket"
@@ -1135 +1135 @@
         
         internalCheckTableConsistency();
+        return removedBucketCount;
     }