SuperSize: Show $root_gen_dir in paths. Expand "Other" in canned_queries

Show $root_gen_dir to make it more obvious when paths are generated.
Expand "Other" in canned_queries to have one group per top-level
directory to give a bit more granularity.

Change-Id: Ib9630b5aa04e1c52d51e3afa8772a4a2d4392555
Reviewed-on: https://chromium-review.googlesource.com/996909Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548409}

tools/binary_size/libsupersize/canned_queries.py

@@ -14,9 +14,10 @@ class _Grouper(object):
 
   def Add(self, name, group):
     logging.debug('Computed %s (%d syms)', name, len(group))
-    sorted_group = group.Sorted()
-    sorted_group.SetName(name)
-    self.groups.append(sorted_group)
+    if len(group):
+      sorted_group = group.Sorted()
+      sorted_group.SetName(name)
+      self.groups.append(sorted_group)
     return group.Inverted()
 
   def Finalize(self, remaining):
@@ -28,8 +29,11 @@ class _Grouper(object):
         stars = stars.Sorted()
         stars.SetName('** Merged Symbols')
         self.groups.append(stars)
-      remaining.SetName('Other')
-      self.groups.append(remaining)
+
+      others_by_path = remaining.GroupedByPath(depth=1).Sorted()
+      for subgroup in others_by_path:
+        subgroup.SetName('Other //' + subgroup.name)
+      self.groups.extend(others_by_path)
 
     logging.debug('Finalized')
     return models.SymbolGroup(self.groups, is_sorted=True)

tools/binary_size/libsupersize/describe.py

@@ -261,9 +261,11 @@ class DescriberText(Describer):
         yield '{}@{:<9s}  {}  {}{}'.format(
             sym.section, address, pss_field, sym.name, last_field)
       else:
+        path = sym.source_path or sym.object_path or '{no path}'
+        if sym.generated_source:
+          path = '$root_gen_dir/' + path
         yield '{}@{:<9s}  {} {}'.format(
-            sym.section, address, pss_field,
-            sym.source_path or sym.object_path or '{no path}')
+            sym.section, address, pss_field, path)
         if sym.name:
           yield '    {}{}'.format(sym.name, last_field)
 

tools/binary_size/libsupersize/testdata/Console.golden

@@ -111,9 +111,9 @@ Index | Running Total | Section@Address | PSS | Path
              kMethodsAnimationFrameTimeHistogram
 9)    1166992 (1.5%)  R@0x2ddc608  1065132        {no path}
              ** symbol gap 0 (end of section)
-10)   1167048 (1.5%)  R@0x2c176f0  56             third_party/icu/ucnv_ext.c
+10)   1167048 (1.5%)  R@0x2c176f0  56             $root_gen_dir/third_party/icu/ucnv_ext.c
              ChromeMainDelegate [vtable]
-11)   1167072 (1.5%)  R@0x2c17728  24             third_party/icu/ucnv_ext.c
+11)   1167072 (1.5%)  R@0x2c17728  24             $root_gen_dir/third_party/icu/ucnv_ext.c
              chrome::mojom::FieldTrialRecorder [vtable]
 12)   1956976 (2.5%)  R@0x2c17740  789904         third_party/container.c
              chrome::mojom::FieldTrialRecorderProxy [vtable]
@@ -125,9 +125,9 @@ Index | Running Total | Section@Address | PSS | Path
              Overhead: ELF file
 16)  35941189 (46.2%) r@0x266e600  2.5 (size=5)   base/page_allocator.cc
              string literal (num_aliases=2)
-17)  35941192 (46.2%) r@0x266e600  2.5 (size=5)   third_party/icu/ucnv_ext.c
+17)  35941192 (46.2%) r@0x266e600  2.5 (size=5)   $root_gen_dir/third_party/icu/ucnv_ext.c
              string literal (num_aliases=2)
-18)  35941208 (46.2%) r@0x266e605  16             third_party/icu/ucnv_ext.c
+18)  35941208 (46.2%) r@0x266e605  16             $root_gen_dir/third_party/icu/ucnv_ext.c
              string literal
 19)  35941251 (46.2%) r@0x266e630  43             {no path}
              ** merge strings
@@ -156,13 +156,13 @@ Index | Running Total | Section@Address | PSS | Path
              extFromUUseMapping
 32)  77699769 (99.9%) t@Group      35830760       {no path}
              ** symbol gaps (count=3)
-33)  77700217 (99.9%) t@0x28f000   448            third_party/icu/ucnv_ext.c
+33)  77700217 (99.9%) t@0x28f000   448            $root_gen_dir/third_party/icu/ucnv_ext.c
              ucnv_extMatchFromU
-34)  77700245 (99.9%) t@0x28f1c8   28             third_party/icu/ucnv_ext.c
+34)  77700245 (99.9%) t@0x28f1c8   28             $root_gen_dir/third_party/icu/ucnv_ext.c
              _GLOBAL__sub_I_SkDeviceProfile.cpp
-35)  77769369 (100.0%) t@0x28f1e0   69124          third_party/icu/ucnv_ext.c
+35)  77769369 (100.0%) t@0x28f1e0   69124          $root_gen_dir/third_party/icu/ucnv_ext.c
              foo_bar
-36)  77769393 (100.0%) t@0x2a0000   24 (size=48)   third_party/icu/ucnv_ext.c
+36)  77769393 (100.0%) t@0x2a0000   24 (size=48)   $root_gen_dir/third_party/icu/ucnv_ext.c
              BazAlias (num_aliases=2)
 37)  77769417 (100.0%) t@0x2a0000   24 (size=48)   {no path}
              blink::ContiguousContainerBase::shrinkToFit (num_aliases=2)
@@ -172,7 +172,7 @@ Index | Running Total | Section@Address | PSS | Path
              FooAlias (num_aliases=4)
 40)  77769426 (100.0%) t@0x2a0010   3 (size=12)    third_party/paint.cc
              blink::ContiguousContainerBase::shrinkToFit (num_aliases=4)
-41)  77769429 (100.0%) t@0x2a0010   3 (size=12)    third_party/icu/ucnv_ext.c
+41)  77769429 (100.0%) t@0x2a0010   3 (size=12)    $root_gen_dir/third_party/icu/ucnv_ext.c
              blink::ContiguousContainerBase::shrinkToFit (num_aliases=4)
 42)  77769457 (100.0%) t@0x2a0020   28             third_party/container.c
              blink::ContiguousContainerBase::ContiguousContainerBase
@@ -184,9 +184,9 @@ Index | Running Total | Section@Address | PSS | Path
              ff_cos_131072_fixed
 46)  77769551 (100.0%) b@0x0        131072         third_party/fft_float.cc
              ff_cos_65536
-47)  77769551 (100.0%) b@0x2dffda0  28             third_party/icu/ucnv_ext.c
+47)  77769551 (100.0%) b@0x2dffda0  28             $root_gen_dir/third_party/icu/ucnv_ext.c
              g_chrome_content_browser_client
-48)  77769551 (100.0%) b@0x2dffe80  200            third_party/icu/ucnv_ext.c
+48)  77769551 (100.0%) b@0x2dffe80  200            $root_gen_dir/third_party/icu/ucnv_ext.c
              SaveHistogram::atomic_histogram_pointer
-49)  77769551 (100.0%) b@0x2dffe84  4              third_party/icu/ucnv_ext.c
+49)  77769551 (100.0%) b@0x2dffe84  4              $root_gen_dir/third_party/icu/ucnv_ext.c
              g_AnimationFrameTimeHistogram_clazz

tools/binary_size/libsupersize/testdata/SymbolGroupMethods.golden

@@ -173,7 +173,7 @@ Index | Running Total | Section@Address | PSS | Path
              mojo::MessageReceiver [vtable]
 5)    1166992 (1.5%)  R@0x2cd8550  12             base/page_allocator.cc
              kMethodsAnimationFrameTimeHistogram
-6)    1167048 (1.5%)  R@0x2c176f0  56             third_party/icu/ucnv_ext.c
+6)    1167048 (1.5%)  R@0x2c176f0  56             $root_gen_dir/third_party/icu/ucnv_ext.c
              ChromeMainDelegate [vtable]
 7)    1957008 (2.5%)  *@Group      789960         {no path}
              chrome (count=3)
@@ -206,13 +206,13 @@ Index | Running Total | Section@Address | PSS | Path
              _GLOBAL__sub_I_pacing_sender.cc
 22)  77699921 (99.9%) *@Group      70             base/page_allocator.cc
              extFromUUseMapping (count=2)
-23)  77700369 (99.9%) t@0x28f000   448            third_party/icu/ucnv_ext.c
+23)  77700369 (99.9%) t@0x28f000   448            $root_gen_dir/third_party/icu/ucnv_ext.c
              ucnv_extMatchFromU
-24)  77700397 (99.9%) t@0x28f1c8   28             third_party/icu/ucnv_ext.c
+24)  77700397 (99.9%) t@0x28f1c8   28             $root_gen_dir/third_party/icu/ucnv_ext.c
              _GLOBAL__sub_I_SkDeviceProfile.cpp
-25)  77769521 (100.0%) t@0x28f1e0   69124          third_party/icu/ucnv_ext.c
+25)  77769521 (100.0%) t@0x28f1e0   69124          $root_gen_dir/third_party/icu/ucnv_ext.c
              foo_bar
-26)  77769545 (100.0%) t@0x2a0000   24 (size=48)   third_party/icu/ucnv_ext.c
+26)  77769545 (100.0%) t@0x2a0000   24 (size=48)   $root_gen_dir/third_party/icu/ucnv_ext.c
              BazAlias (num_aliases=2)
 27)  77769548 (100.0%) t@0x2a0010   3 (size=12)    third_party/fft_float.cc
              BarAlias (num_aliases=4)
@@ -224,9 +224,9 @@ Index | Running Total | Section@Address | PSS | Path
              ff_cos_131072_fixed
 31)  77769551 (100.0%) b@0x0        131072         third_party/fft_float.cc
              ff_cos_65536
-32)  77769551 (100.0%) b@0x2dffda0  28             third_party/icu/ucnv_ext.c
+32)  77769551 (100.0%) b@0x2dffda0  28             $root_gen_dir/third_party/icu/ucnv_ext.c
              g_chrome_content_browser_client
-33)  77769551 (100.0%) b@0x2dffe80  200            third_party/icu/ucnv_ext.c
+33)  77769551 (100.0%) b@0x2dffe80  200            $root_gen_dir/third_party/icu/ucnv_ext.c
              SaveHistogram::atomic_histogram_pointer
-34)  77769551 (100.0%) b@0x2dffe84  4              third_party/icu/ucnv_ext.c
+34)  77769551 (100.0%) b@0x2dffe84  4              $root_gen_dir/third_party/icu/ucnv_ext.c
              g_AnimationFrameTimeHistogram_clazz