When profiling functions just use the function name. NFC (#16012)

Author: sbc100

emcc.py

@@ -3916,7 +3916,7 @@ def is_int(s):
     return False
 
 
-@ToolchainProfiler.profile_block('main')
+@ToolchainProfiler.profile()
 def main(args):
   start_time = time.time()
   ret = run(args)

emscripten.py

@@ -391,6 +391,7 @@ def remove_trailing_zeros(memfile):
   utils.write_binary(memfile, mem_data[:end])
 
 
+@ToolchainProfiler.profile()
 def get_metadata_binaryen(infile, outfile, modify_wasm, args):
   stdout = building.run_binaryen_command('wasm-emscripten-finalize',
                                          infile=infile,
@@ -401,6 +402,7 @@ def get_metadata_binaryen(infile, outfile, modify_wasm, args):
   return metadata
 
 
+@ToolchainProfiler.profile()
 def get_metadata_python(infile, outfile, modify_wasm, args):
   metadata = extract_metadata.extract_metadata(infile)
   if modify_wasm:
@@ -911,7 +913,7 @@ def generate_struct_info():
   if settings.BOOTSTRAPPING_STRUCT_INFO:
     return
 
-  @ToolchainProfiler.profile_block('gen_struct_info')
+  @ToolchainProfiler.profile()
   def generate_struct_info(out):
     gen_struct_info.main(['-q', '-o', out])
 

tools/building.py

@@ -178,7 +178,7 @@ def make_paths_absolute(f):
 # Runs llvm-nm for the given list of files.
 # The results are populated in nm_cache, and also returned as an array with order corresponding with the input files.
 # If a given file cannot be processed, None will be present in its place.
-@ToolchainProfiler.profile_block('llvm_nm_multiple')
+@ToolchainProfiler.profile()
 def llvm_nm_multiple(files):
   if len(files) == 0:
     return []
@@ -202,7 +202,7 @@ def llvm_nm(file):
   return llvm_nm_multiple([file])[0]
 
 
-@ToolchainProfiler.profile_block('read_link_inputs')
+@ToolchainProfiler.profile()
 def read_link_inputs(files):
   # Before performing the link, we need to look at each input file to determine which symbols
   # each of them provides. Do this in multiple parallel processes.
@@ -259,7 +259,7 @@ def llvm_backend_args():
   return args
 
 
-@ToolchainProfiler.profile_block('linking to object file')
+@ToolchainProfiler.profile()
 def link_to_object(args, target):
   # link using lld unless LTO is requested (lld can't output LTO/bitcode object files).
   if not settings.LTO:
@@ -741,7 +741,7 @@ def add_to_path(dirname):
   return closure_cmd, env
 
 
-@ToolchainProfiler.profile_block('closure_transpile')
+@ToolchainProfiler.profile()
 def closure_transpile(filename, pretty):
   user_args = []
   closure_cmd, env = get_closure_compiler_and_env(user_args)
@@ -750,7 +750,7 @@ def closure_transpile(filename, pretty):
   return run_closure_cmd(closure_cmd, filename, env, pretty)
 
 
-@ToolchainProfiler.profile_block('closure_compiler')
+@ToolchainProfiler.profile()
 def closure_compiler(filename, pretty, advanced=True, extra_closure_args=None):
   user_args = []
   env_args = os.environ.get('EMCC_CLOSURE_ARGS')

tools/js_optimizer.py

@@ -122,7 +122,7 @@ def serialize(self):
 
 # Given a set of functions of form (ident, text), and a preferred chunk size,
 # generates a set of chunks for parallel processing and caching.
-@ToolchainProfiler.profile_block('chunkify')
+@ToolchainProfiler.profile()
 def chunkify(funcs, chunk_size):
   chunks = []
   # initialize reasonably, the rest of the funcs we need to split out

tools/shared.py

@@ -361,7 +361,7 @@ def perform_sanity_checks():
         exit_with_error('Cannot find %s, check the paths in %s', cmd, config.EM_CONFIG)
 
 
-@ToolchainProfiler.profile_block('sanity')
+@ToolchainProfiler.profile()
 def check_sanity(force=False):
   """Check that basic stuff we need (a JS engine to compile, Node.js, and Clang
   and LLVM) exists.

tools/system_libs.py

@@ -1866,6 +1866,6 @@ def install_system_headers(stamp):
   return stamp
 
 
-@ToolchainProfiler.profile_block('ensure_sysroot')
+@ToolchainProfiler.profile()
 def ensure_sysroot():
   shared.Cache.get('sysroot_install.stamp', install_system_headers, what='system headers')

tools/toolchain_profiler.py

@@ -25,6 +25,11 @@ class Logger(ContextDecorator):
   def __init__(self, name):
     self.name = name
 
+  def __call__(self, func):
+    if self.name is None:
+      self.name = func.__name__
+    return super().__call__(func)
+
   def __enter__(self):
     if EMPROFILE == 2:
       indentation = '  ' * Logger.depth
@@ -37,9 +42,9 @@ def __exit__(self, exc_type, value, traceback):
     now = time.time()
     duration = now - self.start
     if exc_type:
-      msg = 'block "%s" raised an exception after %.2f seconds'
+      msg = 'block "%s" raised an exception after %.3f seconds'
     else:
-      msg = 'block "%s" took %.2f seconds'
+      msg = 'block "%s" took %.3f seconds'
     if EMPROFILE == 2:
       Logger.depth -= 1
       indentation = '  ' * Logger.depth
@@ -232,18 +237,22 @@ def exit_all_blocks():
     class ProfileBlock(Logger):
       def __init__(self, block_name):
         super().__init__(block_name)
-        self.block_name = block_name
+        self.name = block_name
 
       def __enter__(self):
-        ToolchainProfiler.enter_block(self.block_name)
+        ToolchainProfiler.enter_block(self.name)
 
       def __exit__(self, type, value, traceback):
-        ToolchainProfiler.exit_block(self.block_name)
+        ToolchainProfiler.exit_block(self.name)
 
     @staticmethod
     def profile_block(block_name):
       return ToolchainProfiler.ProfileBlock(ToolchainProfiler.escape_string(block_name))
 
+    @staticmethod
+    def profile():
+      return ToolchainProfiler.ProfileBlock(None)
+
     @staticmethod
     def imaginary_pid():
       ToolchainProfiler.imaginary_pid_ -= 1
@@ -263,3 +272,6 @@ def exit_block(block_name):
     @staticmethod
     def profile_block(block_name):
       return Logger(block_name)
+
+    def profile():
+      return Logger(None)