Changeset 213939 in webkit for trunk/Source/JavaScriptCore/dfg/DFGLivenessAnalysisPhase.cpp

Timestamp:

Mar 14, 2017, 2:37:41 PM (8 years ago)

Author:

[email protected]

Message:

Record the HashSet/HashMap operations in DFG/FTL/B3 and replay them in a benchmark
​https://bugs.webkit.org/show_bug.cgi?id=169590

Reviewed by Saam Barati.

Source/JavaScriptCore:

Adds code to support logging some hashtable stuff in the DFG.

• dfg/DFGAvailabilityMap.cpp:

(JSC::DFG::AvailabilityMap::pruneHeap):

• dfg/DFGCombinedLiveness.cpp:

(JSC::DFG::liveNodesAtHead):
(JSC::DFG::CombinedLiveness::CombinedLiveness):

• dfg/DFGCombinedLiveness.h:
• dfg/DFGLivenessAnalysisPhase.cpp:

(JSC::DFG::LivenessAnalysisPhase::run):
(JSC::DFG::LivenessAnalysisPhase::processBlock):

• dfg/DFGNode.cpp:
• dfg/DFGNode.h:
• dfg/DFGObjectAllocationSinkingPhase.cpp:

Source/WTF:

This adds LoggingHashSet and LoggingHashMap, which are drop-in replacements for HashSet and
HashMap that log everything that they do, so that you can replay it later.

This also adds a benchmark (HashSetDFGReplay) based on doing a recording of some of the HashSets
in the DFG compiler.

• WTF.xcodeproj/project.pbxproj:
• benchmarks/HashSetDFGReplay.cpp: Added.

(benchmark):
(main):

• wtf/CMakeLists.txt:
• wtf/GlobalVersion.cpp: Added.

(WTF::newGlobalVersion):

• wtf/GlobalVersion.h: Added.
• wtf/HashMap.h:

(WTF::X>::swap):

• wtf/HashSet.h:

(WTF::V>::addVoid):

• wtf/LoggingHashID.h: Added.

(WTF::LoggingHashID::LoggingHashID):
(WTF::LoggingHashID::dump):

• wtf/LoggingHashMap.h: Added.
• wtf/LoggingHashSet.h: Added.
• wtf/LoggingHashTraits.h: Added.

(WTF::LoggingHashKeyTraits::print):
(WTF::LoggingHashValueTraits::print):

File:

• trunk/Source/JavaScriptCore/dfg/DFGLivenessAnalysisPhase.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/dfg/DFGLivenessAnalysisPhase.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013, 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38 +38 @@
 #include <wtf/BitVector.h>
 #include <wtf/IndexSparseSet.h>
+#include <wtf/LoggingHashSet.h>
 
 namespace JSC { namespace DFG {
+
+// Uncomment this to log hashtable operations.
+// static const char templateString[] = "unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>";
+// typedef LoggingHashSet<templateString, unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> LiveSet;
+
+typedef HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> LiveSet;
 
 class LivenessAnalysisPhase : public Phase {
@@ -92 +99 @@
             }
             {
-                const HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>>& liveAtTailIndices = m_liveAtTail[blockIndex];
+                const LiveSet& liveAtTailIndices = m_liveAtTail[blockIndex];
                 Vector<NodeFlowProjection>& liveAtTail = block->ssa->liveAtTail;
                 liveAtTail.resize(0);
@@ -158 +165 @@
         bool changedPredecessor = false;
         for (BasicBlock* predecessor : block->predecessors) {
-            HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>>&
-                liveAtTail = m_liveAtTail[predecessor];
+            LiveSet& liveAtTail = m_liveAtTail[predecessor];
             for (unsigned newValue : *m_workset) {
                 if (liveAtTail.add(newValue)) {
@@ -177 +183 @@
     // Live values per block edge.
     BlockMap<Vector<unsigned, 0, UnsafeVectorOverflow, 1>> m_liveAtHead;
-    BlockMap<HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>>> m_liveAtTail;
+    BlockMap<LiveSet> m_liveAtTail;
 
     // Single sparse set allocated once and used by every basic block.