//tools/binary_size: Various enhancements to console.py

tools/binary_size/map2size.py

 #!/usr/bin/env python
 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Main Python API for analyzing binary size."""
 
 import argparse
 import datetime
 import distutils.spawn
@@ skipping 77 matching lines @@
       symbol.name = non_anonymous
       symbol.full_name = symbol.full_name.replace(
           '(anonymous namespace)::', '')
 
     if symbol.section != 't' and '(' in symbol.name:
       # Pretty rare. Example:
       # blink::CSSValueKeywordsHash::findValueImpl(char const*)::value_word_list
       symbol.full_name = symbol.name
       symbol.name = re.sub(r'\(.*\)', '', symbol.full_name)
 
+    # Don't bother storing both if they are the same.
+    if symbol.full_name == symbol.name:
+      symbol.full_name = ''
+
   logging.debug('Found name prefixes of: %r', found_prefixes)
 
 
 def _NormalizeObjectPaths(symbol_group):
   """Ensures that all paths are formatted in a useful way."""
   for symbol in symbol_group:
     path = symbol.object_path
     if path.startswith('obj/'):
       # Convert obj/third_party/... -> third_party/...
       path = path[4:]
     elif path.startswith('../../'):
       # Convert ../../third_party/... -> third_party/...
       path = path[6:]
     if path.endswith(')'):
-      # Convert foo/bar.a(baz.o) -> foo/bar.a/(baz.o)
+      # Convert foo/bar.a(baz.o) -> foo/bar.a/baz.o
       start_idx = path.index('(')
-      path = os.path.join(path[:start_idx], path[start_idx:])
+      path = os.path.join(path[:start_idx], path[start_idx + 1:-1])
     symbol.object_path = path
 
 
 def _NormalizeSourcePath(path):
   if path.startswith('gen/'):
     # Convert gen/third_party/... -> third_party/...
     return path[4:]
   if path.startswith('../../'):
     # Convert ../../third_party/... -> third_party/...
     return path[6:]
@@ skipping 16 matching lines @@
       else:
         logging.warning('Could not find source path for %s', object_path)
   logging.debug('Parsed %d .ninja files.', mapper.GetParsedFileCount())
 
 
 def _RemoveDuplicatesAndCalculatePadding(symbol_group):
   """Removes symbols at the same address and calculates the |padding| field.
 
   Symbols must already be sorted by |address|.
   """
-  to_remove = set()
-  all_symbols = symbol_group.symbols
-  for i, symbol in enumerate(all_symbols[1:]):
-    prev_symbol = all_symbols[i]
+  to_remove = []
+  for i, symbol in enumerate(symbol_group[1:]):
+    prev_symbol = symbol_group[i]
     if prev_symbol.section_name != symbol.section_name:
       continue
     if symbol.address > 0 and prev_symbol.address > 0:
       # Fold symbols that are at the same address (happens in nm output).
       if symbol.address == prev_symbol.address:
         symbol.size = max(prev_symbol.size, symbol.size)
-        to_remove.add(i + 1)
+        to_remove.add(symbol)
         continue
       # Even with symbols at the same address removed, overlaps can still
       # happen. In this case, padding will be negative (and this is fine).
       padding = symbol.address - prev_symbol.end_address
       # These thresholds were found by manually auditing arm32 Chrome.
       # E.g.: Set them to 0 and see what warnings get logged.
       # TODO(agrieve): See if these thresholds make sense for architectures
       #     other than arm32.
       if (symbol.section in 'rd' and padding >= 256 or
           symbol.section in 't' and padding >= 64):
         # For nm data, this is caused by data that has no associated symbol.
         # The linker map file lists them with no name, but with a file.
         # Example:
         #   .data 0x02d42764 0x120 .../V8SharedWorkerGlobalScope.o
         # Where as most look like:
         #   .data.MANGLED_NAME...
         logging.debug('Large padding of %d between:\n  A) %r\n  B) %r' % (
                       padding, prev_symbol, symbol))
         continue
       symbol.padding = padding
       symbol.size += padding
       assert symbol.size >= 0, 'Symbol has negative size: ' + (
           '%r\nprev symbol: %r' % (symbol, prev_symbol))
   # Map files have no overlaps, so worth special-casing the no-op case.
   if to_remove:
     logging.info('Removing %d overlapping symbols', len(to_remove))
-    symbol_group.symbols = (
-        [s for i, s in enumerate(all_symbols) if i not in to_remove])
+    symbol_group -= models.SymbolGroup(to_remove)
 
 
 def AddOptions(parser):
   parser.add_argument('--tool-prefix', default='',
                       help='Path prefix for c++filt.')
   parser.add_argument('--output-directory',
                       help='Path to the root build directory.')
 
 
 def _DetectToolPrefix(tool_prefix, input_file, output_directory=None):
@@ skipping 106 matching lines @@
   logging.info('Recording metadata: %s',
                describe.DescribeSizeInfoMetadata(size_info))
   logging.info('Saving result to %s', args.output_file)
   file_format.SaveSizeInfo(size_info, args.output_file)
 
   logging.info('Done')
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))