Clean up mark-compact phases and GC counter names.

BUG=chromium:568495
LOG=NO

Review URL: https://codereview.chromium.org/1515503006

Cr-Commit-Position: refs/heads/master@{#32791}

src/heap/gc-tracer.h

@@ -98,41 +98,37 @@ class GCTracer {
    public:
     enum ScopeId {
       EXTERNAL,
+      MC_CLEAR,
+      MC_CLEAR_CODE_FLUSH,
+      MC_CLEAR_DEPENDENT_CODE,
+      MC_CLEAR_GLOBAL_HANDLES,
+      MC_CLEAR_MAPS,
+      MC_CLEAR_SLOTS_BUFFER,
+      MC_CLEAR_STORE_BUFFER,
+      MC_CLEAR_STRING_TABLE,
+      MC_CLEAR_WEAK_CELLS,
+      MC_CLEAR_WEAK_COLLECTIONS,
+      MC_CLEAR_WEAK_LISTS,
+      MC_EVACUATE,
+      MC_EVACUATE_CANDIDATES,
+      MC_EVACUATE_CLEAN_UP,
+      MC_EVACUATE_NEW_SPACE,
+      MC_EVACUATE_UPDATE_POINTERS,
+      MC_EVACUATE_UPDATE_POINTERS_BETWEEN_EVACUATED,
+      MC_EVACUATE_UPDATE_POINTERS_TO_EVACUATED,
+      MC_EVACUATE_UPDATE_POINTERS_TO_NEW,
+      MC_EVACUATE_UPDATE_POINTERS_WEAK,
+      MC_FINISH,
+      MC_INCREMENTAL_FINALIZE,
       MC_MARK,
       MC_MARK_FINISH_INCREMENTAL,
       MC_MARK_PREPARE_CODE_FLUSH,
-      MC_MARK_ROOT,
-      MC_MARK_TOPOPT,
+      MC_MARK_ROOTS,
       MC_MARK_WEAK_CLOSURE,
-      MC_MARK_STRING_TABLE,
-      MC_MARK_WEAK_REFERENCES,
-      MC_MARK_GLOBAL_HANDLES,
-      MC_MARK_CODE_FLUSH,
-      MC_STORE_BUFFER_CLEAR,
-      MC_SLOTS_BUFFER_CLEAR,
       MC_SWEEP,
-      MC_SWEEP_NEWSPACE,
-      MC_SWEEP_OLDSPACE,
       MC_SWEEP_CODE,
-      MC_SWEEP_CELL,
       MC_SWEEP_MAP,
-      MC_SWEEP_ABORTED,
-      MC_EVACUATE_PAGES,
-      MC_UPDATE_NEW_TO_NEW_POINTERS,
-      MC_UPDATE_ROOT_TO_NEW_POINTERS,
-      MC_UPDATE_OLD_TO_NEW_POINTERS,
-      MC_UPDATE_POINTERS_TO_EVACUATED,
-      MC_UPDATE_POINTERS_BETWEEN_EVACUATED,
-      MC_UPDATE_MISC_POINTERS,
-      MC_INCREMENTAL_FINALIZE,
-      MC_WEAKCOLLECTION_PROCESS,
-      MC_WEAKCOLLECTION_CLEAR,
-      MC_WEAKCOLLECTION_ABORT,
-      MC_CLEAR,
-      MC_CLEAR_WEAKCELL,
-      MC_CLEAR_MAP,
-      MC_CLEAR_DEPENDENT_CODE,
-      MC_FLUSH_CODE,
+      MC_SWEEP_OLD,
       SCAVENGER_CODE_FLUSH_CANDIDATES,
       SCAVENGER_OBJECT_GROUPS,
       SCAVENGER_OLD_TO_NEW_POINTERS,

src/heap/mark-compact.h

@@ -574,8 +574,6 @@ class MarkCompactCollector {
   // Marking operations for objects reachable from roots.
   void MarkLiveObjects();
 
-  void AfterMarking();
-
   // Pushes a black object onto the marking stack and accounts for live bytes.
   // Note that this assumes live bytes have not yet been counted.
   INLINE(void PushBlack(HeapObject* obj));
@@ -716,6 +714,8 @@ class MarkCompactCollector {
 
   void EvacuateNewSpaceAndCandidates();
 
+  void UpdatePointersAfterEvacuation();
+
   // Iterates through all live objects on a page using marking information.
   // Returns whether all objects have successfully been visited.
   bool VisitLiveObjects(MemoryChunk* page, HeapObjectVisitor* visitor,

tools/eval_gc_time.sh

@@ -51,40 +51,37 @@ INTERESTING_NEW_GEN_KEYS="\
 INTERESTING_OLD_GEN_KEYS="\
   ${GENERAL_INTERESTING_KEYS} \
   external \
+  clear \
+  clear.code_flush \
+  clear.dependent_code \
+  clear.global_handles \
+  clear.maps \
+  clear.slots_buffer \
+  clear.store_buffer \
+  clear.string_table \
+  clear.weak_cells \
+  clear.weak_collections \
+  clear.weak_lists \
+  finish \
+  evacuate \
+  evacuate.candidates \
+  evacuate.clean_up \
+  evacuate.new_space \
+  evacuate.update_pointers \
+  evacuate.update_pointers.between_evacuated \
+  evacuate.update_pointers.to_evacuated \
+  evacuate.update_pointers.to_new \
+  evacuate.update_pointers.weak \
   mark \
-  mark_inc \
-  mark_prepcodeflush \
-  mark_root \
-  mark_topopt \
-  mark_retainmaps \
-  mark_weakclosure \
-  mark_stringtable \
-  mark_weakrefs \
-  mark_globalhandles \
-  mark_codeflush \
-  mark_optimizedcodemaps \
-  store_buffer_clear \
-  slots_buffer_clear \
+  mark.finish_incremental \
+  mark.prepare_code_flush \
+  mark.roots \
+  mark.weak_closure \
   sweep \
-  sweepns \
-  sweepos \
-  sweepcode \
-  sweepcell \
-  sweepmap \
-  sweepaborted \
-  evacuate \
-  new_new \
-  old_new \
-  root_new \
-  compaction_ptrs \
-  intracompaction_ptrs \
-  misc_compaction \
-  inc_weak_closure \
-  weakcollection_process \
-  weakcollection_clear \
-  weakcollection_abort \
-  weakcells \
-  nonlive_refs \
+  sweep.code \
+  sweep.map \
+  sweep.old \
+  incremental_finalize \
 "
 
 BASE_DIR=$(dirname $0)

tools/gc_nvp_common.py

@@ -12,7 +12,7 @@ import re
 
 def split_nvp(s):
   t = {}
-  for (name, value) in re.findall(r"(\w+)=([-\w]+(?:\.[0-9]+)?)", s):
+  for (name, value) in re.findall(r"([._\w]+)=([-\w]+(?:\.[0-9]+)?)", s):
     try:
       t[name] = float(value)
     except ValueError: