| Message ID | 20240912151143.1264483-5-james.clark@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | perf: cs-etm: Coresight decode and disassembly improvements | expand |
On 9/12/24 16:11, James Clark wrote:> > optparse is deprecated and less flexible than argparse so update it. > > Signed-off-by: James Clark <james.clark@linaro.org> Reviewed-by: Leo Yan <leo.yan@arm.com> > --- > .../scripts/python/arm-cs-trace-disasm.py | 28 +++++++------------ > 1 file changed, 10 insertions(+), 18 deletions(-) > > diff --git a/tools/perf/scripts/python/arm-cs-trace-disasm.py b/tools/perf/scripts/python/arm-cs-trace-disasm.py > index 7aff02d84ffb..45f682a8b34d 100755 > --- a/tools/perf/scripts/python/arm-cs-trace-disasm.py > +++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py > @@ -11,7 +11,7 @@ import os > from os import path > import re > from subprocess import * > -from optparse import OptionParser, make_option > +import argparse > > from perf_trace_context import perf_set_itrace_options, \ > perf_sample_insn, perf_sample_srccode > @@ -28,19 +28,11 @@ from perf_trace_context import perf_set_itrace_options, \ > # perf script -s scripts/python/arm-cs-trace-disasm.py > > # Command line parsing. > -option_list = [ > - # formatting options for the bottom entry of the stack > - make_option("-k", "--vmlinux", dest="vmlinux_name", > - help="Set path to vmlinux file"), > - make_option("-d", "--objdump", dest="objdump_name", > - help="Set path to objdump executable file"), > - make_option("-v", "--verbose", dest="verbose", > - action="store_true", default=False, > - help="Enable debugging log") > -] > - > -parser = OptionParser(option_list=option_list) > -(options, args) = parser.parse_args() > +args = argparse.ArgumentParser() > +args.add_argument("-k", "--vmlinux", help="Set path to vmlinux file") > +args.add_argument("-d", "--objdump", help="Set path to objdump executable file"), > +args.add_argument("-v", "--verbose", action="store_true", help="Enable debugging log") > +options = args.parse_args() > > # Initialize global dicts and regular expression > disasm_cache = dict() > @@ -65,8 +57,8 @@ def get_offset(perf_dict, field): > > def get_dso_file_path(dso_name, dso_build_id): > if (dso_name == "[kernel.kallsyms]" or dso_name == "vmlinux"): > - if (options.vmlinux_name): > - return options.vmlinux_name; > + if (options.vmlinux): > + return options.vmlinux; > else: > return dso_name > > @@ -92,7 +84,7 @@ def read_disam(dso_fname, dso_start, start_addr, stop_addr): > else: > start_addr = start_addr - dso_start; > stop_addr = stop_addr - dso_start; > - disasm = [ options.objdump_name, "-d", "-z", > + disasm = [ options.objdump, "-d", "-z", > "--start-address="+format(start_addr,"#x"), > "--stop-address="+format(stop_addr,"#x") ] > disasm += [ dso_fname ] > @@ -256,7 +248,7 @@ def process_event(param_dict): > print("Stop address 0x%x is out of range [ 0x%x .. 0x%x ] for dso %s" % (stop_addr, int(dso_start), int(dso_end), dso)) > return > > - if (options.objdump_name != None): > + if (options.objdump != None): > # It doesn't need to decrease virtual memory offset for disassembly > # for kernel dso and executable file dso, so in this case we set > # vm_start to zero. > -- > 2.34.1 >
diff --git a/tools/perf/scripts/python/arm-cs-trace-disasm.py b/tools/perf/scripts/python/arm-cs-trace-disasm.py index 7aff02d84ffb..45f682a8b34d 100755 --- a/tools/perf/scripts/python/arm-cs-trace-disasm.py +++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py @@ -11,7 +11,7 @@ import os from os import path import re from subprocess import * -from optparse import OptionParser, make_option +import argparse from perf_trace_context import perf_set_itrace_options, \ perf_sample_insn, perf_sample_srccode @@ -28,19 +28,11 @@ from perf_trace_context import perf_set_itrace_options, \ # perf script -s scripts/python/arm-cs-trace-disasm.py # Command line parsing. -option_list = [ - # formatting options for the bottom entry of the stack - make_option("-k", "--vmlinux", dest="vmlinux_name", - help="Set path to vmlinux file"), - make_option("-d", "--objdump", dest="objdump_name", - help="Set path to objdump executable file"), - make_option("-v", "--verbose", dest="verbose", - action="store_true", default=False, - help="Enable debugging log") -] - -parser = OptionParser(option_list=option_list) -(options, args) = parser.parse_args() +args = argparse.ArgumentParser() +args.add_argument("-k", "--vmlinux", help="Set path to vmlinux file") +args.add_argument("-d", "--objdump", help="Set path to objdump executable file"), +args.add_argument("-v", "--verbose", action="store_true", help="Enable debugging log") +options = args.parse_args() # Initialize global dicts and regular expression disasm_cache = dict() @@ -65,8 +57,8 @@ def get_offset(perf_dict, field): def get_dso_file_path(dso_name, dso_build_id): if (dso_name == "[kernel.kallsyms]" or dso_name == "vmlinux"): - if (options.vmlinux_name): - return options.vmlinux_name; + if (options.vmlinux): + return options.vmlinux; else: return dso_name @@ -92,7 +84,7 @@ def read_disam(dso_fname, dso_start, start_addr, stop_addr): else: start_addr = start_addr - dso_start; stop_addr = stop_addr - dso_start; - disasm = [ options.objdump_name, "-d", "-z", + disasm = [ options.objdump, "-d", "-z", "--start-address="+format(start_addr,"#x"), "--stop-address="+format(stop_addr,"#x") ] disasm += [ dso_fname ] @@ -256,7 +248,7 @@ def process_event(param_dict): print("Stop address 0x%x is out of range [ 0x%x .. 0x%x ] for dso %s" % (stop_addr, int(dso_start), int(dso_end), dso)) return - if (options.objdump_name != None): + if (options.objdump != None): # It doesn't need to decrease virtual memory offset for disassembly # for kernel dso and executable file dso, so in this case we set # vm_start to zero.
optparse is deprecated and less flexible than argparse so update it. Signed-off-by: James Clark <james.clark@linaro.org> --- .../scripts/python/arm-cs-trace-disasm.py | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-)