Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: tools/binary_size/libsupersize/diff.py

Issue 2851473003: supersize: Track symbol aliases and shared symbols (Closed)
Patch Set: fix regression in calculate padding introduced in ps3 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
1 # Copyright 2017 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4 """Logic for diffing two SizeInfo objects."""
5
6 import collections
7
8 import models
9
10
11 def _CloneSymbol(sym, size):
12 """Returns a copy of |sym| with an updated |size|.
13
14 Padding and aliases are not copied.
15 """
16 return models.Symbol(
17 sym.section_name, size, address=sym.address, name=sym.name,
18 source_path=sym.source_path, object_path=sym.object_path,
19 full_name=sym.full_name, flags=sym.flags)
20
21
22 def _CloneAlias(sym, diffed_alias):
23 """Returns a copy of |sym| and making it an alias of |diffed_alias|."""
24 ret = _CloneSymbol(sym, diffed_alias.size_without_padding)
25 ret.padding = diffed_alias.padding
26 ret.aliases = diffed_alias.aliases
27 ret.aliases.append(ret)
28 return ret
29
30
31 def _DiffSymbol(before_sym, after_sym, diffed_symbol_by_after_aliases,
32 padding_by_section_name):
33 diffed_alias = None
34 if after_sym.aliases:
35 diffed_alias = diffed_symbol_by_after_aliases.get(id(after_sym.aliases))
36
37 if diffed_alias:
38 ret = _CloneAlias(after_sym, diffed_alias)
39 else:
40 size_diff = (after_sym.size_without_padding -
41 before_sym.size_without_padding)
42 ret = _CloneSymbol(after_sym, size_diff)
43 # Diffs are more stable when comparing size without padding, except when
44 # the symbol is a padding-only symbol.
45 if after_sym.size_without_padding == 0 and size_diff == 0:
46 ret.padding = after_sym.padding - before_sym.padding
47 else:
48 padding_diff = after_sym.padding - before_sym.padding
49 padding_by_section_name[ret.section_name] += padding_diff
50
51 # If this is the first matched symbol of an alias group, initialize its
52 # aliases list. The remaining aliases will be appended when diff'ed.
53 if after_sym.aliases:
54 ret.aliases = [ret]
55 diffed_symbol_by_after_aliases[id(after_sym.aliases)] = ret
56 return ret
57
58
59 def _CloneUnmatched(after_symbols, diffed_symbol_by_after_aliases):
60 ret = []
61 for sym in after_symbols:
62 cloned = sym
63 if sym.IsGroup():
64 cloned = models.SymbolDiff(
65 [], _CloneUnmatched(sym, diffed_symbol_by_after_aliases), [],
66 name=sym.name, full_name=sym.full_name, section_name=sym.section_name)
67 elif sym.aliases:
68 diffed_alias = diffed_symbol_by_after_aliases.get(id(sym.aliases))
69 if diffed_alias:
70 # At least one alias was diffed.
71 cloned = _CloneAlias(sym, diffed_alias)
72 ret.append(cloned)
73 return ret
74
75
76 def _NegateAndClone(before_symbols, matched_before_aliases,
77 negated_symbol_by_before_aliases):
78 ret = []
79 for sym in before_symbols:
80 if sym.IsGroup():
81 cloned = models.SymbolDiff(
82 [], _NegateAndClone(sym, matched_before_aliases,
83 negated_symbol_by_before_aliases), [],
84 name=sym.name, full_name=sym.full_name, section_name=sym.section_name)
85 else:
86 negated_alias = None
87 if sym.aliases:
88 negated_alias = negated_symbol_by_before_aliases.get(id(sym.aliases))
89 if negated_alias:
90 cloned = _CloneAlias(sym, negated_alias)
91 else:
92 all_aliases_removed = id(sym.aliases) not in matched_before_aliases
93 # If all alises are removed, then given them negative size to reflect
94 # the savings.
95 if all_aliases_removed:
96 cloned = _CloneSymbol(sym, -sym.size_without_padding)
97 cloned.padding = -sym.padding
98 else:
99 # But if only a subset of aliases are removed, do not actually treat
100 # them as aliases anymore, or else they will weigh down the PSS of
101 # the symbols that were not removed.
102 cloned = _CloneSymbol(sym, 0)
103 cloned.aliases = [cloned]
104 negated_symbol_by_before_aliases[id(sym.aliases)] = cloned
105 else:
106 cloned = _CloneSymbol(sym, -sym.size_without_padding)
107 cloned.padding = -sym.padding
108 ret.append(cloned)
109 return ret
110
111
112 # TODO(agrieve): Diff logic does not work correctly when aliased symbols span
113 # mulitple groups. We should simplify by not allowing recursion (allow diffs
114 # only on SizeInfo, apply logic to raw_symbols, re-cluster after-the-fact.
115 def _DiffSymbolGroups(before, after):
116 before_symbols_by_key = collections.defaultdict(list)
117 for s in before:
118 before_symbols_by_key[s._Key()].append(s)
119
120 similar = []
121 diffed_symbol_by_after_aliases = {}
122 matched_before_aliases = set()
123 unmatched_after_syms = []
124 # For similar symbols, padding is zeroed out. In order to not lose the
125 # information entirely, store it in aggregate.
126 padding_by_section_name = collections.defaultdict(int)
127
128 # Step 1: Create all delta symbols and record unmatched symbols.
129 for after_sym in after:
130 matching_syms = before_symbols_by_key.get(after_sym._Key())
131 if matching_syms:
132 before_sym = matching_syms.pop(0)
133 if before_sym.IsGroup() and after_sym.IsGroup():
134 similar.append(_DiffSymbolGroups(before_sym, after_sym))
135 else:
136 if before_sym.aliases:
137 matched_before_aliases.add(id(before_sym.aliases))
138 similar.append(
139 _DiffSymbol(before_sym, after_sym, diffed_symbol_by_after_aliases,
140 padding_by_section_name))
141 else:
142 unmatched_after_syms.append(after_sym)
143 continue
144
145 # Step 2: Copy symbols only in "after" (being careful with aliases).
146 added = _CloneUnmatched(unmatched_after_syms, diffed_symbol_by_after_aliases)
147
148 # Step 3: Negate symbols only in "before" (being careful with aliases).
149 removed = []
150 negated_symbol_by_before_aliases = {}
151 for remaining_syms in before_symbols_by_key.itervalues():
152 removed.extend(_NegateAndClone(remaining_syms, matched_before_aliases,
153 negated_symbol_by_before_aliases))
154
155 # Step 4: Create ** symbols to represent padding differences.
156 for section_name, padding in padding_by_section_name.iteritems():
157 if padding != 0:
158 similar.append(models.Symbol(
159 section_name, padding,
160 name="** aggregate padding of diff'ed symbols"))
161 return models.SymbolDiff(
162 added, removed, similar, name=after.name, full_name=after.full_name,
163 section_name=after.section_name)
164
165
166 def Diff(before, after):
167 """Diffs two SizeInfo or SymbolGroup objects.
168
169 When diffing SizeInfos, a SizeInfoDiff is returned.
170 When diffing SymbolGroups, a SymbolDiff is returned.
171
172 Returns:
173 Returns a SizeInfo when args are of type SizeInfo.
174 Returns a SymbolDiff when args are of type SymbolGroup.
175 """
176 if isinstance(after, models.SizeInfo):
177 assert isinstance(before, models.SizeInfo)
178 section_sizes = {k: after.section_sizes[k] - v
179 for k, v in before.section_sizes.iteritems()}
180 symbol_diff = _DiffSymbolGroups(before.symbols, after.symbols)
181 return models.SizeInfoDiff(section_sizes, symbol_diff, before.metadata,
182 after.metadata)
183
184 assert (isinstance(after, models.SymbolGroup) and
185 isinstance(before, models.SymbolGroup))
186 return _DiffSymbolGroups(before, after)
187
188
OLDNEW
« no previous file with comments | « tools/binary_size/libsupersize/describe.py ('k') | tools/binary_size/libsupersize/file_format.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698