MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/buildstats-diff: Add option to filter tasks

Browse Source 
Adds a command line option to filter out the buildstats-diff report by
one more more tasks. e.g.:

 buildstats-diff --only-task do_compile A B

will only show the differences for do_compile tasks. The --only-task
option can be specified multiple times to filter out multiple tasks at
once.

(From OE-Core rev: a8c7960d24c48107fd3703e49c38f890e84e2226)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt 2019-07-15 10:47:33 -05:00 committed by Richard Purdie
parent 97ca346de8
commit 067d475dbb
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/buildstats-diff
View File

@ -114,7 +114,7 @@ def print_ver_diff(bs1, bs2):
print(fmt_str.format(name, field1, field2, maxlen=maxlen)) print(fmt_str.format(name, field1, field2, maxlen=maxlen))
def print_task_diff(bs1, bs2, val_type, min_val=0, min_absdiff=0, sort_by=('absdiff',)): def print_task_diff(bs1, bs2, val_type, min_val=0, min_absdiff=0, sort_by=('absdiff',), only_tasks=[]):
"""Diff task execution times""" """Diff task execution times"""
def val_to_str(val, human_readable=False): def val_to_str(val, human_readable=False):
"""Convert raw value to printable string""" """Convert raw value to printable string"""
@ -151,7 +151,8 @@ def print_task_diff(bs1, bs2, val_type, min_val=0, min_absdiff=0, sort_by=('absd
"""Get cumulative sum of all tasks""" """Get cumulative sum of all tasks"""
total = 0.0 total = 0.0
for recipe_data in buildstats.values(): for recipe_data in buildstats.values():
for bs_task in recipe_data.tasks.values(): for name, bs_task in recipe_data.tasks.items():
if not only_tasks or name in only_tasks:
total += getattr(bs_task, val_type) total += getattr(bs_task, val_type)
return total return total
@ -163,7 +164,7 @@ def print_task_diff(bs1, bs2, val_type, min_val=0, min_absdiff=0, sort_by=('absd
val_to_str(min_absdiff, True), val_to_str(min_absdiff))) val_to_str(min_absdiff, True), val_to_str(min_absdiff)))
# Prepare the data # Prepare the data
tasks_diff = diff_buildstats(bs1, bs2, val_type, min_val, min_absdiff) tasks_diff = diff_buildstats(bs1, bs2, val_type, min_val, min_absdiff, only_tasks)
# Sort our list # Sort our list
for field in reversed(sort_by): for field in reversed(sort_by):
@ -248,6 +249,8 @@ Script for comparing buildstats of two separate builds."""
parser.add_argument('--multi', action='store_true', parser.add_argument('--multi', action='store_true',
help="Read all buildstats from the given paths and " help="Read all buildstats from the given paths and "
"average over them") "average over them")
parser.add_argument('--only-task', dest='only_tasks', metavar='TASK', action='append', default=[],
help="Only include TASK in report. May be specified multiple times")
parser.add_argument('buildstats1', metavar='BUILDSTATS1', help="'Left' buildstat") parser.add_argument('buildstats1', metavar='BUILDSTATS1', help="'Left' buildstat")
parser.add_argument('buildstats2', metavar='BUILDSTATS2', help="'Right' buildstat") parser.add_argument('buildstats2', metavar='BUILDSTATS2', help="'Right' buildstat")
@ -266,7 +269,6 @@ Script for comparing buildstats of two separate builds."""
return args return args
def main(argv=None): def main(argv=None):
"""Script entry point""" """Script entry point"""
args = parse_args(argv) args = parse_args(argv)
@ -290,7 +292,7 @@ def main(argv=None):
print_ver_diff(bs1, bs2) print_ver_diff(bs1, bs2)
else: else:
print_task_diff(bs1, bs2, args.diff_attr, args.min_val, print_task_diff(bs1, bs2, args.diff_attr, args.min_val,
args.min_absdiff, sort_by) args.min_absdiff, sort_by, args.only_tasks)
except ScriptError as err: except ScriptError as err:
log.error(str(err)) log.error(str(err))
return 1 return 1

6
scripts/lib/buildstats.py
View File

@ -261,13 +261,17 @@ class BuildStats(dict):
self[pkg].aggregate(data) self[pkg].aggregate(data)
def diff_buildstats(bs1, bs2, stat_attr, min_val=None, min_absdiff=None): def diff_buildstats(bs1, bs2, stat_attr, min_val=None, min_absdiff=None, only_tasks=[]):
"""Compare the tasks of two buildstats""" """Compare the tasks of two buildstats"""
tasks_diff = [] tasks_diff = []
pkgs = set(bs1.keys()).union(set(bs2.keys())) pkgs = set(bs1.keys()).union(set(bs2.keys()))
for pkg in pkgs: for pkg in pkgs:
tasks1 = bs1[pkg].tasks if pkg in bs1 else {} tasks1 = bs1[pkg].tasks if pkg in bs1 else {}
tasks2 = bs2[pkg].tasks if pkg in bs2 else {} tasks2 = bs2[pkg].tasks if pkg in bs2 else {}
if only_tasks:
tasks1 = {k: v for k, v in tasks1.items() if k in only_tasks}
tasks2 = {k: v for k, v in tasks2.items() if k in only_tasks}
if not tasks1: if not tasks1:
pkg_op = '+' pkg_op = '+'
elif not tasks2: elif not tasks2: