Add summaries to monos sub-command output.

rustwasm · Aug 3, 2018 · a0a30da · a0a30da
1 parent 2718850
commit a0a30da
Show file tree

Hide file tree

Showing 8 changed files with 339 additions and 192 deletions.
diff --git a/analyze/analyze.rs b/analyze/analyze.rs
diff --git a/ir/ir.rs b/ir/ir.rs
@@ -334,8 +334,7 @@ impl Items {
             .expect(
                 "Cannot call retained_sizes unless compute_retained_sizes \
                  has already been called",
-            )
-            .get(&id)
+            ).get(&id)
             .cloned()
             .unwrap()
     }

diff --git a/twiggy/tests/expectations/cpp_monos b/twiggy/tests/expectations/cpp_monos
@@ -1,6 +1,7 @@
  Apprx. Bloat Bytes │ Apprx. Bloat % │ Bytes │ %     │ Monomorphizations
 ────────────────────┼────────────────┼───────┼───────┼─────────────────────────
                  14 ┊          3.01% ┊    21 ┊ 4.52% ┊ void generic
-                    ┊                ┊     7 ┊ 1.51% ┊     void generic<Zero>()
                     ┊                ┊     7 ┊ 1.51% ┊     void generic<One>()
                     ┊                ┊     7 ┊ 1.51% ┊     void generic<Two>()
+                    ┊                ┊     7 ┊ 1.51% ┊     void generic<Zero>()
+                 14 ┊          3.01% ┊    21 ┊ 4.52% ┊ Σ [4 Total Rows]
diff --git a/twiggy/tests/expectations/monos b/twiggy/tests/expectations/monos
@@ -1,50 +1,52 @@
- Apprx. Bloat Bytes │ Apprx. Bloat % │ Bytes │ %     │ Monomorphizations
-────────────────────┼────────────────┼───────┼───────┼────────────────────────────────────────────────────────────────────────────────────────────────────
-               1977 ┊          3.40% ┊  3003 ┊ 5.16% ┊ alloc::slice::merge_sort
-                    ┊                ┊  1026 ┊ 1.76% ┊     alloc::slice::merge_sort::hb3d195f9800bdad6
-                    ┊                ┊  1026 ┊ 1.76% ┊     alloc::slice::merge_sort::hfcf2318d7dc71d03
-                    ┊                ┊   951 ┊ 1.63% ┊     alloc::slice::merge_sort::hcfca67f5c75a52ef
-               1302 ┊          2.24% ┊  3996 ┊ 6.87% ┊ <&'a T as core::fmt::Debug>::fmt
-                    ┊                ┊  2694 ┊ 4.63% ┊     <&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17
-                    ┊                ┊   568 ┊ 0.98% ┊     <&'a T as core::fmt::Debug>::fmt::hea6a77c4dcddb7ac
-                    ┊                ┊   433 ┊ 0.74% ┊     <&'a T as core::fmt::Debug>::fmt::hfbacf6f5c9f53bb2
-                    ┊                ┊   301 ┊ 0.52% ┊     <&'a T as core::fmt::Debug>::fmt::h199e8e1c5752e6f1
-                973 ┊          1.67% ┊  1118 ┊ 1.92% ┊ core::result::unwrap_failed
-                    ┊                ┊   145 ┊ 0.25% ┊     core::result::unwrap_failed::h9bd27c3a9ad7c001
-                    ┊                ┊   145 ┊ 0.25% ┊     core::result::unwrap_failed::h4cc73eb9bf19ce32
-                    ┊                ┊   145 ┊ 0.25% ┊     core::result::unwrap_failed::h137aa4f433aba1a9
-                    ┊                ┊   138 ┊ 0.24% ┊     core::result::unwrap_failed::ha3e58cfc7f422ab4
-                    ┊                ┊   138 ┊ 0.24% ┊     core::result::unwrap_failed::h9a7678774db14d67
-                    ┊                ┊   138 ┊ 0.24% ┊     core::result::unwrap_failed::hcb258ce32bda3d85
-                    ┊                ┊   138 ┊ 0.24% ┊     core::result::unwrap_failed::ha7651fcaac40f701
-                    ┊                ┊   131 ┊ 0.23% ┊     core::result::unwrap_failed::hcfddf900474e698a
-                558 ┊          0.96% ┊   714 ┊ 1.23% ┊ <alloc::raw_vec::RawVec<T, A>>::double
-                    ┊                ┊   156 ┊ 0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h28f86621ee2a10aa
-                    ┊                ┊   156 ┊ 0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h956450b93bdc9e1e
-                    ┊                ┊   156 ┊ 0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::hcb2fb5861b96a3b0
-                    ┊                ┊   147 ┊ 0.25% ┊     <alloc::raw_vec::RawVec<T, A>>::double::ha715b4e5cc3c60ae
-                    ┊                ┊    99 ┊ 0.17% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h77ff8547127c5db2
-                512 ┊          0.88% ┊   798 ┊ 1.37% ┊ std::thread::local::os::destroy_value
-                    ┊                ┊   286 ┊ 0.49% ┊     std::thread::local::os::destroy_value::hca8124786bee4a79
-                    ┊                ┊   281 ┊ 0.48% ┊     std::thread::local::os::destroy_value::h094cf4f2a025ba2b
-                    ┊                ┊   231 ┊ 0.40% ┊     std::thread::local::os::destroy_value::h453d41f6c315da32
-                234 ┊          0.40% ┊   354 ┊ 0.61% ┊ alloc::slice::insert_head
-                    ┊                ┊   120 ┊ 0.21% ┊     alloc::slice::insert_head::haf6e08236bab8bde
-                    ┊                ┊   120 ┊ 0.21% ┊     alloc::slice::insert_head::h2cdb84a455761146
-                    ┊                ┊   114 ┊ 0.20% ┊     alloc::slice::insert_head::hed0e79da03eeec8b
-                196 ┊          0.34% ┊   294 ┊ 0.51% ┊ <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt
-                    ┊                ┊    98 ┊ 0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h1b74a5fafe15c8eb
-                    ┊                ┊    98 ┊ 0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h24034d1c07bfae93
-                    ┊                ┊    98 ┊ 0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h5ebed3e159974658
-                195 ┊          0.34% ┊   270 ┊ 0.46% ┊ <alloc::vec::Vec<T>>::push
-                    ┊                ┊    75 ┊ 0.13% ┊     <alloc::vec::Vec<T>>::push::h98b02eda22d1ca25
-                    ┊                ┊    66 ┊ 0.11% ┊     <alloc::vec::Vec<T>>::push::hc927b4bedb35b00d
-                    ┊                ┊    66 ┊ 0.11% ┊     <alloc::vec::Vec<T>>::push::h5729b9e7651ef67b
-                    ┊                ┊    63 ┊ 0.11% ┊     <alloc::vec::Vec<T>>::push::h9415ef699ccc65d8
-                119 ┊          0.20% ┊   180 ┊ 0.31% ┊ <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut
-                    ┊                ┊    61 ┊ 0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::hba42cce6d0c0099b
-                    ┊                ┊    61 ┊ 0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::hbf8fcfe76c1f6657
-                    ┊                ┊    58 ┊ 0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::h1c053f01b6f95d93
-                 95 ┊          0.16% ┊   190 ┊ 0.33% ┊ core::fmt::Write::write_fmt
-                    ┊                ┊    95 ┊ 0.16% ┊     core::fmt::Write::write_fmt::ha5ae3249cacba520
-                    ┊                ┊    95 ┊ 0.16% ┊     core::fmt::Write::write_fmt::hef4632e1398f5ac8
+ Apprx. Bloat Bytes │ Apprx. Bloat % │ Bytes │ %      │ Monomorphizations
+────────────────────┼────────────────┼───────┼────────┼────────────────────────────────────────────────────────────────────────────────────────────────────
+               1977 ┊          3.40% ┊  3003 ┊  5.16% ┊ alloc::slice::merge_sort
+                    ┊                ┊  1026 ┊  1.76% ┊     alloc::slice::merge_sort::hb3d195f9800bdad6
+                    ┊                ┊  1026 ┊  1.76% ┊     alloc::slice::merge_sort::hfcf2318d7dc71d03
+                    ┊                ┊   951 ┊  1.63% ┊     alloc::slice::merge_sort::hcfca67f5c75a52ef
+               1302 ┊          2.24% ┊  3996 ┊  6.87% ┊ <&'a T as core::fmt::Debug>::fmt
+                    ┊                ┊  2694 ┊  4.63% ┊     <&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17
+                    ┊                ┊   568 ┊  0.98% ┊     <&'a T as core::fmt::Debug>::fmt::hea6a77c4dcddb7ac
+                    ┊                ┊   433 ┊  0.74% ┊     <&'a T as core::fmt::Debug>::fmt::hfbacf6f5c9f53bb2
+                    ┊                ┊   301 ┊  0.52% ┊     <&'a T as core::fmt::Debug>::fmt::h199e8e1c5752e6f1
+                973 ┊          1.67% ┊  1118 ┊  1.92% ┊ core::result::unwrap_failed
+                    ┊                ┊   145 ┊  0.25% ┊     core::result::unwrap_failed::h137aa4f433aba1a9
+                    ┊                ┊   145 ┊  0.25% ┊     core::result::unwrap_failed::h4cc73eb9bf19ce32
+                    ┊                ┊   145 ┊  0.25% ┊     core::result::unwrap_failed::h9bd27c3a9ad7c001
+                    ┊                ┊   138 ┊  0.24% ┊     core::result::unwrap_failed::h9a7678774db14d67
+                    ┊                ┊   138 ┊  0.24% ┊     core::result::unwrap_failed::ha3e58cfc7f422ab4
+                    ┊                ┊   138 ┊  0.24% ┊     core::result::unwrap_failed::ha7651fcaac40f701
+                    ┊                ┊   138 ┊  0.24% ┊     core::result::unwrap_failed::hcb258ce32bda3d85
+                    ┊                ┊   131 ┊  0.23% ┊     core::result::unwrap_failed::hcfddf900474e698a
+                558 ┊          0.96% ┊   714 ┊  1.23% ┊ <alloc::raw_vec::RawVec<T, A>>::double
+                    ┊                ┊   156 ┊  0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h28f86621ee2a10aa
+                    ┊                ┊   156 ┊  0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h956450b93bdc9e1e
+                    ┊                ┊   156 ┊  0.27% ┊     <alloc::raw_vec::RawVec<T, A>>::double::hcb2fb5861b96a3b0
+                    ┊                ┊   147 ┊  0.25% ┊     <alloc::raw_vec::RawVec<T, A>>::double::ha715b4e5cc3c60ae
+                    ┊                ┊    99 ┊  0.17% ┊     <alloc::raw_vec::RawVec<T, A>>::double::h77ff8547127c5db2
+                512 ┊          0.88% ┊   798 ┊  1.37% ┊ std::thread::local::os::destroy_value
+                    ┊                ┊   286 ┊  0.49% ┊     std::thread::local::os::destroy_value::hca8124786bee4a79
+                    ┊                ┊   281 ┊  0.48% ┊     std::thread::local::os::destroy_value::h094cf4f2a025ba2b
+                    ┊                ┊   231 ┊  0.40% ┊     std::thread::local::os::destroy_value::h453d41f6c315da32
+                234 ┊          0.40% ┊   354 ┊  0.61% ┊ alloc::slice::insert_head
+                    ┊                ┊   120 ┊  0.21% ┊     alloc::slice::insert_head::h2cdb84a455761146
+                    ┊                ┊   120 ┊  0.21% ┊     alloc::slice::insert_head::haf6e08236bab8bde
+                    ┊                ┊   114 ┊  0.20% ┊     alloc::slice::insert_head::hed0e79da03eeec8b
+                196 ┊          0.34% ┊   294 ┊  0.51% ┊ <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt
+                    ┊                ┊    98 ┊  0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h1b74a5fafe15c8eb
+                    ┊                ┊    98 ┊  0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h24034d1c07bfae93
+                    ┊                ┊    98 ┊  0.17% ┊     <core::fmt::Write::write_fmt::Adapter<'a, T> as core::fmt::Write>::write_fmt::h5ebed3e159974658
+                195 ┊          0.34% ┊   270 ┊  0.46% ┊ <alloc::vec::Vec<T>>::push
+                    ┊                ┊    75 ┊  0.13% ┊     <alloc::vec::Vec<T>>::push::h98b02eda22d1ca25
+                    ┊                ┊    66 ┊  0.11% ┊     <alloc::vec::Vec<T>>::push::h5729b9e7651ef67b
+                    ┊                ┊    66 ┊  0.11% ┊     <alloc::vec::Vec<T>>::push::hc927b4bedb35b00d
+                    ┊                ┊    63 ┊  0.11% ┊     <alloc::vec::Vec<T>>::push::h9415ef699ccc65d8
+                119 ┊          0.20% ┊   180 ┊  0.31% ┊ <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut
+                    ┊                ┊    61 ┊  0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::hba42cce6d0c0099b
+                    ┊                ┊    61 ┊  0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::hbf8fcfe76c1f6657
+                    ┊                ┊    58 ┊  0.10% ┊     <core::ops::range::Range<usize> as core::slice::SliceIndex<[T]>>::index_mut::h1c053f01b6f95d93
+                 95 ┊          0.16% ┊   190 ┊  0.33% ┊ core::fmt::Write::write_fmt
+                    ┊                ┊    95 ┊  0.16% ┊     core::fmt::Write::write_fmt::ha5ae3249cacba520
+                    ┊                ┊    95 ┊  0.16% ┊     core::fmt::Write::write_fmt::hef4632e1398f5ac8
+                298 ┊          0.51% ┊ 24063 ┊ 41.34% ┊ ... and 187 more.
+               6459 ┊         11.10% ┊ 34980 ┊ 60.10% ┊ Σ [235 Total Rows]
diff --git a/twiggy/tests/expectations/monos_json b/twiggy/tests/expectations/monos_json
@@ -1 +1 @@
-[{"generic":"alloc::slice::merge_sort","approximate_monomorphization_bloat_bytes":1977,"approximate_monomorphization_bloat_percent":3.396673768125902,"total_size":3003,"total_size_percent":5.159439213799739,"monomorphizations":[{"name":"alloc::slice::merge_sort::hb3d195f9800bdad6","shallow_size":1026,"shallow_size_percent":1.7627654456738369}]},{"generic":"<&'a T as core::fmt::Debug>::fmt","approximate_monomorphization_bloat_bytes":1302,"approximate_monomorphization_bloat_percent":2.2369596591299565,"total_size":3996,"total_size_percent":6.865507525255995,"monomorphizations":[{"name":"<&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17","shallow_size":2694,"shallow_size_percent":4.6285478661260395}]}]
+[{"generic":"alloc::slice::merge_sort","approximate_monomorphization_bloat_bytes":1977,"approximate_monomorphization_bloat_percent":3.396673768125902,"total_size":3003,"total_size_percent":5.159439213799739,"monomorphizations":[{"name":"alloc::slice::merge_sort::hb3d195f9800bdad6","shallow_size":1026,"shallow_size_percent":1.7627654456738369},{"name":"... and 2 more.","shallow_size":1977,"shallow_size_percent":3.396673768125902}]},{"generic":"<&'a T as core::fmt::Debug>::fmt","approximate_monomorphization_bloat_bytes":1302,"approximate_monomorphization_bloat_percent":2.2369596591299565,"total_size":3996,"total_size_percent":6.865507525255995,"monomorphizations":[{"name":"<&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17","shallow_size":2694,"shallow_size_percent":4.6285478661260395},{"name":"... and 3 more.","shallow_size":1302,"shallow_size_percent":2.2369596591299565}]},{"generic":"... and 196 more.","approximate_monomorphization_bloat_bytes":3180,"approximate_monomorphization_bloat_percent":5.46354202460312,"total_size":27981,"total_size_percent":48.07401553157858,"monomorphizations":[]},{"generic":"Σ [202 Total Rows]","approximate_monomorphization_bloat_bytes":6459,"approximate_monomorphization_bloat_percent":11.097175451858979,"total_size":34980,"total_size_percent":60.09896227063432,"monomorphizations":[]}]
diff --git a/twiggy/tests/expectations/monos_maxes b/twiggy/tests/expectations/monos_maxes
@@ -1,6 +1,10 @@
- Apprx. Bloat Bytes │ Apprx. Bloat % │ Bytes │ %     │ Monomorphizations
-────────────────────┼────────────────┼───────┼───────┼────────────────────────────────────────────────────────
-               1977 ┊          3.40% ┊  3003 ┊ 5.16% ┊ alloc::slice::merge_sort
-                    ┊                ┊  1026 ┊ 1.76% ┊     alloc::slice::merge_sort::hb3d195f9800bdad6
-               1302 ┊          2.24% ┊  3996 ┊ 6.87% ┊ <&'a T as core::fmt::Debug>::fmt
-                    ┊                ┊  2694 ┊ 4.63% ┊     <&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17
+Apprx. Bloat Bytes │ Apprx. Bloat % │ Bytes │ %      │ Monomorphizations
+────────────────────┼────────────────┼───────┼────────┼────────────────────────────────────────────────────────
+               1977 ┊          3.40% ┊  3003 ┊  5.16% ┊ alloc::slice::merge_sort
+                    ┊                ┊  1026 ┊  1.76% ┊     alloc::slice::merge_sort::hb3d195f9800bdad6
+                    ┊                ┊  1977 ┊  3.40% ┊     ... and 2 more.
+               1302 ┊          2.24% ┊  3996 ┊  6.87% ┊ <&'a T as core::fmt::Debug>::fmt
+                    ┊                ┊  2694 ┊  4.63% ┊     <&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17
+                    ┊                ┊  1302 ┊  2.24% ┊     ... and 3 more.
+               3180 ┊          5.46% ┊ 27981 ┊ 48.07% ┊ ... and 196 more.
+               6459 ┊         11.10% ┊ 34980 ┊ 60.10% ┊ Σ [202 Total Rows]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"generic":"alloc::slice::merge_sort","approximate_monomorphization_bloat_bytes":1977,"approximate_monomorphization_bloat_percent":3.396673768125902,"total_size":3003,"total_size_percent":5.159439213799739,"monomorphizations":[{"name":"alloc::slice::merge_sort::hb3d195f9800bdad6","shallow_size":1026,"shallow_size_percent":1.7627654456738369}]},{"generic":"<&'a T as core::fmt::Debug>::fmt","approximate_monomorphization_bloat_bytes":1302,"approximate_monomorphization_bloat_percent":2.2369596591299565,"total_size":3996,"total_size_percent":6.865507525255995,"monomorphizations":[{"name":"<&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17","shallow_size":2694,"shallow_size_percent":4.6285478661260395}]}]
		[{"generic":"alloc::slice::merge_sort","approximate_monomorphization_bloat_bytes":1977,"approximate_monomorphization_bloat_percent":3.396673768125902,"total_size":3003,"total_size_percent":5.159439213799739,"monomorphizations":[{"name":"alloc::slice::merge_sort::hb3d195f9800bdad6","shallow_size":1026,"shallow_size_percent":1.7627654456738369},{"name":"... and 2 more.","shallow_size":1977,"shallow_size_percent":3.396673768125902}]},{"generic":"<&'a T as core::fmt::Debug>::fmt","approximate_monomorphization_bloat_bytes":1302,"approximate_monomorphization_bloat_percent":2.2369596591299565,"total_size":3996,"total_size_percent":6.865507525255995,"monomorphizations":[{"name":"<&'a T as core::fmt::Debug>::fmt::h1c27955d8de3ff17","shallow_size":2694,"shallow_size_percent":4.6285478661260395},{"name":"... and 3 more.","shallow_size":1302,"shallow_size_percent":2.2369596591299565}]},{"generic":"... and 196 more.","approximate_monomorphization_bloat_bytes":3180,"approximate_monomorphization_bloat_percent":5.46354202460312,"total_size":27981,"total_size_percent":48.07401553157858,"monomorphizations":[]},{"generic":"Σ [202 Total Rows]","approximate_monomorphization_bloat_bytes":6459,"approximate_monomorphization_bloat_percent":11.097175451858979,"total_size":34980,"total_size_percent":60.09896227063432,"monomorphizations":[]}]