supersize: Don't cluster by default. Make Diff() accept only SizeInfo.

tools/binary_size/libsupersize/file_format.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.
 
 """Deals with loading & saving .size files."""
 
 import cStringIO
 import calendar
 import collections
 import datetime
@@ skipping 27 matching lines @@
   }
   metadata_str = json.dumps(headers, file_obj, indent=2, sort_keys=True)
   file_obj.write('%d\n' % len(metadata_str))
   file_obj.write(metadata_str)
   file_obj.write('\n')
   _LogSize(file_obj, 'header')  # For libchrome: 570 bytes.
 
   # Store a single copy of all paths and have them referenced by index.
   # Using an OrderedDict makes the indices more repetitive (better compression).
   path_tuples = collections.OrderedDict.fromkeys(
-      (s.object_path, s.source_path) for s in size_info.raw_symbols)
+      (s.object_path, s.source_path) for s in size_info.symbols)
   for i, key in enumerate(path_tuples):
     path_tuples[key] = i
   file_obj.write('%d\n' % len(path_tuples))
   file_obj.writelines('%s\t%s\n' % pair for pair in path_tuples)
   _LogSize(file_obj, 'paths')  # For libchrome, adds 200kb.
 
   # Symbol counts by section.
-  by_section = models.SymbolGroup(size_info.raw_symbols)
+  by_section = models.SymbolGroup(size_info.symbols)
   by_section = by_section.GroupBySectionName().SortedByName()
   file_obj.write('%s\n' % '\t'.join(g.name for g in by_section))
   file_obj.write('%s\n' % '\t'.join(str(len(g)) for g in by_section))
 
   def write_numeric(func, delta=False):
     for group in by_section:
       prev_value = 0
       last_sym = group[-1]
       for symbol in group:
         value = func(symbol)
@@ skipping 107 matching lines @@
       elif alias_counter > 0:
         new_sym.aliases = raw_symbols[symbol_idx - 1].aliases
         new_sym.aliases.append(new_sym)
         alias_counter -= 1
       else:
         new_sym.aliases = None
 
       raw_symbols[symbol_idx] = new_sym
       symbol_idx += 1
 
-  return models.SizeInfo(section_sizes, raw_symbols, metadata=metadata)
+  return models.SizeInfo(section_sizes, models.SymbolGroup(raw_symbols),
+                         metadata=metadata)
 
 
 def SaveSizeInfo(size_info, path):
   """Saves |size_info| to |path}."""
   if os.environ.get('SUPERSIZE_MEASURE_GZIP') == '1':
     with gzip.open(path, 'wb') as f:
       _SaveSizeInfoToFile(size_info, f)
   else:
     # It is seconds faster to do gzip in a separate step. 6s -> 3.5s.
     stringio = cStringIO.StringIO()
     _SaveSizeInfoToFile(size_info, stringio)
 
     logging.debug('Serialization complete. Gzipping...')
     stringio.seek(0)
     with gzip.open(path, 'wb') as f:
       shutil.copyfileobj(stringio, f)
 
 
 def LoadSizeInfo(path):
   """Returns a SizeInfo loaded from |path|."""
   with gzip.open(path) as f:
     return _LoadSizeInfoFromFile(f)