Fix CompilerStats info

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 6667 matching lines @@
   intptr_t count = 0;
   for (intptr_t i = 0; i < deopt_id_to_ic_data.length(); i++) {
     if (deopt_id_to_ic_data[i] != NULL) {
       count++;
     }
   }
   if (count == 0) {
     set_ic_data_array(Object::empty_array());
   } else {
     const Array& a = Array::Handle(Array::New(count, Heap::kOld));
+    INC_STAT(Isolate::Current(), total_code_size, count * sizeof(uword));
     count = 0;
     for (intptr_t i = 0; i < deopt_id_to_ic_data.length(); i++) {
       if (deopt_id_to_ic_data[i] != NULL) {
         a.SetAt(count++, *deopt_id_to_ic_data[i]);
       }
     }
     set_ic_data_array(a);
   }
 }
 
@@ skipping 270 matching lines @@
   return "RedirectionData class";
 }
 
 
 void RedirectionData::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Object::PrintJSONImpl(stream, ref);
 }
 
 
 RawString* Field::GetterName(const String& field_name) {
-  CompilerStats::make_accessor_name++;
   return String::Concat(Symbols::GetterPrefix(), field_name);
 }
 
 
 RawString* Field::GetterSymbol(const String& field_name) {
   return Symbols::FromConcat(Symbols::GetterPrefix(), field_name);
 }
 
 
 RawString* Field::SetterName(const String& field_name) {
-  CompilerStats::make_accessor_name++;
   return String::Concat(Symbols::SetterPrefix(), field_name);
 }
 
 
 RawString* Field::SetterSymbol(const String& field_name) {
   return Symbols::FromConcat(Symbols::SetterPrefix(), field_name);
 }
 
 
 RawString* Field::NameFromGetter(const String& getter_name) {
-  CompilerStats::make_field_name++;
   return String::SubString(getter_name, strlen(kGetterPrefix));
 }
 
 
 RawString* Field::NameFromSetter(const String& setter_name) {
-  CompilerStats::make_field_name++;
   return String::SubString(setter_name, strlen(kSetterPrefix));
 }
 
 
 bool Field::IsGetterName(const String& function_name) {
   return function_name.StartsWith(Symbols::GetterPrefix());
 }
 
 
 bool Field::IsSetterName(const String& function_name) {
@@ skipping 931 matching lines @@
 RawTokenStream* TokenStream::New(const Scanner::GrowableTokenStream& tokens,
                                  const String& private_key) {
   // Copy the relevant data out of the scanner into a compressed stream of
   // tokens.
   CompressedTokenStreamData data;
   intptr_t len = tokens.length();
   for (intptr_t i = 0; i < len; i++) {
     Scanner::TokenDescriptor token = tokens[i];
     if (token.kind == Token::kIDENT) {  // Identifier token.
       if (FLAG_compiler_stats) {
-        CompilerStats::num_ident_tokens_total += 1;
+        INC_STAT(Isolate::Current(), num_ident_tokens_total, 1);
       }
       data.AddIdentToken(token.literal);
     } else if (Token::NeedsLiteralToken(token.kind)) {  // Literal token.
       if (FLAG_compiler_stats) {
-        CompilerStats::num_literal_tokens_total += 1;
+        INC_STAT(Isolate::Current(), num_literal_tokens_total, 1);
       }
       data.AddLiteralToken(token);
     } else {  // Keyword, pseudo keyword etc.
       ASSERT(token.kind < Token::kNumTokens);
       data.AddSimpleToken(token.kind);
     }
   }
-  if (FLAG_compiler_stats) {
-    CompilerStats::num_tokens_total += len;
-  }
+  INC_STAT(Isolate::Current(), num_tokens_total, len);

[siva, 2015/05/12 17:39:52]

Might make sense to cache Isolate::Current() in a local variable as it is being
accessed in a for loop above.

[hausner, 2015/05/12 21:52:16]

Done.

   data.AddSimpleToken(Token::kEOS);  // End of stream.
 
   // Create and setup the token stream object.
   const ExternalTypedData& stream = ExternalTypedData::Handle(
       ExternalTypedData::New(kExternalTypedDataUint8ArrayCid,
                              data.GetStream(), data.Length(), Heap::kOld));
   stream.AddFinalizer(data.GetStream(), DataFinalizer);
   const TokenStream& result = TokenStream::Handle(New());
   result.SetPrivateKey(private_key);
   const Array& token_objects = Array::Handle(data.MakeTokenObjectsArray());
@@ skipping 310 matching lines @@
 
 void Script::Tokenize(const String& private_key) const {
   Isolate* isolate = Isolate::Current();
   const TokenStream& tkns = TokenStream::Handle(isolate, tokens());
   if (!tkns.IsNull()) {
     // Already tokenized.
     return;
   }
   // Get the source, scan and allocate the token stream.
   VMTagScope tagScope(isolate, VMTag::kCompileScannerTagId);
-  TimerScope timer(FLAG_compiler_stats, &CompilerStats::scanner_timer);
+  TimerScope timer(FLAG_compiler_stats, &CSTAT_TIMER(scanner_timer));
   const String& src = String::Handle(isolate, Source());
   Scanner scanner(src, private_key);
   set_tokens(TokenStream::Handle(isolate,
                                  TokenStream::New(scanner.GetStream(),
                                                   private_key)));
-  if (FLAG_compiler_stats) {
-    CompilerStats::src_length += src.Length();
-  }
+  INC_STAT(isolate, src_length, src.Length());
 }
 
 
 void Script::SetLocationOffset(intptr_t line_offset,
                                intptr_t col_offset) const {
   ASSERT(line_offset >= 0);
   ASSERT(col_offset >= 0);
   StoreNonPointer(&raw_ptr()->line_offset_, line_offset);
   StoreNonPointer(&raw_ptr()->col_offset_, col_offset);
 }
@@ skipping 2290 matching lines @@
 
 
 RawPcDescriptors* PcDescriptors::New(GrowableArray<uint8_t>* data) {
   ASSERT(Object::pc_descriptors_class() != Class::null());
   PcDescriptors& result = PcDescriptors::Handle();
   {
     uword size = PcDescriptors::InstanceSize(data->length());
     RawObject* raw = Object::Allocate(PcDescriptors::kClassId,
                                       size,
                                       Heap::kOld);
+    INC_STAT(Isolate::Current(), total_code_size, size);
+    INC_STAT(Isolate::Current(), pc_desc_size, size);

[siva, 2015/05/12 17:39:52]

Ditto comment about caching Isolate::Current() instead of multiple calls.

[hausner, 2015/05/12 21:52:16]

Done.

     NoSafepointScope no_safepoint;
     result ^= raw;
     result.SetLength(data->length());
     result.CopyData(data);
   }
   return result.raw();
 }
 
 
 const char* PcDescriptors::KindAsStr(RawPcDescriptors::Kind kind) {
@@ skipping 399 matching lines @@
     FATAL2("Fatal error in LocalVarDescriptors::New: "
            "invalid num_variables %" Pd ". Maximum is: %d\n",
            num_variables, RawLocalVarDescriptors::kMaxIndex);
   }
   LocalVarDescriptors& result = LocalVarDescriptors::Handle();
   {
     uword size = LocalVarDescriptors::InstanceSize(num_variables);
     RawObject* raw = Object::Allocate(LocalVarDescriptors::kClassId,
                                       size,
                                       Heap::kOld);
+    INC_STAT(Isolate::Current(), total_code_size, size);
+    INC_STAT(Isolate::Current(), vardesc_size, size);
     NoSafepointScope no_safepoint;
     result ^= raw;
     result.StoreNonPointer(&result.raw_ptr()->num_entries_, num_variables);
   }
   return result.raw();
 }
 
 
 intptr_t LocalVarDescriptors::Length() const {
   return raw_ptr()->num_entries_;
@@ skipping 1052 matching lines @@
 
 
 void Code::set_is_alive(bool value) const {
   set_state_bits(AliveBit::update(value, raw_ptr()->state_bits_));
 }
 
 
 void Code::set_stackmaps(const Array& maps) const {
   ASSERT(maps.IsOld());
   StorePointer(&raw_ptr()->stackmaps_, maps.raw());
+  INC_STAT(Isolate::Current(),
+           total_code_size,
+           maps.IsNull() ? 0 : maps.Length() * sizeof(uword));
 }
 
 
 void Code::set_deopt_info_array(const Array& array) const {
   ASSERT(array.IsOld());
   StorePointer(&raw_ptr()->deopt_info_array_, array.raw());
 }
 
 
 void Code::set_static_calls_target_table(const Array& value) const {
@@ skipping 198 matching lines @@
                             bool optimized) {
   ASSERT(assembler != NULL);
 
   // Allocate the Code and Instructions objects.  Code is allocated first
   // because a GC during allocation of the code will leave the instruction
   // pages read-only.
   intptr_t pointer_offset_count = assembler->CountPointerOffsets();
   Code& code = Code::ZoneHandle(Code::New(pointer_offset_count));
   Instructions& instrs =
       Instructions::ZoneHandle(Instructions::New(assembler->CodeSize()));
+  INC_STAT(Isolate::Current(), total_instr_size, assembler->CodeSize());
+  INC_STAT(Isolate::Current(), total_code_size, assembler->CodeSize());
 
   // Copy the instructions into the instruction area and apply all fixups.
   // Embedded pointers are still in handles at this point.
   MemoryRegion region(reinterpret_cast<void*>(instrs.EntryPoint()),
                       instrs.size());
   assembler->FinalizeInstructions(region);
   VerifiedMemory::Accept(region.start(), region.size());
   CPU::FlushICache(instrs.EntryPoint(), instrs.size());
 
   code.set_compile_timestamp(OS::GetCurrentTimeMicros());
@@ skipping 24 matching lines @@
     // Hook up Code and Instructions objects.
     instrs.set_code(code.raw());
     code.set_instructions(instrs.raw());
     code.set_is_alive(true);
 
     // Set object pool in Instructions object.
     const GrowableObjectArray& object_pool = assembler->object_pool_data();
     if (object_pool.IsNull()) {
       instrs.set_object_pool(Object::empty_array().raw());
     } else {
+      INC_STAT(Isolate::Current(),
+               total_code_size, object_pool.Length() * sizeof(uintptr_t));
       // TODO(regis): Once MakeArray takes a Heap::Space argument, call it here
       // with Heap::kOld and change the ARM and MIPS assemblers to work with a
       // GrowableObjectArray in new space.
       instrs.set_object_pool(Array::MakeArray(object_pool));
     }
     if (FLAG_write_protect_code) {
       uword address = RawObject::ToAddr(instrs.raw());
       bool status = VirtualMemory::Protect(
           reinterpret_cast<void*>(address),
           instrs.raw()->Size(),
           VirtualMemory::kReadExecute);
       ASSERT(status);
     }
   }
   code.set_comments(assembler->GetCodeComments());
+  INC_STAT(Isolate::Current(),
+           total_code_size, code.comments().comments_.Length());
   return code.raw();
 }
 
 
 RawCode* Code::FinalizeCode(const Function& function,
                             Assembler* assembler,
                             bool optimized) {
   // Calling ToLibNamePrefixedQualifiedCString is very expensive,
   // try to avoid it.
   if (CodeObservers::AreActive()) {
@@ skipping 8358 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart