supersize: Move [clone] from name -> flags & rewrite Cluster()

tools/binary_size/libsupersize/console.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.
 
 """An interactive console for looking analyzing .size files."""
 
 import argparse
 import atexit
 import code
 import contextlib
@@ skipping 70 matching lines @@
     self._size_infos = size_infos
     self._size_paths = size_paths
     self._disassemble_prefix_len = None
 
     if len(size_infos) == 1:
       self._variables['size_info'] = size_infos[0]
     else:
       for i, size_info in enumerate(size_infos):
         self._variables['size_info%d' % (i + 1)] = size_info
 
-  def _DiffFunc(self, before=None, after=None, cluster=True, sort=True):
+  def _DiffFunc(self, before=None, after=None, sort=True):
     """Diffs two SizeInfo objects. Returns a SizeInfoDiff.
 
     Args:
       before: Defaults to first size_infos[0].
       after: Defaults to second size_infos[1].
-      cluster: When True (default), calls SymbolGroup.Clustered() after diffing.
-          Generally reduces noise.
       sort: When True (default), calls SymbolGroup.Sorted() after diffing.
     """
     before = before if before is not None else self._size_infos[0]
     after = after if after is not None else self._size_infos[1]
     ret = diff.Diff(before, after)
-    if cluster:
-      ret.symbols = ret.symbols.Clustered()
     if sort:
       ret.symbols = ret.symbols.Sorted()
     return ret
 
   def _PrintFunc(self, obj=None, verbose=False, recursive=False, use_pager=None,
                  to_file=None):
     """Prints out the given Symbol / SymbolGroup / SymbolDiff / SizeInfo.
 
     For convenience, |obj| will be appended to the global "printed" list.
 
     Args:
       obj: The object to be printed. Defaults to size_infos[-1].
       verbose: Show more detailed output.
       recursive: Print children of nested SymbolGroups.
       use_pager: Pipe output through `less`. Ignored when |obj| is a Symbol.
           default is to automatically pipe when output is long.
       to_file: Rather than print to stdio, write to the given file.
     """
     if not self._printed_variables or self._printed_variables[-1] != obj:
       self._printed_variables.append(obj)
     obj = obj if obj is not None else self._size_infos[-1]
     lines = describe.GenerateLines(obj, verbose=verbose, recursive=recursive)
     _WriteToStream(lines, use_pager=use_pager, to_file=to_file)
 
   def _ElfPathAndToolPrefixForSymbol(self, symbol, elf_path, tool_prefix):
     size_info = None
     size_path = None
     for size_info, size_path in zip(self._size_infos, self._size_paths):
-      if symbol in size_info.symbols:
+      if symbol in size_info.raw_symbols:
         break
     else:
       # If symbols is from a diff(), use its address+name to find it.
       for size_info, size_path in zip(self._size_infos, self._size_paths):
-        matched = size_info.symbols.WhereAddressInRange(symbol.address)
+        matched = size_info.raw_symbols.WhereAddressInRange(symbol.address)
         # Use last matched symbol to skip over padding-only symbols.
         if len(matched) > 0 and matched[-1].full_name == symbol.full_name:
           symbol = matched[-1]
           break
       else:
         assert False, 'Symbol does not belong to a size_info.'
 
     orig_tool_prefix = size_info.metadata.get(models.METADATA_TOOL_PREFIX)
     if orig_tool_prefix:
       orig_tool_prefix = paths.FromSrcRootRelative(orig_tool_prefix)
@@ skipping 114 matching lines @@
         '# Note: Use "help(ExpandRegex)" for more about what {{_print_}} does.',
         'print_syms = size_info.symbols.WhereMatches(r"{{_print_}}")',
         'Print(print_syms - print_syms.WherePathMatches(r"^components/"))',
         '',
         '# Diff two .size files and save result to a file:',
         'Print(Diff(size_info1, size_info2), to_file="output.txt")',
         '',
         '# View per-component breakdowns, then drill into the last entry.',
         'c = canned_queries.CategorizeByChromeComponent()',
         'Print(c)',
-        'Print(c[-1].GroupedByPath(depth=2).Clustered().Sorted())',
+        'Print(c[-1].GroupedByPath(depth=2).Sorted())',
         '',
         '# For even more inspiration, look at canned_queries.py',
         '# (and feel free to add your own!).',
     ])
 
   def _CreateBanner(self):
     symbol_info_keys = sorted(m for m in dir(models.SizeInfo) if m[0] != '_')
     symbol_keys = sorted(m for m in dir(models.Symbol) if m[0] != '_')
     symbol_group_keys = [m for m in dir(models.SymbolGroup) if m[0] != '_']
     symbol_diff_keys = sorted(m for m in dir(models.SymbolDiff)
@@ skipping 70 matching lines @@
                                output_directory=args.output_directory,
                                any_path_within_output_directory=args.inputs[0])
   session = _Session(size_infos, args.inputs, lazy_paths)
 
   if args.query:
     logging.info('Running query from command-line.')
     session.Eval(args.query)
   else:
     logging.info('Entering interactive console.')
     session.GoInteractive()