Reduce bucket count and range for wasm function count, and add "module" to some names.

BUG= https://code.google.com/p/v8/issues/detail?id=4203
BUG= https://bugs.chromium.org/p/chromium/issues/detail?id=575167
TEST=None
R=ahaas@chromium.org,isherman@chromium.org
LOG=N

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

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

src/counters.h

@@ -590,7 +590,7 @@ class RuntimeCallTimerScope {
   HR(errors_thrown_per_context, V8.ErrorsThrownPerContext, 0, 200, 20)        \
   HR(debug_feature_usage, V8.DebugFeatureUsage, 1, 7, 7)                      \
   /* Asm/Wasm. */                                                             \
-  HR(wasm_functions_per_module, V8.WasmFunctionsPerModule, 0, 10000, 101)
+  HR(wasm_functions_per_module, V8.WasmFunctionsPerModule, 1, 10000, 51)
 
 #define HISTOGRAM_TIMER_LIST(HT)                                              \
   /* Garbage collection timers. */                                            \
@@ -623,13 +623,14 @@ class RuntimeCallTimerScope {
   /* Total compilation time incl. caching/parsing */                          \
   HT(compile_script, V8.CompileScriptMicroSeconds, 1000000, MICROSECOND)      \
   /* Asm/Wasm */                                                              \
-  HT(wasm_instantiate_time, V8.WasmInstantiateMicroSeconds, 1000000,          \
-     MICROSECOND)                                                             \
+  HT(wasm_instantiate_module_time, V8.WasmInstantiateModuleMicroSeconds,      \
+     1000000, MICROSECOND)                                                    \
   HT(wasm_decode_module_time, V8.WasmDecodeModuleMicroSeconds, 1000000,       \
      MICROSECOND)                                                             \
   HT(wasm_decode_function_time, V8.WasmDecodeFunctionMicroSeconds, 1000000,   \
      MICROSECOND)                                                             \
-  HT(wasm_compile_time, V8.WasmCompileMicroSeconds, 1000000, MICROSECOND)     \
+  HT(wasm_compile_module_time, V8.WasmCompileModuleMicroSeconds, 1000000,     \
+     MICROSECOND)                                                             \
   HT(wasm_compile_function_time, V8.WasmCompileFunctionMicroSeconds, 1000000, \
      MICROSECOND)
 
@@ -662,16 +663,16 @@ class RuntimeCallTimerScope {
   HM(heap_sample_code_space_committed, V8.MemoryHeapSampleCodeSpaceCommitted) \
   HM(heap_sample_maximum_committed, V8.MemoryHeapSampleMaximumCommitted)
 
-#define HISTOGRAM_MEMORY_LIST(HM)                                 \
-  HM(memory_heap_committed, V8.MemoryHeapCommitted)               \
-  HM(memory_heap_used, V8.MemoryHeapUsed)                         \
-  /* Asm/Wasm */                                                  \
-  HM(wasm_decode_peak_memory_bytes, V8.WasmDecodePeakMemoryBytes) \
-  HM(wasm_compile_function_peak_memory_bytes,                     \
-     V8.WasmCompileFunctionPeakMemoryBytes)                       \
-  HM(wasm_min_mem_pages_count, V8.WasmMinMemPagesCount)           \
-  HM(wasm_max_mem_pages_count, V8.WasmMaxMemPagesCount)           \
-  HM(wasm_function_size_bytes, V8.WasmFunctionSizeBytes)          \
+#define HISTOGRAM_MEMORY_LIST(HM)                                              \
+  HM(memory_heap_committed, V8.MemoryHeapCommitted)                            \
+  HM(memory_heap_used, V8.MemoryHeapUsed)                                      \
+  /* Asm/Wasm */                                                               \
+  HM(wasm_decode_module_peak_memory_bytes, V8.WasmDecodeModulePeakMemoryBytes) \
+  HM(wasm_compile_function_peak_memory_bytes,                                  \
+     V8.WasmCompileFunctionPeakMemoryBytes)                                    \
+  HM(wasm_min_mem_pages_count, V8.WasmMinMemPagesCount)                        \
+  HM(wasm_max_mem_pages_count, V8.WasmMaxMemPagesCount)                        \
+  HM(wasm_function_size_bytes, V8.WasmFunctionSizeBytes)                       \
   HM(wasm_module_size_bytes, V8.WasmModuleSizeBytes)
 
 // WARNING: STATS_COUNTER_LIST_* is a very large macro that is causing MSVC

src/wasm/module-decoder.cc

@@ -780,7 +780,7 @@ ModuleResult DecodeWasmModule(Isolate* isolate, Zone* zone,
   ModuleDecoder decoder(zone, module_start, module_end, origin);
   ModuleResult result = decoder.DecodeModule(module, verify_functions);
   // TODO(bradnelson): Improve histogram handling of size_t.
-  isolate->counters()->wasm_decode_peak_memory_bytes()->AddSample(
+  isolate->counters()->wasm_decode_module_peak_memory_bytes()->AddSample(
       static_cast<int>(zone->allocation_size() - decode_memory_start));
   return result;
 }

src/wasm/wasm-module.cc

@@ -382,8 +382,8 @@ static MaybeHandle<JSFunction> LookupFunction(
 MaybeHandle<JSObject> WasmModule::Instantiate(Isolate* isolate,
                                               Handle<JSObject> ffi,
                                               Handle<JSArrayBuffer> memory) {
-  HistogramTimerScope wasm_instantiate_time_scope(
-      isolate->counters()->wasm_instantiate_time());
+  HistogramTimerScope wasm_instantiate_module_time_scope(
+      isolate->counters()->wasm_instantiate_module_time());
   this->shared_isolate = isolate;  // TODO(titzer): have a real shared isolate.
   ErrorThrower thrower(isolate, "WasmModule::Instantiate()");
   Factory* factory = isolate->factory();
@@ -430,8 +430,8 @@ MaybeHandle<JSObject> WasmModule::Instantiate(Isolate* isolate,
                                          *instance.globals_buffer);
   }
 
-  HistogramTimerScope wasm_compile_time_scope(
-      isolate->counters()->wasm_compile_time());
+  HistogramTimerScope wasm_compile_module_time_scope(
+      isolate->counters()->wasm_compile_module_time());
 
   //-------------------------------------------------------------------------
   // Compile wrappers to imported functions.