perf scripts python cs-etm: Update to use argparse
authorJames Clark <james.clark@linaro.org>
Mon, 16 Sep 2024 13:57:35 +0000 (14:57 +0100)
committerNamhyung Kim <namhyung@kernel.org>
Tue, 24 Sep 2024 18:47:07 +0000 (11:47 -0700)
optparse is deprecated and less flexible than argparse so update it.

Reviewed-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: James Clark <james.clark@linaro.org>
Tested-by: Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ruidong Tian <tianruidong@linux.alibaba.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Benjamin Gray <bgray@linux.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: coresight@lists.linaro.org
Cc: John Garry <john.g.garry@oracle.com>
Cc: scclevenger@os.amperecomputing.com
Link: https://lore.kernel.org/r/20240916135743.1490403-5-james.clark@linaro.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/scripts/python/arm-cs-trace-disasm.py

index 7aff02d84ffb3b763f44a4013285d7e9bba8e523..45f682a8b34d7ea45732ec2ae069a06992776e17 100755 (executable)
@@ -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.