Subdivide compile time for asm/wasm functions.

Collect compile time separately for asm.js and Wasm functions.

Note: Dependent on CL https://chromium-review.googlesource.com/c/598542

Bug: v8:6361
Change-Id: I77c43b663cb66261f17bca73db03ab1a4af5e11d
Reviewed-on: https://chromium-review.googlesource.com/598930
Commit-Queue: Karl Schimpf <kschimpf@chromium.org>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47146}

src/compiler/wasm-compiler.cc

@@ -4172,8 +4172,10 @@ WasmCompilationUnit::WasmCompilationUnit(
       func_index_(index) {}
 
 void WasmCompilationUnit::ExecuteCompilation() {
-  TimedHistogramScope wasm_compile_function_time_scope(
-      counters()->wasm_compile_function_time());
+  auto timed_histogram = module_env_->is_wasm()
+                             ? counters()->wasm_compile_wasm_function_time()
+                             : counters()->wasm_compile_asm_function_time();
+  TimedHistogramScope wasm_compile_function_time_scope(timed_histogram);
 
   if (FLAG_trace_wasm_compiler) {
     if (func_name_.start() != nullptr) {

src/counters.h

@@ -1064,24 +1064,26 @@ class RuntimeCallTimerScope {
   HT(wasm_lazy_compilation_time, V8.WasmLazyCompilationMicroSeconds, 1000000,  \
      MICROSECOND)
 
-#define TIMED_HISTOGRAM_LIST(HT)                                              \
-  HT(wasm_decode_asm_module_time, V8.WasmDecodeModuleMicroSeconds.asm,        \
-     1000000, MICROSECOND)                                                    \
-  HT(wasm_decode_wasm_module_time, V8.WasmDecodeModuleMicroSeconds.wasm,      \
-     1000000, MICROSECOND)                                                    \
-  HT(wasm_decode_asm_function_time, V8.WasmDecodeFunctionMicroSeconds.asm,    \
-     1000000, MICROSECOND)                                                    \
-  HT(wasm_decode_wasm_function_time, V8.WasmDecodeFunctionMicroSeconds.wasm,  \
-     1000000, MICROSECOND)                                                    \
-  HT(wasm_compile_asm_module_time, V8.WasmCompileModuleMicroSeconds.asm,      \
-     10000000, MICROSECOND)                                                   \
-  HT(wasm_compile_wasm_module_time, V8.WasmCompileModuleMicroSeconds.wasm,    \
-     10000000, MICROSECOND)                                                   \
-  HT(wasm_compile_function_time, V8.WasmCompileFunctionMicroSeconds, 1000000, \
-     MICROSECOND)                                                             \
-  HT(wasm_instantiate_wasm_module_time,                                       \
-     V8.WasmInstantiateModuleMicroSeconds.wasm, 10000000, MICROSECOND)        \
-  HT(wasm_instantiate_asm_module_time,                                        \
+#define TIMED_HISTOGRAM_LIST(HT)                                               \
+  HT(wasm_decode_asm_module_time, V8.WasmDecodeModuleMicroSeconds.asm,         \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_decode_wasm_module_time, V8.WasmDecodeModuleMicroSeconds.wasm,       \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_decode_asm_function_time, V8.WasmDecodeFunctionMicroSeconds.asm,     \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_decode_wasm_function_time, V8.WasmDecodeFunctionMicroSeconds.wasm,   \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_compile_asm_module_time, V8.WasmCompileModuleMicroSeconds.asm,       \
+     10000000, MICROSECOND)                                                    \
+  HT(wasm_compile_wasm_module_time, V8.WasmCompileModuleMicroSeconds.wasm,     \
+     10000000, MICROSECOND)                                                    \
+  HT(wasm_compile_asm_function_time, V8.WasmCompileFunctionMicroSeconds.asm,   \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_compile_wasm_function_time, V8.WasmCompileFunctionMicroSeconds.wasm, \
+     1000000, MICROSECOND)                                                     \
+  HT(wasm_instantiate_wasm_module_time,                                        \
+     V8.WasmInstantiateModuleMicroSeconds.wasm, 10000000, MICROSECOND)         \
+  HT(wasm_instantiate_asm_module_time,                                         \
      V8.WasmInstantiateModuleMicroSeconds.asm, 10000000, MICROSECOND)
 
 #define AGGREGATABLE_HISTOGRAM_TIMER_LIST(AHT) \