[heap] ObjectStats: Fix accounting for fixed array subtypes

- Fix recording sub types that have their own instance type
- Fix double accounting by keeping a shadow map for tracking recorded status
- Add recording of more fixed array sub types

BUG=hpayer@chromium.org

Review-Url: https://codereview.chromium.org/2147693004
Cr-Commit-Position: refs/heads/master@{#37768}

src/heap/mark-compact.cc

@@ -336,6 +336,8 @@ void MarkCompactCollector::CollectGarbage() {
 
   ClearNonLiveReferences();
 
+  RecordObjectStats();
+
 #ifdef VERIFY_HEAP
   if (FLAG_verify_heap) {
     VerifyMarking(heap_);
@@ -2273,6 +2275,20 @@ void MarkCompactCollector::VisitAllObjects(HeapObjectVisitor* visitor) {
   }
 }
 
+void MarkCompactCollector::RecordObjectStats() {
+  if (FLAG_track_gc_object_stats) {
+    ObjectStatsVisitor visitor(heap()->live_object_stats_,
+                               heap()->dead_object_stats_);
+    VisitAllObjects(&visitor);
+    if (FLAG_trace_gc_object_stats) {
+      heap()->live_object_stats_->PrintJSON("live");
+      heap()->dead_object_stats_->PrintJSON("dead");
+    }
+    heap()->live_object_stats_->CheckpointObjectStats();
+    heap()->dead_object_stats_->ClearObjectStats();
+  }
+}
+
 void MarkCompactCollector::MarkLiveObjects() {
   TRACE_GC(heap()->tracer(), GCTracer::Scope::MC_MARK);
   double start_time = 0.0;
@@ -2372,17 +2388,6 @@ void MarkCompactCollector::MarkLiveObjects() {
     heap_->tracer()->AddMarkingTime(heap_->MonotonicallyIncreasingTimeInMs() -
                                     start_time);
   }
-  if (FLAG_track_gc_object_stats) {
-    ObjectStatsVisitor visitor(heap()->live_object_stats_,
-                               heap()->dead_object_stats_);
-    VisitAllObjects(&visitor);
-    if (FLAG_trace_gc_object_stats) {
-      heap()->live_object_stats_->PrintJSON("live");
-      heap()->dead_object_stats_->PrintJSON("dead");
-    }
-    heap()->live_object_stats_->CheckpointObjectStats();
-    heap()->dead_object_stats_->ClearObjectStats();
-  }
 }
 
 

src/heap/mark-compact.h

@@ -40,11 +40,9 @@ class ObjectMarking : public AllStatic {
     return MarkBitFrom(reinterpret_cast<Address>(obj));
   }
 
-#ifdef DEBUG
   static Marking::ObjectColor Color(HeapObject* obj) {
     return Marking::Color(ObjectMarking::MarkBitFrom(obj));
   }
-#endif
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ObjectMarking);
@@ -514,6 +512,8 @@ class MarkCompactCollector {
 
   void VisitAllObjects(HeapObjectVisitor* visitor);
 
+  void RecordObjectStats();
+
   // Finishes GC, performs heap verification if enabled.
   void Finish();
 

src/heap/marking.h

@@ -273,7 +273,6 @@ class Marking : public AllStatic {
     markbit.Next().Clear();
   }
 
-#ifdef DEBUG
   enum ObjectColor {
     BLACK_OBJECT,
     WHITE_OBJECT,
@@ -302,7 +301,6 @@ class Marking : public AllStatic {
     UNREACHABLE();
     return IMPOSSIBLE_COLOR;
   }
-#endif
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(Marking);

src/heap/object-stats.h

@@ -5,6 +5,8 @@
 #ifndef V8_HEAP_OBJECT_STATS_H_
 #define V8_HEAP_OBJECT_STATS_H_
 
+#include <set>
+
 #include "src/base/ieee754.h"
 #include "src/heap/heap.h"
 #include "src/heap/objects-visiting.h"
@@ -58,8 +60,10 @@ class ObjectStats {
     size_histogram_[code_age_index][idx]++;
   }
 
-  void RecordFixedArraySubTypeStats(int array_sub_type, size_t size,
-                                    size_t over_allocated) {
+  void RecordFixedArraySubTypeStats(FixedArrayBase* array, int array_sub_type,
+                                    size_t size, size_t over_allocated) {
+    auto it = visited_fixed_array_sub_types_.insert(array);
+    if (!it.second) return;
     DCHECK(array_sub_type <= LAST_FIXED_ARRAY_SUB_TYPE);
     object_counts_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type]++;
     object_sizes_[FIRST_FIXED_ARRAY_SUB_TYPE + array_sub_type] += size;
@@ -107,6 +111,8 @@ class ObjectStats {
   // Detailed histograms by InstanceType.
   size_t size_histogram_[OBJECT_STATS_COUNT][kNumberOfBuckets];
   size_t over_allocated_histogram_[OBJECT_STATS_COUNT][kNumberOfBuckets];
+
+  std::set<FixedArrayBase*> visited_fixed_array_sub_types_;
 };
 
 class ObjectStatsCollector {
@@ -126,6 +132,11 @@ class ObjectStatsCollector {
                                     JSObject* object);
   static void RecordJSWeakCollectionDetails(ObjectStats* stats, Heap* heap,
                                             JSWeakCollection* obj);
+  static void RecordScriptDetails(ObjectStats* stats, Heap* heap, Script* obj);
+
+  static void RecordFixedArrayHelper(ObjectStats* stats, Heap* heap,
+                                     HeapObject* parent, FixedArray* array,
+                                     int subtype, size_t overhead);
 };
 
 }  // namespace internal

src/objects.h

@@ -768,32 +768,41 @@ STATIC_ASSERT(FOREIGN_TYPE == Internals::kForeignType);
 std::ostream& operator<<(std::ostream& os, InstanceType instance_type);
 
 #define FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(V) \
+  V(CODE_STUBS_TABLE_SUB_TYPE)                \
   V(CONTEXT_SUB_TYPE)                         \
   V(COPY_ON_WRITE_SUB_TYPE)                   \
   V(DEOPTIMIZATION_DATA_SUB_TYPE)             \
   V(DESCRIPTOR_ARRAY_SUB_TYPE)                \
+  V(EMBEDDED_OBJECT_SUB_TYPE)                 \
   V(ENUM_CACHE_SUB_TYPE)                      \
   V(ENUM_INDICES_CACHE_SUB_TYPE)              \
   V(DICTIONARY_ELEMENTS_SUB_TYPE)             \
   V(DICTIONARY_PROPERTIES_SUB_TYPE)           \
   V(FAST_ELEMENTS_SUB_TYPE)                   \
   V(FAST_PROPERTIES_SUB_TYPE)                 \
+  V(INTRINSIC_FUNCTION_NAMES_SUB_TYPE)        \
   V(LITERALS_ARRAY_SUB_TYPE)                  \
   V(MAP_CODE_CACHE_SUB_TYPE)                  \
+  V(NUMBER_STRING_CACHE_SUB_TYPE)             \
   V(OBJECT_TO_CODE_SUB_TYPE)                  \
-  V(RELOC_INFO_SUB_TYPE)                      \
+  V(REGEXP_MULTIPLE_CACHE_SUB_TYPE)           \
   V(SCOPE_INFO_SUB_TYPE)                      \
-  V(SOURCE_POS_SUB_TYPE)                      \
+  V(SERIALIZED_TEMPLATES_SUB_TYPE)            \
+  V(SHARED_FUNCTION_INFOS_SUB_TYPE)           \
+  V(SINGLE_CHARACTER_STRING_CACHE_SUB_TYPE)   \
+  V(STRING_SPLIT_CACHE_SUB_TYPE)              \
   V(STRING_TABLE_SUB_TYPE)                    \
+  V(TEMPLATE_INSTANTIATIONS_CACHE_SUB_TYPE)   \
   V(TYPE_FEEDBACK_VECTOR_SUB_TYPE)            \
   V(TYPE_FEEDBACK_METADATA_SUB_TYPE)          \
-  V(WEAK_COLLECTION_SUB_TYPE)
+  V(WEAK_COLLECTION_SUB_TYPE)                 \
+  V(WEAK_NEW_SPACE_OBJECT_TO_CODE_SUB_TYPE)
 
 enum FixedArraySubInstanceType {
 #define DEFINE_FIXED_ARRAY_SUB_INSTANCE_TYPE(name) name,
   FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(DEFINE_FIXED_ARRAY_SUB_INSTANCE_TYPE)
 #undef DEFINE_FIXED_ARRAY_SUB_INSTANCE_TYPE
-      LAST_FIXED_ARRAY_SUB_TYPE = WEAK_COLLECTION_SUB_TYPE
+      LAST_FIXED_ARRAY_SUB_TYPE = WEAK_NEW_SPACE_OBJECT_TO_CODE_SUB_TYPE
 };