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

tools/binary_size/libsupersize/integration_test.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.
 
 import contextlib
 import copy
 import difflib
 import glob
 import itertools
@@ skipping 108 matching lines @@
       else:
         args += ['--no-source-paths']
       if use_elf:
         args += ['--elf-file', _TEST_ELF_PATH]
       _RunApp('archive', args, debug_measures=debug_measures)
       size_info = archive.LoadAndPostProcessSizeInfo(temp_file.name)
     # Check that saving & loading is the same as directly parsing the .map.
     expected_size_info = self._CloneSizeInfo(
         use_output_directory=use_output_directory, use_elf=use_elf)
     self.assertEquals(expected_size_info.metadata, size_info.metadata)
-    expected = list(describe.GenerateLines(expected_size_info.Clustered()))
-    actual = list(describe.GenerateLines(size_info.Clustered()))
+    # Don't cluster.
+    expected_size_info.symbols = expected_size_info.raw_symbols
+    size_info.symbols = size_info.raw_symbols
+    expected = list(describe.GenerateLines(expected_size_info))
+    actual = list(describe.GenerateLines(size_info))
     self.assertEquals(expected, actual)
 
     sym_strs = (repr(sym) for sym in size_info.symbols)
     stats = describe.DescribeSizeInfoCoverage(size_info)
     if size_info.metadata:
       metadata = describe.DescribeMetadata(size_info.metadata)
     else:
       metadata = []
     return itertools.chain(metadata, stats, sym_strs)
 
@@ skipping 40 matching lines @@
   @_CompareWithGolden()
   def test_Diff_Basic(self):
     size_info1 = self._CloneSizeInfo(use_elf=False)
     size_info2 = self._CloneSizeInfo(use_elf=False)
     size_info1.metadata = {"foo": 1, "bar": [1,2,3], "baz": "yes"}
     size_info2.metadata = {"foo": 1, "bar": [1,3], "baz": "yes"}
     size_info1.symbols -= size_info1.symbols[:2]
     size_info2.symbols -= size_info2.symbols[-3:]
     size_info1.symbols[1].size -= 10
     d = diff.Diff(size_info1, size_info2)
-    d.symbols = d.symbols.Clustered().Sorted()
+    d.symbols = d.symbols.Sorted()
     return describe.GenerateLines(d, verbose=True)
 
   def test_Diff_Aliases1(self):
     size_info1 = self._CloneSizeInfo()
     size_info2 = self._CloneSizeInfo()
 
     # Removing 1 alias should not change the size.
     a1, _, _ = (
-        size_info2.symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
-    size_info2.symbols -= [a1]
+        size_info2.raw_symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
+    size_info2.raw_symbols -= [a1]
     a1.aliases.remove(a1)
     d = diff.Diff(size_info1, size_info2)
-    self.assertEquals(d.symbols.size, 0)
-    self.assertEquals((0, 0, 1), _DiffCounts(d.symbols))
+    self.assertEquals(d.raw_symbols.size, 0)
+    self.assertEquals((0, 0, 1), _DiffCounts(d.raw_symbols))
     # shrinkToFit is in a cluster, so removed turns to a changed when clustered.
-    self.assertEquals((1, 0, 0), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals((1, 0, 0), _DiffCounts(d.symbols))
 
     # Adding one alias should not change size.
     d = diff.Diff(size_info2, size_info1)
-    self.assertEquals(d.symbols.size, 0)
-    self.assertEquals((0, 1, 0), _DiffCounts(d.symbols))
-    self.assertEquals((1, 0, 0), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals(d.raw_symbols.size, 0)
+    self.assertEquals((0, 1, 0), _DiffCounts(d.raw_symbols))
+    self.assertEquals((1, 0, 0), _DiffCounts(d.symbols))
 
   def test_Diff_Aliases2(self):
     size_info1 = self._CloneSizeInfo()
     size_info2 = self._CloneSizeInfo()
 
     # Removing 2 aliases should not change the size.
     a1, a2, _ = (
-        size_info2.symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
-    size_info2.symbols -= [a1, a2]
+        size_info2.raw_symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
+    size_info2.raw_symbols -= [a1, a2]
     a1.aliases.remove(a1)
     a1.aliases.remove(a2)
     d = diff.Diff(size_info1, size_info2)
-    self.assertEquals(d.symbols.size, 0)
-    self.assertEquals((0, 0, 2), _DiffCounts(d.symbols))
-    self.assertEquals((1, 0, 1), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals(d.raw_symbols.size, 0)
+    self.assertEquals((0, 0, 2), _DiffCounts(d.raw_symbols))
+    self.assertEquals((1, 0, 1), _DiffCounts(d.symbols))
 
     # Adding 2 aliases should not change size.
     d = diff.Diff(size_info2, size_info1)
-    self.assertEquals(d.symbols.size, 0)
-    self.assertEquals((0, 2, 0), _DiffCounts(d.symbols))
-    self.assertEquals((1, 1, 0), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals(d.raw_symbols.size, 0)
+    self.assertEquals((0, 2, 0), _DiffCounts(d.raw_symbols))
+    self.assertEquals((1, 1, 0), _DiffCounts(d.symbols))
 
   def test_Diff_Aliases3(self):
     size_info1 = self._CloneSizeInfo()
     size_info2 = self._CloneSizeInfo()
 
     # Removing all 3 aliases should change the size.
     a1, a2, a3 = (
-        size_info2.symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
-    size_info2.symbols -= [a1, a2, a3]
+        size_info2.raw_symbols.Filter(lambda s: s.num_aliases == 3)[0].aliases)
+    size_info2.raw_symbols -= [a1, a2, a3]
     d = diff.Diff(size_info1, size_info2)
-    self.assertEquals(d.symbols.size, -a1.size)
-    self.assertEquals((0, 0, 3), _DiffCounts(d.symbols))
-    self.assertEquals((1, 0, 2), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals((0, 0, 3), _DiffCounts(d.raw_symbols))
+    self.assertEquals((1, 0, 2), _DiffCounts(d.symbols))
 
     # Adding all 3 aliases should change size.
     d = diff.Diff(size_info2, size_info1)
-    self.assertEquals(d.symbols.size, a1.size)
-    self.assertEquals((0, 3, 0), _DiffCounts(d.symbols))
-    self.assertEquals((1, 2, 0), _DiffCounts(d.symbols.Clustered()))
+    self.assertEquals(d.raw_symbols.size, a1.size)
+    self.assertEquals((0, 3, 0), _DiffCounts(d.raw_symbols))
+    self.assertEquals((1, 2, 0), _DiffCounts(d.symbols))
 
   def test_Diff_Clustering(self):
     size_info1 = self._CloneSizeInfo()
     size_info2 = self._CloneSizeInfo()
     S = '.text'
     size_info1.symbols += [
         models.Symbol(S, 11, name='.L__unnamed_1193', object_path='a'), # 1
         models.Symbol(S, 22, name='.L__unnamed_1194', object_path='a'), # 2
         models.Symbol(S, 33, name='.L__unnamed_1195', object_path='b'), # 3
         models.Symbol(S, 44, name='.L__bar_195', object_path='b'), # 4
         models.Symbol(S, 55, name='.L__bar_1195', object_path='b'), # 5
     ]
     size_info2.symbols += [
         models.Symbol(S, 33, name='.L__unnamed_2195', object_path='b'), # 3
         models.Symbol(S, 11, name='.L__unnamed_2194', object_path='a'), # 1
         models.Symbol(S, 22, name='.L__unnamed_2193', object_path='a'), # 2
         models.Symbol(S, 44, name='.L__bar_2195', object_path='b'), # 4
         models.Symbol(S, 55, name='.L__bar_295', object_path='b'), # 5
     ]
     d = diff.Diff(size_info1, size_info2)
-    d.symbols = d.symbols.Clustered().Sorted()
+    d.symbols = d.symbols.Sorted()
     self.assertEquals(d.symbols.added_count, 0)
     self.assertEquals(d.symbols.size, 0)
 
-
   @_CompareWithGolden()
   def test_FullDescription(self):
-    return describe.GenerateLines(self._CloneSizeInfo().Clustered(),
-                                  recursive=True, verbose=True)
+    size_info = self._CloneSizeInfo()
+    # Show both clustered and non-clustered so that they can be compared.
+    size_info.symbols = size_info.raw_symbols
+    return itertools.chain(
+        describe.GenerateLines(size_info, verbose=True),
+        describe.GenerateLines(size_info.symbols._Clustered(), recursive=True,
+                               verbose=True),
+    )
 
   @_CompareWithGolden()
   def test_SymbolGroupMethods(self):
     all_syms = self._CloneSizeInfo().symbols
     global_syms = all_syms.WhereNameMatches('GLOBAL')
     # Tests Filter(), Inverted(), and __sub__().
     non_global_syms = global_syms.Inverted()
     self.assertEqual(non_global_syms, (all_syms - global_syms))
     # Tests Sorted() and __add__().
     self.assertEqual(all_syms.Sorted(),
@@ skipping 18 matching lines @@
     global update_goldens
     update_goldens = True
     for f in glob.glob(os.path.join(_TEST_DATA_DIR, '*.golden')):
       os.unlink(f)
 
   unittest.main(argv=argv, verbosity=2)
 
 
 if __name__ == '__main__':
   main()