Track Hydrogen statistics on a per-Isolate basis

src/hydrogen.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 43 matching lines @@
 
 class HBasicBlock: public ZoneObject {
  public:
   explicit HBasicBlock(HGraph* graph);
   virtual ~HBasicBlock() { }
 
   // Simple accessors.
   int block_id() const { return block_id_; }
   void set_block_id(int id) { block_id_ = id; }
   HGraph* graph() const { return graph_; }
+  Isolate* isolate() const;
   const ZoneList<HPhi*>* phis() const { return &phis_; }
   HInstruction* first() const { return first_; }
   HInstruction* last() const { return last_; }
   void set_last(HInstruction* instr) { last_ = instr; }
   HInstruction* GetLastInstruction();
   HControlInstruction* end() const { return end_; }
   HLoopInformation* loop_information() const { return loop_information_; }
   const ZoneList<HBasicBlock*>* predecessors() const { return &predecessors_; }
   bool HasPredecessor() const { return predecessors_.length() > 0; }
   const ZoneList<HBasicBlock*>* dominated_blocks() const {
@@ skipping 789 matching lines @@
   explicit HGraphBuilder(CompilationInfo* info)
       : info_(info), graph_(NULL), current_block_(NULL) {}
   virtual ~HGraphBuilder() {}
 
   HBasicBlock* current_block() const { return current_block_; }
   void set_current_block(HBasicBlock* block) { current_block_ = block; }
   HEnvironment* environment() const {
     return current_block()->last_environment();
   }
   Zone* zone() const { return info_->zone(); }
-  HGraph* graph() { return graph_; }
+  HGraph* graph() const { return graph_; }
+  Isolate* isolate() const { return graph_->isolate(); }
 
   HGraph* CreateGraph();
 
   // Adding instructions.
   HInstruction* AddInstruction(HInstruction* instr);
   void AddSimulate(BailoutId id,
                    RemovableSimulate removable = FIXED_SIMULATE);
   HBoundsCheck* AddBoundsCheck(
       HValue* index,
       HValue* length,
@@ skipping 643 matching lines @@
   inline HInstruction* at(int i) const { return operator[](i); }
 
  private:
   int count_;
   HInstruction* data_[kNumberOfTrackedSideEffects];
 };
 
 
 class HStatistics: public Malloced {
  public:
+  HStatistics()
+      : timing_(5),
+        names_(5),
+        sizes_(5),
+        create_graph_(0),
+        optimize_graph_(0),
+        generate_code_(0),
+        total_size_(0),
+        full_code_gen_(0),
+        source_size_(0) { }
+
   void Initialize(CompilationInfo* info);
   void Print();
   void SaveTiming(const char* name, int64_t ticks, unsigned size);
-  static HStatistics* Instance() {
-    static SetOncePointer<HStatistics> instance;
-    if (!instance.is_set()) {
-      instance.set(new HStatistics());
-    }
-    return instance.get();
-  }
 
   void IncrementSubtotals(int64_t create_graph,
                           int64_t optimize_graph,
                           int64_t generate_code) {
     create_graph_ += create_graph;
     optimize_graph_ += optimize_graph;
     generate_code_ += generate_code;
   }
 
  private:
-  HStatistics()
-      : timing_(5),
-        names_(5),
-        sizes_(5),
-        create_graph_(0),
-        optimize_graph_(0),
-        generate_code_(0),
-        total_size_(0),
-        full_code_gen_(0),
-        source_size_(0) { }
-
   List<int64_t> timing_;
   List<const char*> names_;
   List<unsigned> sizes_;
   int64_t create_graph_;
   int64_t optimize_graph_;
   int64_t generate_code_;
   unsigned total_size_;
   int64_t full_code_gen_;
   double source_size_;
 };
 
 
 class HPhase BASE_EMBEDDED {
  public:
   static const char* const kFullCodeGen;
 
   HPhase(const char* name, Isolate* isolate);
   HPhase(const char* name, HGraph* graph);
   HPhase(const char* name, LChunk* chunk);
   HPhase(const char* name, LAllocator* allocator);
   ~HPhase();
 
  private:
   void Init(Isolate* isolate,
-             const char* name,
-             HGraph* graph,
-             LChunk* chunk,
-             LAllocator* allocator);
+            const char* name,
+            HGraph* graph,
+            LChunk* chunk,
+            LAllocator* allocator);
 
   Isolate* isolate_;
   const char* name_;
   HGraph* graph_;
   LChunk* chunk_;
   LAllocator* allocator_;
   int64_t start_ticks_;
   unsigned start_allocation_size_;
 };
 
@@ skipping 76 matching lines @@
   EmbeddedVector<char, 64> filename_;
   HeapStringAllocator string_allocator_;
   StringStream trace_;
   int indent_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_H_