mirror of
https://github.com/littlefs-project/littlefs.git
synced 2025-10-21 23:30:53 +08:00
Added BUILDDIR, a bit of script reworking
Now littlefs's Makefile can work with a custom build directory for compilation output. Just set the BUILDDIR variable and the Makefile will take care of the rest. make BUILDDIR=build size This makes it very easy to compare builds with different compile-time configurations or different cross-compilers. This meant most of code.py's build isolation is no longer needed, so revisted the scripts and cleaned/tweaked a number of things. Also bought code.py in line with coverage.py, fixing some of the inconsistencies that were created while developing these scripts. One change to note was removing the inline measuring logic, I realized this feature is unnecessary thanks to GCC's -fkeep-static-functions and -fno-inline flags.
This commit is contained in:
Christopher Haster
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
|
||||
# Parse and report coverage info from .info files generated by lcov
|
||||
#
|
||||
import os
|
||||
import glob
|
||||
import csv
|
||||
@@ -8,8 +9,8 @@ import re
|
||||
import collections as co
|
||||
import bisect as b
|
||||
|
||||
INFO_PATHS = 'tests/*.toml.info'
|
||||
|
||||
INFO_PATHS = ['tests/*.toml.info']
|
||||
|
||||
def collect(paths, **args):
|
||||
file = None
|
||||
@@ -65,14 +66,14 @@ def collect(paths, **args):
|
||||
|
||||
def main(**args):
|
||||
# find coverage
|
||||
if not args.get('input', None):
|
||||
if not args.get('use'):
|
||||
# find *.info files
|
||||
paths = []
|
||||
for path in args['info_paths']:
|
||||
if os.path.isdir(path):
|
||||
path = path + '/*.gcov'
|
||||
|
||||
for path in glob.glob(path, recursive=True):
|
||||
for path in glob.glob(path):
|
||||
paths.append(path)
|
||||
|
||||
if not paths:
|
||||
@@ -81,7 +82,7 @@ def main(**args):
|
||||
|
||||
results = collect(paths, **args)
|
||||
else:
|
||||
with open(args['input']) as f:
|
||||
with open(args['use']) as f:
|
||||
r = csv.DictReader(f)
|
||||
results = [
|
||||
( result['file'],
|
||||
@@ -96,7 +97,7 @@ def main(**args):
|
||||
total_count += count
|
||||
|
||||
# find previous results?
|
||||
if args.get('diff', None):
|
||||
if args.get('diff'):
|
||||
with open(args['diff']) as f:
|
||||
r = csv.DictReader(f)
|
||||
prev_results = [
|
||||
@@ -112,12 +113,11 @@ def main(**args):
|
||||
prev_total_count += count
|
||||
|
||||
# write results to CSV
|
||||
if args.get('output', None):
|
||||
results.sort(key=lambda x: (-(x[3]-x[2]), -x[3], x))
|
||||
if args.get('output'):
|
||||
with open(args['output'], 'w') as f:
|
||||
w = csv.writer(f)
|
||||
w.writerow(['file', 'function', 'hits', 'count'])
|
||||
for file, func, hits, count in results:
|
||||
for file, func, hits, count in sorted(results):
|
||||
w.writerow((file, func, hits, count))
|
||||
|
||||
# print results
|
||||
@@ -130,97 +130,95 @@ def main(**args):
|
||||
return entries
|
||||
|
||||
def diff_entries(olds, news):
|
||||
diff = co.defaultdict(lambda: (None, None, None, None, None, None))
|
||||
diff = co.defaultdict(lambda: (0, 0, 0, 0, 0, 0, 0))
|
||||
for name, (new_hits, new_count) in news.items():
|
||||
diff[name] = (
|
||||
0, 0,
|
||||
new_hits, new_count,
|
||||
new_hits, new_count)
|
||||
new_hits, new_count,
|
||||
(new_hits/new_count if new_count else 1.0) - 1.0)
|
||||
for name, (old_hits, old_count) in olds.items():
|
||||
new_hits = diff[name][2] or 0
|
||||
new_count = diff[name][3] or 0
|
||||
_, _, new_hits, new_count, _, _, _ = diff[name]
|
||||
diff[name] = (
|
||||
old_hits, old_count,
|
||||
new_hits, new_count,
|
||||
new_hits-old_hits, new_count-old_count)
|
||||
new_hits-old_hits, new_count-old_count,
|
||||
((new_hits/new_count if new_count else 1.0)
|
||||
- (old_hits/old_count if old_count else 1.0)))
|
||||
return diff
|
||||
|
||||
def print_header(by=''):
|
||||
if not args.get('diff', False):
|
||||
print('%-36s %11s' % (by, 'hits/count'))
|
||||
if not args.get('diff'):
|
||||
print('%-36s %19s' % (by, 'hits/line'))
|
||||
else:
|
||||
print('%-36s %11s %11s %11s' % (by, 'old', 'new', 'diff'))
|
||||
print('%-36s %19s %19s %11s' % (by, 'old', 'new', 'diff'))
|
||||
|
||||
def print_entries(by='function'):
|
||||
entries = dedup_entries(results, by=by)
|
||||
|
||||
if not args.get('diff', None):
|
||||
if not args.get('diff'):
|
||||
print_header(by=by)
|
||||
for name, (hits, count) in sorted(entries.items(),
|
||||
key=lambda x: (-(x[1][1]-x[1][0]), -x[1][1], x)):
|
||||
print("%-36s %11s (%.2f%%)" % (name,
|
||||
'%d/%d' % (hits, count),
|
||||
100*(hits/count if count else 1.0)))
|
||||
for name, (hits, count) in sorted(entries.items()):
|
||||
print("%-36s %11s %7s" % (name,
|
||||
'%d/%d' % (hits, count)
|
||||
if count else '-',
|
||||
'%.1f%%' % (100*hits/count)
|
||||
if count else '-'))
|
||||
else:
|
||||
prev_entries = dedup_entries(prev_results, by=by)
|
||||
diff = diff_entries(prev_entries, entries)
|
||||
print_header(by='%s (%d added, %d removed)' % (by,
|
||||
sum(1 for _, old, _, _, _, _ in diff.values() if not old),
|
||||
sum(1 for _, _, _, new, _, _ in diff.values() if not new)))
|
||||
sum(1 for _, old, _, _, _, _, _ in diff.values() if not old),
|
||||
sum(1 for _, _, _, new, _, _, _ in diff.values() if not new)))
|
||||
for name, (
|
||||
old_hits, old_count,
|
||||
new_hits, new_count,
|
||||
diff_hits, diff_count) in sorted(diff.items(),
|
||||
key=lambda x: (
|
||||
-(x[1][5]-x[1][4]), -x[1][5], -x[1][3], x)):
|
||||
ratio = ((new_hits/new_count if new_count else 1.0)
|
||||
- (old_hits/old_count if old_count else 1.0))
|
||||
if diff_hits or diff_count or args.get('all', False):
|
||||
print("%-36s %11s %11s %11s%s" % (name,
|
||||
diff_hits, diff_count, ratio) in sorted(diff.items(),
|
||||
key=lambda x: (-x[1][6], x)):
|
||||
if ratio or args.get('all'):
|
||||
print("%-36s %11s %7s %11s %7s %11s%s" % (name,
|
||||
'%d/%d' % (old_hits, old_count)
|
||||
if old_count else '-',
|
||||
'%.1f%%' % (100*old_hits/old_count)
|
||||
if old_count else '-',
|
||||
'%d/%d' % (new_hits, new_count)
|
||||
if new_count else '-',
|
||||
'%.1f%%' % (100*new_hits/new_count)
|
||||
if new_count else '-',
|
||||
'%+d/%+d' % (diff_hits, diff_count),
|
||||
' (%+.2f%%)' % (100*ratio) if ratio else ''))
|
||||
' (%+.1f%%)' % (100*ratio) if ratio else ''))
|
||||
|
||||
def print_totals():
|
||||
if not args.get('diff', None):
|
||||
print("%-36s %11s (%.2f%%)" % ('TOTALS',
|
||||
'%d/%d' % (total_hits, total_count),
|
||||
100*(total_hits/total_count if total_count else 1.0)))
|
||||
if not args.get('diff'):
|
||||
print("%-36s %11s %7s" % ('TOTAL',
|
||||
'%d/%d' % (total_hits, total_count)
|
||||
if total_count else '-',
|
||||
'%.1f%%' % (100*total_hits/total_count)
|
||||
if total_count else '-'))
|
||||
else:
|
||||
ratio = ((total_hits/total_count
|
||||
if total_count else 1.0)
|
||||
- (prev_total_hits/prev_total_count
|
||||
if prev_total_count else 1.0))
|
||||
print("%-36s %11s %11s %11s%s" % ('TOTALS',
|
||||
'%d/%d' % (prev_total_hits, prev_total_count),
|
||||
'%d/%d' % (total_hits, total_count),
|
||||
print("%-36s %11s %7s %11s %7s %11s%s" % ('TOTAL',
|
||||
'%d/%d' % (prev_total_hits, prev_total_count)
|
||||
if prev_total_count else '-',
|
||||
'%.1f%%' % (100*prev_total_hits/prev_total_count)
|
||||
if prev_total_count else '-',
|
||||
'%d/%d' % (total_hits, total_count)
|
||||
if total_count else '-',
|
||||
'%.1f%%' % (100*total_hits/total_count)
|
||||
if total_count else '-',
|
||||
'%+d/%+d' % (total_hits-prev_total_hits,
|
||||
total_count-prev_total_count),
|
||||
' (%+.2f%%)' % (100*ratio) if ratio else ''))
|
||||
' (%+.1f%%)' % (100*ratio) if ratio else ''))
|
||||
|
||||
def print_status():
|
||||
if not args.get('diff', None):
|
||||
print("%d/%d (%.2f%%)" % (total_hits, total_count,
|
||||
100*(total_hits/total_count if total_count else 1.0)))
|
||||
else:
|
||||
ratio = ((total_hits/total_count
|
||||
if total_count else 1.0)
|
||||
- (prev_total_hits/prev_total_count
|
||||
if prev_total_count else 1.0))
|
||||
print("%d/%d (%+.2f%%)" % (total_hits, total_count,
|
||||
(100*ratio) if ratio else ''))
|
||||
|
||||
if args.get('quiet', False):
|
||||
if args.get('quiet'):
|
||||
pass
|
||||
elif args.get('status', False):
|
||||
print_status()
|
||||
elif args.get('summary', False):
|
||||
elif args.get('summary'):
|
||||
print_header()
|
||||
print_totals()
|
||||
elif args.get('files', False):
|
||||
elif args.get('files'):
|
||||
print_entries(by='file')
|
||||
print_totals()
|
||||
else:
|
||||
@@ -231,17 +229,18 @@ if __name__ == "__main__":
|
||||
import argparse
|
||||
import sys
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Show/manipulate coverage info")
|
||||
parser.add_argument('info_paths', nargs='*', default=[INFO_PATHS],
|
||||
description="Parse and report coverage info from .info files \
|
||||
generated by lcov")
|
||||
parser.add_argument('info_paths', nargs='*', default=INFO_PATHS,
|
||||
help="Description of where to find *.info files. May be a directory \
|
||||
or list of paths. *.info files will be merged to show the total \
|
||||
coverage. Defaults to \"%s\"." % INFO_PATHS)
|
||||
coverage. Defaults to %r." % INFO_PATHS)
|
||||
parser.add_argument('-v', '--verbose', action='store_true',
|
||||
help="Output commands that run behind the scenes.")
|
||||
parser.add_argument('-i', '--input',
|
||||
help="Don't do any work, instead use this CSV file.")
|
||||
parser.add_argument('-o', '--output',
|
||||
help="Specify CSV file to store results.")
|
||||
parser.add_argument('-u', '--use',
|
||||
help="Don't do any work, instead use this CSV file.")
|
||||
parser.add_argument('-d', '--diff',
|
||||
help="Specify CSV file to diff code size against.")
|
||||
parser.add_argument('-a', '--all', action='store_true',
|
||||
@@ -250,8 +249,6 @@ if __name__ == "__main__":
|
||||
help="Show file-level coverage.")
|
||||
parser.add_argument('-s', '--summary', action='store_true',
|
||||
help="Only show the total coverage.")
|
||||
parser.add_argument('-S', '--status', action='store_true',
|
||||
help="Show minimum info useful for a single-line status.")
|
||||
parser.add_argument('-q', '--quiet', action='store_true',
|
||||
help="Don't show anything, useful with -o.")
|
||||
sys.exit(main(**vars(parser.parse_args())))
|
||||
|
||||
Reference in New Issue
Block a user