Modified: trunk/Source/_javascript_Core/ChangeLog (226405 => 226406)
--- trunk/Source/_javascript_Core/ChangeLog 2018-01-04 15:42:06 UTC (rev 226405)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-01-04 15:51:49 UTC (rev 226406)
@@ -1,5 +1,16 @@
2018-01-04 Yusuke Suzuki <[email protected]>
+ [FTL] Optimize ObjectAllocationSinking mergePointerSets by using removeIf
+ https://bugs.webkit.org/show_bug.cgi?id=180238
+
+ Reviewed by Saam Barati.
+
+ We can optimize ObjectAllocationSinking a bit by using removeIf.
+
+ * dfg/DFGObjectAllocationSinkingPhase.cpp:
+
+2018-01-04 Yusuke Suzuki <[email protected]>
+
[JSC] Create parallel SlotVisitors apriori
https://bugs.webkit.org/show_bug.cgi?id=180907
Modified: trunk/Source/_javascript_Core/dfg/DFGObjectAllocationSinkingPhase.cpp (226405 => 226406)
--- trunk/Source/_javascript_Core/dfg/DFGObjectAllocationSinkingPhase.cpp 2018-01-04 15:42:06 UTC (rev 226405)
+++ trunk/Source/_javascript_Core/dfg/DFGObjectAllocationSinkingPhase.cpp 2018-01-04 15:51:49 UTC (rev 226406)
@@ -143,6 +143,8 @@
// materialization
enum class Kind { Escaped, Object, Activation, Function, GeneratorFunction, AsyncFunction, AsyncGeneratorFunction };
+ using Fields = HashMap<PromotedLocationDescriptor, Node*>;
+
explicit Allocation(Node* identifier = nullptr, Kind kind = Kind::Escaped)
: m_identifier(identifier)
, m_kind(kind)
@@ -150,11 +152,16 @@
}
- const HashMap<PromotedLocationDescriptor, Node*>& fields() const
+ const Fields& fields() const
{
return m_fields;
}
+ Fields& fields()
+ {
+ return m_fields;
+ }
+
Node* get(PromotedLocationDescriptor descriptor)
{
return m_fields.get(descriptor);
@@ -301,7 +308,7 @@
private:
Node* m_identifier; // This is the actual node that created the allocation
Kind m_kind;
- HashMap<PromotedLocationDescriptor, Node*> m_fields;
+ Fields m_fields;
RegisteredStructureSet m_structures;
};
@@ -468,25 +475,12 @@
for (const auto& fieldEntry : allocationIter->value.fields())
toEscape.addVoid(fieldEntry.value);
} else {
- mergePointerSets(
- allocationEntry.value.fields(), allocationIter->value.fields(),
- [&] (Node* identifier) {
- toEscape.addVoid(identifier);
- },
- [&] (PromotedLocationDescriptor field) {
- allocationEntry.value.remove(field);
- });
+ mergePointerSets(allocationEntry.value.fields(), allocationIter->value.fields(), toEscape);
allocationEntry.value.mergeStructures(allocationIter->value.structures());
}
}
- mergePointerSets(m_pointers, other.m_pointers,
- [&] (Node* identifier) {
- toEscape.addVoid(identifier);
- },
- [&] (Node* field) {
- m_pointers.remove(field);
- });
+ mergePointerSets(m_pointers, other.m_pointers, toEscape);
for (Node* identifier : toEscape)
escapeAllocation(identifier);
@@ -613,30 +607,30 @@
// 3: GetByOffset(@0, x)
// 4: GetByOffset(@3, val)
// -: Return(@4)
- template<typename Key, typename EscapeFunctor, typename RemoveFunctor>
- void mergePointerSets(
- const HashMap<Key, Node*>& my, const HashMap<Key, Node*>& their,
- const EscapeFunctor& escape, const RemoveFunctor& remove)
+ template<typename Key>
+ static void mergePointerSets(HashMap<Key, Node*>& my, const HashMap<Key, Node*>& their, NodeSet& toEscape)
{
- Vector<Key> toRemove;
- for (const auto& entry : my) {
+ auto escape = [&] (Node* identifier) {
+ toEscape.addVoid(identifier);
+ };
+
+ for (const auto& entry : their) {
+ if (!my.contains(entry.key))
+ escape(entry.value);
+ }
+ my.removeIf([&] (const auto& entry) {
auto iter = their.find(entry.key);
if (iter == their.end()) {
- toRemove.append(entry.key);
escape(entry.value);
- } else if (iter->value != entry.value) {
- toRemove.append(entry.key);
+ return true;
+ }
+ if (iter->value != entry.value) {
escape(entry.value);
escape(iter->value);
+ return true;
}
- }
- for (const auto& entry : their) {
- if (my.contains(entry.key))
- continue;
- escape(entry.value);
- }
- for (Key key : toRemove)
- remove(key);
+ return false;
+ });
}
void escapeAllocation(Node* identifier)
