Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: test_trace.py: Have trace-cmd report always use -l

Browse source 
With newer versions of trace-cmd the report subcommand will have
different output from before if we do or do not pass -l. However, with
the -l flag passed our put is consistent here. This updates our regular
expressions and comments for this as well now.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2024-01-17 17:12:36 -05:00
parent 662eade79e
commit 1858bebeaf
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
test/py/tests/test_trace.py
View file

@ -12,7 +12,7 @@ import u_boot_utils as util
TMPDIR = '/tmp/test_trace' TMPDIR = '/tmp/test_trace'
# Decode a function-graph line # Decode a function-graph line
RE_LINE = re.compile(r'.*\[000\]\s*([0-9.]*): func.*[|](\s*)(\S.*)?([{};])$') RE_LINE = re.compile(r'.*0\.\.\.\.\. \s*([0-9.]*): func.*[|](\s*)(\S.*)?([{};])$')
def collect_trace(cons): def collect_trace(cons):
@ -113,15 +113,15 @@ def check_function(cons, fname, proftool, map_fname, trace_dat):
assert val > 50000 # Should be at least 50KB of symbols assert val > 50000 # Should be at least 50KB of symbols
# Check that the trace has something useful # Check that the trace has something useful
cmd = f"trace-cmd report {trace_dat} |grep -E '(initf_|initr_)'" cmd = f"trace-cmd report -l {trace_dat} |grep -E '(initf_|initr_)'"
out = util.run_and_log(cons, ['sh', '-c', cmd]) out = util.run_and_log(cons, ['sh', '-c', cmd])
# Format: # Format:
# unknown option 14 # u-boot-1 0..... 60.805596: function: initf_malloc
# u-boot-1 [000] 60.805596: function: initf_malloc # u-boot-1 0..... 60.805597: function: initf_malloc
# u-boot-1 [000] 60.805597: function: initf_malloc # u-boot-1 0..... 60.805601: function: initf_bootstage
# u-boot-1 [000] 60.805601: function: initf_bootstage # u-boot-1 0..... 60.805607: function: initf_bootstage
# u-boot-1 [000] 60.805607: function: initf_bootstage
lines = [line.replace(':', '').split() for line in out.splitlines()] lines = [line.replace(':', '').split() for line in out.splitlines()]
vals = {items[4]: float(items[2]) for items in lines if len(items) == 5} vals = {items[4]: float(items[2]) for items in lines if len(items) == 5}
base = None base = None
@ -161,21 +161,21 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat):
'dump-ftrace', '-f', 'funcgraph']) 'dump-ftrace', '-f', 'funcgraph'])
# Check that the trace has what we expect # Check that the trace has what we expect
cmd = f'trace-cmd report {trace_dat} |head -n 70' cmd = f'trace-cmd report -l {trace_dat} |head -n 70'
out = util.run_and_log(cons, ['sh', '-c', cmd]) out = util.run_and_log(cons, ['sh', '-c', cmd])
# First look for this: # First look for this:
# u-boot-1 [000] 282.101360: funcgraph_entry: 0.004 us | initf_malloc(); # u-boot-1 0..... 282.101360: funcgraph_entry: 0.004 us | initf_malloc();
# ... # ...
# u-boot-1 [000] 282.101369: funcgraph_entry: | initf_bootstage() { # u-boot-1 0..... 282.101369: funcgraph_entry: | initf_bootstage() {
# u-boot-1 [000] 282.101369: funcgraph_entry: | bootstage_init() { # u-boot-1 0..... 282.101369: funcgraph_entry: | bootstage_init() {
# u-boot-1 [000] 282.101369: funcgraph_entry: | dlmalloc() { # u-boot-1 0..... 282.101369: funcgraph_entry: | dlmalloc() {
# ... # ...
# u-boot-1 [000] 282.101375: funcgraph_exit: 0.001 us | } # u-boot-1 0..... 282.101375: funcgraph_exit: 0.001 us | }
# Then look for this: # Then look for this:
# u-boot-1 [000] 282.101375: funcgraph_exit: 0.006 us | } # u-boot-1 0..... 282.101375: funcgraph_exit: 0.006 us | }
# Then check for this: # Then check for this:
# u-boot-1 [000] 282.101375: funcgraph_entry: 0.000 us | initcall_is_event(); # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | initcall_is_event();
expected_indent = None expected_indent = None
found_start = False found_start = False
@ -203,7 +203,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat):
# Now look for initf_dm() and dm_timer_init() so we can check the bootstage # Now look for initf_dm() and dm_timer_init() so we can check the bootstage
# time # time
cmd = f"trace-cmd report {trace_dat} |grep -E '(initf_dm|dm_timer_init)'" cmd = f"trace-cmd report -l {trace_dat} |grep -E '(initf_dm|dm_timer_init)'"
out = util.run_and_log(cons, ['sh', '-c', cmd]) out = util.run_and_log(cons, ['sh', '-c', cmd])
start_timestamp = None start_timestamp = None