Tweaked scripts to share more code, added coverage calls/hits

The main change is requiring field names for -b/-f/-s/-S, this
is a bit more powerful, and supports hidden extra fields, but
can require a bit more typing in some cases.
This commit is contained in:
Christopher Haster
2022-10-02 03:07:30 -05:00
parent 296c5afea7
commit ca66993812
8 changed files with 1972 additions and 1454 deletions

View File

@@ -29,10 +29,10 @@ TYPE = 'tTrRdD'
# integer fields
class IntField(co.namedtuple('IntField', 'x')):
class Int(co.namedtuple('Int', 'x')):
__slots__ = ()
def __new__(cls, x=0):
if isinstance(x, IntField):
if isinstance(x, Int):
return x
if isinstance(x, str):
try:
@@ -98,35 +98,30 @@ class IntField(co.namedtuple('IntField', 'x')):
return (new-old) / old
def __add__(self, other):
return IntField(self.x + other.x)
return self.__class__(self.x + other.x)
def __sub__(self, other):
return IntField(self.x - other.x)
return self.__class__(self.x - other.x)
def __mul__(self, other):
return IntField(self.x * other.x)
def __lt__(self, other):
return self.x < other.x
def __gt__(self, other):
return self.__class__.__lt__(other, self)
def __le__(self, other):
return not self.__gt__(other)
def __ge__(self, other):
return not self.__lt__(other)
return self.__class__(self.x * other.x)
# code size results
class CodeResult(co.namedtuple('CodeResult', 'file,function,code_size')):
class CodeResult(co.namedtuple('CodeResult', [
'file', 'function',
'size'])):
_by = ['file', 'function']
_fields = ['size']
_types = {'size': Int}
__slots__ = ()
def __new__(cls, file, function, code_size):
return super().__new__(cls, file, function, IntField(code_size))
def __new__(cls, file='', function='', size=0):
return super().__new__(cls, file, function,
Int(size))
def __add__(self, other):
return CodeResult(self.file, self.function,
self.code_size + other.code_size)
self.size + other.size)
def openio(path, mode='r'):
@@ -188,9 +183,27 @@ def collect(paths, *,
return results
def fold(results, *,
by=['file', 'function'],
def fold(Result, results, *,
by=None,
defines=None,
**_):
if by is None:
by = Result._by
for k in it.chain(by or [], (k for k, _ in defines or [])):
if k not in Result._by and k not in Result._fields:
print("error: could not find field %r?" % k)
sys.exit(-1)
# filter by matching defines
if defines is not None:
results_ = []
for r in results:
if all(getattr(r, k) in vs for k, vs in defines):
results_.append(r)
results = results_
# organize results into conflicts
folding = co.OrderedDict()
for r in results:
name = tuple(getattr(r, k) for k in by)
@@ -198,157 +211,220 @@ def fold(results, *,
folding[name] = []
folding[name].append(r)
# merge conflicts
folded = []
for rs in folding.values():
for name, rs in folding.items():
folded.append(sum(rs[1:], start=rs[0]))
return folded
def table(results, diff_results=None, *,
by_file=False,
size_sort=False,
reverse_size_sort=False,
def table(Result, results, diff_results=None, *,
by=None,
fields=None,
sort=None,
summary=False,
all=False,
percent=False,
**_):
all_, all = all, __builtins__.all
# fold
results = fold(results, by=['file' if by_file else 'function'])
if diff_results is not None:
diff_results = fold(diff_results,
by=['file' if by_file else 'function'])
if by is None:
by = Result._by
if fields is None:
fields = Result._fields
types = Result._types
# fold again
results = fold(Result, results, by=by)
if diff_results is not None:
diff_results = fold(Result, diff_results, by=by)
# organize by name
table = {
r.file if by_file else r.function: r
','.join(str(getattr(r, k) or '') for k in by): r
for r in results}
diff_table = {
r.file if by_file else r.function: r
','.join(str(getattr(r, k) or '') for k in by): r
for r in diff_results or []}
# sort, note that python's sort is stable
names = list(table.keys() | diff_table.keys())
# sort again, now with diff info, note that python's sort is stable
names.sort()
if diff_results is not None:
names.sort(key=lambda n: -IntField.ratio(
table[n].code_size if n in table else None,
diff_table[n].code_size if n in diff_table else None))
if size_sort:
names.sort(key=lambda n: (table[n].code_size,) if n in table else (),
names.sort(key=lambda n: tuple(
types[k].ratio(
getattr(table.get(n), k, None),
getattr(diff_table.get(n), k, None))
for k in fields),
reverse=True)
elif reverse_size_sort:
names.sort(key=lambda n: (table[n].code_size,) if n in table else (),
reverse=False)
if sort:
for k, reverse in reversed(sort):
names.sort(key=lambda n: (getattr(table[n], k),)
if getattr(table.get(n), k, None) is not None else (),
reverse=reverse ^ (not k or k in Result._fields))
# print header
if not summary:
title = '%s%s' % (
'file' if by_file else 'function',
' (%d added, %d removed)' % (
sum(1 for n in table if n not in diff_table),
sum(1 for n in diff_table if n not in table))
if diff_results is not None and not percent else '')
name_width = max(it.chain([23, len(title)], (len(n) for n in names)))
else:
title = ''
name_width = 23
name_width = 4*((name_width+1+4-1)//4)-1
print('%-*s ' % (name_width, title), end='')
# build up our lines
lines = []
# header
line = []
line.append('%s%s' % (
','.join(by),
' (%d added, %d removed)' % (
sum(1 for n in table if n not in diff_table),
sum(1 for n in diff_table if n not in table))
if diff_results is not None and not percent else '')
if not summary else '')
if diff_results is None:
print(' %s' % ('size'.rjust(len(IntField.none))))
for k in fields:
line.append(k)
elif percent:
print(' %s' % ('size'.rjust(len(IntField.diff_none))))
for k in fields:
line.append(k)
else:
print(' %s %s %s' % (
'old'.rjust(len(IntField.diff_none)),
'new'.rjust(len(IntField.diff_none)),
'diff'.rjust(len(IntField.diff_none))))
for k in fields:
line.append('o'+k)
for k in fields:
line.append('n'+k)
for k in fields:
line.append('d'+k)
line.append('')
lines.append(line)
# print entries
# entries
if not summary:
for name in names:
r = table.get(name)
if diff_results is not None:
diff_r = diff_table.get(name)
ratio = IntField.ratio(
r.code_size if r else None,
diff_r.code_size if diff_r else None)
if not ratio and not all_:
ratios = [
types[k].ratio(
getattr(r, k, None),
getattr(diff_r, k, None))
for k in fields]
if not any(ratios) and not all_:
continue
print('%-*s ' % (name_width, name), end='')
line = []
line.append(name)
if diff_results is None:
print(' %s' % (
r.code_size.table()
if r else IntField.none))
for k in fields:
line.append(getattr(r, k).table()
if getattr(r, k, None) is not None
else types[k].none)
elif percent:
print(' %s%s' % (
r.code_size.diff_table()
if r else IntField.diff_none,
' (%s)' % (
'+∞%' if ratio == +m.inf
else '-∞%' if ratio == -m.inf
else '%+.1f%%' % (100*ratio))))
for k in fields:
line.append(getattr(r, k).diff_table()
if getattr(r, k, None) is not None
else types[k].diff_none)
else:
print(' %s %s %s%s' % (
diff_r.code_size.diff_table()
if diff_r else IntField.diff_none,
r.code_size.diff_table()
if r else IntField.diff_none,
IntField.diff_diff(
r.code_size if r else None,
diff_r.code_size if diff_r else None)
if r or diff_r else IntField.diff_none,
' (%s)' % (
'+∞%' if ratio == +m.inf
else '-∞%' if ratio == -m.inf
else '%+.1f%%' % (100*ratio))
if ratio else ''))
for k in fields:
line.append(getattr(diff_r, k).diff_table()
if getattr(diff_r, k, None) is not None
else types[k].diff_none)
for k in fields:
line.append(getattr(r, k).diff_table()
if getattr(r, k, None) is not None
else types[k].diff_none)
for k in fields:
line.append(types[k].diff_diff(
getattr(r, k, None),
getattr(diff_r, k, None)))
if diff_results is None:
line.append('')
elif percent:
line.append(' (%s)' % ', '.join(
'+∞%' if t == +m.inf
else '-∞%' if t == -m.inf
else '%+.1f%%' % (100*t)
for t in ratios))
else:
line.append(' (%s)' % ', '.join(
'+∞%' if t == +m.inf
else '-∞%' if t == -m.inf
else '%+.1f%%' % (100*t)
for t in ratios
if t)
if any(ratios) else '')
lines.append(line)
# print total
total = fold(results, by=[])
r = total[0] if total else None
# total
r = next(iter(fold(Result, results, by=[])), None)
if diff_results is not None:
diff_total = fold(diff_results, by=[])
diff_r = diff_total[0] if diff_total else None
ratio = IntField.ratio(
r.code_size if r else None,
diff_r.code_size if diff_r else None)
diff_r = next(iter(fold(Result, diff_results, by=[])), None)
ratios = [
types[k].ratio(
getattr(r, k, None),
getattr(diff_r, k, None))
for k in fields]
print('%-*s ' % (name_width, 'TOTAL'), end='')
line = []
line.append('TOTAL')
if diff_results is None:
print(' %s' % (
r.code_size.table()
if r else IntField.none))
for k in fields:
line.append(getattr(r, k).table()
if getattr(r, k, None) is not None
else types[k].none)
elif percent:
print(' %s%s' % (
r.code_size.diff_table()
if r else IntField.diff_none,
' (%s)' % (
'+∞%' if ratio == +m.inf
else '-∞%' if ratio == -m.inf
else '%+.1f%%' % (100*ratio))))
for k in fields:
line.append(getattr(r, k).diff_table()
if getattr(r, k, None) is not None
else types[k].diff_none)
else:
print(' %s %s %s%s' % (
diff_r.code_size.diff_table()
if diff_r else IntField.diff_none,
r.code_size.diff_table()
if r else IntField.diff_none,
IntField.diff_diff(
r.code_size if r else None,
diff_r.code_size if diff_r else None)
if r or diff_r else IntField.diff_none,
' (%s)' % (
'+∞%' if ratio == +m.inf
else '-∞%' if ratio == -m.inf
else '%+.1f%%' % (100*ratio))
if ratio else ''))
for k in fields:
line.append(getattr(diff_r, k).diff_table()
if getattr(diff_r, k, None) is not None
else types[k].diff_none)
for k in fields:
line.append(getattr(r, k).diff_table()
if getattr(r, k, None) is not None
else types[k].diff_none)
for k in fields:
line.append(types[k].diff_diff(
getattr(r, k, None),
getattr(diff_r, k, None)))
if diff_results is None:
line.append('')
elif percent:
line.append(' (%s)' % ', '.join(
'+∞%' if t == +m.inf
else '-∞%' if t == -m.inf
else '%+.1f%%' % (100*t)
for t in ratios))
else:
line.append(' (%s)' % ', '.join(
'+∞%' if t == +m.inf
else '-∞%' if t == -m.inf
else '%+.1f%%' % (100*t)
for t in ratios
if t)
if any(ratios) else '')
lines.append(line)
# find the best widths, note that column 0 contains the names and column -1
# the ratios, so those are handled a bit differently
widths = [
((max(it.chain([w], (len(l[i]) for l in lines)))+1+4-1)//4)*4-1
for w, i in zip(
it.chain([23], it.repeat(7)),
range(len(lines[0])-1))]
# print our table
for line in lines:
print('%-*s %s%s' % (
widths[0], line[0],
' '.join('%*s' % (w, x)
for w, x in zip(widths[1:], line[1:-1])),
line[-1]))
def main(obj_paths, **args):
def main(obj_paths, *,
by=None,
fields=None,
defines=None,
sort=None,
**args):
# find sizes
if not args.get('use', None):
# find .o files
@@ -361,7 +437,7 @@ def main(obj_paths, **args):
paths.append(path)
if not paths:
print('no .obj files found in %r?' % obj_paths)
print("error: no .obj files found in %r?" % obj_paths)
sys.exit(-1)
results = collect(paths, **args)
@@ -371,25 +447,35 @@ def main(obj_paths, **args):
reader = csv.DictReader(f, restval='')
for r in reader:
try:
results.append(CodeResult(**{
k: v for k, v in r.items()
if k in CodeResult._fields}))
results.append(CodeResult(
**{k: r[k] for k in CodeResult._by
if k in r and r[k].strip()},
**{k: r['code_'+k] for k in CodeResult._fields
if 'code_'+k in r and r['code_'+k].strip()}))
except TypeError:
pass
# fold to remove duplicates
results = fold(results)
# fold
results = fold(CodeResult, results, by=by, defines=defines)
# sort because why not
# sort, note that python's sort is stable
results.sort()
if sort:
for k, reverse in reversed(sort):
results.sort(key=lambda r: (getattr(r, k),)
if getattr(r, k) is not None else (),
reverse=reverse ^ (not k or k in CodeResult._fields))
# write results to CSV
if args.get('output'):
with openio(args['output'], 'w') as f:
writer = csv.DictWriter(f, CodeResult._fields)
writer = csv.DictWriter(f, CodeResult._by
+ ['code_'+k for k in CodeResult._fields])
writer.writeheader()
for r in results:
writer.writerow(r._asdict())
writer.writerow(
{k: getattr(r, k) for k in CodeResult._by}
| {'code_'+k: getattr(r, k) for k in CodeResult._fields})
# find previous results?
if args.get('diff'):
@@ -399,22 +485,26 @@ def main(obj_paths, **args):
reader = csv.DictReader(f, restval='')
for r in reader:
try:
diff_results.append(CodeResult(**{
k: v for k, v in r.items()
if k in CodeResult._fields}))
diff_results.append(CodeResult(
**{k: r[k] for k in CodeResult._by
if k in r and r[k].strip()},
**{k: r['code_'+k] for k in CodeResult._fields
if 'code_'+k in r and r['code_'+k].strip()}))
except TypeError:
pass
except FileNotFoundError:
pass
# fold to remove duplicates
diff_results = fold(diff_results)
# fold
diff_results = fold(CodeResult, diff_results, by=by, defines=defines)
# print table
if not args.get('quiet'):
table(
results,
table(CodeResult, results,
diff_results if args.get('diff') else None,
by=by if by is not None else ['function'],
fields=fields,
sort=sort,
**args)
@@ -455,22 +545,39 @@ if __name__ == "__main__":
action='store_true',
help="Only show percentage change, not a full diff.")
parser.add_argument(
'-b', '--by-file',
action='store_true',
help="Group by file. Note this does not include padding "
"so sizes may differ from other tools.")
'-b', '--by',
action='append',
choices=CodeResult._by,
help="Group by this field.")
parser.add_argument(
'-s', '--size-sort',
action='store_true',
help="Sort by size.")
'-f', '--field',
dest='fields',
action='append',
choices=CodeResult._fields,
help="Show this field.")
parser.add_argument(
'-S', '--reverse-size-sort',
action='store_true',
help="Sort by size, but backwards.")
'-D', '--define',
dest='defines',
action='append',
type=lambda x: (lambda k,v: (k, set(v.split(','))))(*x.split('=', 1)),
help="Only include results where this field is this value.")
class AppendSort(argparse.Action):
def __call__(self, parser, namespace, value, option):
if namespace.sort is None:
namespace.sort = []
namespace.sort.append((value, True if option == '-S' else False))
parser.add_argument(
'-s', '--sort',
action=AppendSort,
help="Sort by this fields.")
parser.add_argument(
'-S', '--reverse-sort',
action=AppendSort,
help="Sort by this fields, but backwards.")
parser.add_argument(
'-Y', '--summary',
action='store_true',
help="Only show the total size.")
help="Only show the total.")
parser.add_argument(
'-A', '--everything',
action='store_true',