//tools/binary_size: Add object file count to Print()

tools/binary_size/describe.py

 # 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.
 """Methods for converting model objects to human-readable formats."""
 
 import datetime
 import itertools
 import time
 
 import models
@@ skipping 82 matching lines @@
     total_size = group.size
     yield 'Showing {:,} symbols with total size: {} bytes'.format(
         len(group), total_size)
     code_syms = group.WhereInSection('t')
     code_size = code_syms.size
     ro_size = code_syms.Inverted().WhereInSection('r').size
     yield '.text={:<10} .rodata={:<10} other={:<10} total={}'.format(
         _PrettySize(code_size), _PrettySize(ro_size),
         _PrettySize(total_size - code_size - ro_size),
         _PrettySize(total_size))
+    unique_paths = set(s.object_path for s in group)
+    yield 'Number of object files: {}'.format(len(unique_paths))
+    yield ''
     yield 'First columns are: running total, type, size'
 
     running_total = 0
     prefix = ''
     sorted_syms = group if group.is_sorted else group.Sorted()
 
     prefix = ''
     for s in sorted_syms:
       if group.IsBss() or not s.IsBss():
         running_total += s.size
       for l in self._DescribeSymbol(s):
         if l[:4].isspace():
           yield '{} {}'.format(' ' * (8 + len(prefix)), l)
         else:
           if prefix_func:
             prefix = prefix_func(s)
           yield '{}{:8} {}'.format(prefix, running_total, l)
 
   def _DescribeSymbolDiff(self, diff):
-    template = ('{} symbols added (+), {} changed (~), {} removed (-), '
-                '{} unchanged ({})')
+    header_template = ('{} symbols added (+), {} changed (~), {} removed (-), '
+                       '{} unchanged ({})')
     unchanged_msg = '=' if self.verbose else 'not shown'
-    header_str = (template.format(
-            diff.added_count, diff.changed_count, diff.removed_count,
-            diff.unchanged_count, unchanged_msg))
+    symbol_delta_desc = [header_template.format(
+        diff.added_count, diff.changed_count, diff.removed_count,
+        diff.unchanged_count, unchanged_msg)]
+
+    similar_paths = set()
+    added_paths = set()
+    removed_paths = set()
+    for s in diff:
+      if diff.IsAdded(s):
+        added_paths.add(s.object_path)
+      elif diff.IsRemoved(s):
+        removed_paths.add(s.object_path)
+      else:
+        similar_paths.add(s.object_path)
+    added_paths.difference_update(similar_paths)
+    removed_paths.difference_update(similar_paths)
+    path_delta_desc = ['{} object files added, {} removed'.format(
+        len(added_paths), len(removed_paths))]
+    if self.verbose and len(added_paths):
+      path_delta_desc.append('Added files:')
+      path_delta_desc.extend('  ' + p for p in sorted(added_paths))
+    if self.verbose and len(removed_paths):
+      path_delta_desc.append('Removed files:')
+      path_delta_desc.extend('  ' + p for p in sorted(removed_paths))
 
     def prefix_func(sym):
       if diff.IsAdded(sym):
         return '+ '
       if diff.IsRemoved(sym):
         return '- '
       if sym.size:
         return '~ '
       return '= '
 
     diff = diff if self.verbose else diff.WhereNotUnchanged()
     group_desc = self._DescribeSymbolGroup(diff, prefix_func=prefix_func)
-    return itertools.chain((header_str,), group_desc)
+    return itertools.chain(symbol_delta_desc, path_delta_desc, ('',),
+                           group_desc)
 
   def _DescribeSizeInfoDiff(self, diff):
     common_metadata = {k: v for k, v in diff.old_metadata.iteritems()
                        if diff.new_metadata[k] == v}
     old_metadata = {k: v for k, v in diff.old_metadata.iteritems()
                     if k not in common_metadata}
     new_metadata = {k: v for k, v in diff.new_metadata.iteritems()
                     if k not in common_metadata}
     metadata_desc = itertools.chain(
         ('Common Metadata:',),
         ('    %s' % line for line in DescribeMetadata(common_metadata)),
         ('Old Metadata:',),
         ('    %s' % line for line in DescribeMetadata(old_metadata)),
         ('New Metadata:',),
         ('    %s' % line for line in DescribeMetadata(new_metadata)))
     section_desc = self._DescribeSectionSizes(diff.section_sizes)
     group_desc = self.GenerateLines(diff.symbols)
     return itertools.chain(metadata_desc, section_desc, ('',), group_desc)
 
   def _DescribeSizeInfo(self, size_info):
     metadata_desc = itertools.chain(
         ('Metadata:',),
         ('    %s' % line for line in DescribeMetadata(size_info.metadata)))
     section_desc = self._DescribeSectionSizes(size_info.section_sizes)
+    coverage_desc = ()
+    if self.verbose:
+      coverage_desc = itertools.chain(
+          ('',), DescribeSizeInfoCoverage(size_info))
     group_desc = self.GenerateLines(size_info.symbols)
-    return itertools.chain(metadata_desc, section_desc, ('',), group_desc)
+    return itertools.chain(metadata_desc, section_desc, coverage_desc, ('',),
+                           group_desc)
 
   def GenerateLines(self, obj):
     if isinstance(obj, models.SizeInfoDiff):
       return self._DescribeSizeInfoDiff(obj)
     if isinstance(obj, models.SizeInfo):
       return self._DescribeSizeInfo(obj)
     if isinstance(obj, models.SymbolDiff):
       return self._DescribeSymbolDiff(obj)
     if isinstance(obj, models.SymbolGroup):
       return self._DescribeSymbolGroup(obj)
@@ skipping 58 matching lines @@
 
 
 def GenerateLines(obj, verbose=False):
   return Describer(verbose).GenerateLines(obj)
 
 
 def WriteLines(lines, func):
   for l in lines:
     func(l)
     func('\n')