CMD: add tags to result metrics

Author: sipma

chb/app/AppResultFunctionMetrics.py

@@ -237,20 +237,21 @@ def metrics_to_string(
             self,
             shownocallees: bool = False,
             space: str = "   ",
-            annotations: List[str] = []) -> str:
+            tags: List[str] = [],
+            taglen: int = 0) -> str:
         callcount = ''
         name = ''
         unrc = ''
-        anns = ""
+        ftags = "".ljust(taglen)
         if shownocallees and (not self.has_name()):
             if self.call_count == 0:
                 callcount = ' (no callees)'
         if self.has_name():
             name = ' (' + self.name + ')'
         if self.unresolved_call_count > 0:
             unrc = str(self.unresolved_call_count)
-        if len(annotations) > 0:
-            anns = " [" + ", ".join(annotations) + "]"
+        if len(tags) > 0:
+            ftags = (" [" + ",".join(tags) + "]").ljust(taglen)
 
         return (str(self.faddr).ljust(10) + space
                 + '{:6.1f}'.format(self.espp) + space
@@ -259,4 +260,4 @@ def metrics_to_string(
                 + unrc.rjust(6) + space
                 + str(self.block_count).rjust(6) + space
                 + str(self.instruction_count).rjust(6) + space
-                + '{:8.3f}'.format(self.time) + name + callcount + anns)
+                + '{:8.3f}'.format(self.time) + ftags + name + callcount)

chb/app/CHVersion.py

@@ -1 +1 @@
-chbversion: str = "0.3.0-20250327"
+chbversion: str = "0.3.0-20250329"

chb/cmdline/chkx

@@ -613,8 +613,8 @@ def parse() -> argparse.Namespace:
         help=("json filename (without extension) to save opcode distribution "
               + "stats (for instructions within analyzed functions)"))
     resultsstats.add_argument(
-        "--annotationfile",
-        help="name of json file that has function annotations")
+        "--tagfile",
+        help="name of json file that has function tags")
     resultsstats.add_argument(
         "--loglevel", "-log",
         choices=UL.LogLevel.options(),

chb/cmdline/commandutil.py

@@ -619,7 +619,7 @@ def results_stats(args: argparse.Namespace) -> NoReturn:
     sortby: str = args.sortby
     timeshare: int = args.timeshare
     opcodes: str = args.opcodes
-    annotationfile: Optional[str] = args.annotationfile
+    tagfile: Optional[str] = args.tagfile
     loglevel: str = args.loglevel
     logfilename: Optional[str] = args.logfilename
     logfilemode: str = args.logfilemode
@@ -638,14 +638,21 @@ def results_stats(args: argparse.Namespace) -> NoReturn:
         mode=logfilemode,
         msg="results stats invoked")
 
-    annotations: Dict[str, List[str]] = {}
-    if annotationfile is not None:
-        with open(annotationfile, "r") as fp:
-            annotationdata = json.load(fp)
-        for (key, flist) in annotationdata["keys"].items():
+    tags: Dict[str, List[str]] = {}
+    if tagfile is not None:
+        with open(tagfile, "r") as fp:
+            tagdata = json.load(fp)
+        for (key, flist) in tagdata["keys"].items():
             for faddr in flist:
-                annotations.setdefault(faddr, [])
-                annotations[faddr].append(key)
+                tags.setdefault(faddr, [])
+                if not key in tags[faddr]:
+                    tags[faddr].append(key)
+
+    maxlen = 0
+    for (faddr, keys) in tags.items():
+        taglen = 4 + len(",".join(keys))
+        if taglen > maxlen:
+            maxlen = taglen
 
     xinfo = XI.XInfo()
     xinfo.load(path, xfile)
@@ -665,12 +672,14 @@ def results_stats(args: argparse.Namespace) -> NoReturn:
     else:
         sortkey = lambda f: int(f.faddr, 16)
     for f in sorted(stats.get_function_results(), key=sortkey):
-        if f.faddr in annotations:
-            fn_annotations = annotations[f.faddr]
+        if f.faddr in tags:
+            fn_tags = tags[f.faddr]
         else:
-            fn_annotations = []
+            fn_tags = []
+        if "hide" in fn_tags:
+            continue
         print(f.metrics_to_string(shownocallees=nocallees,
-                                  annotations=fn_annotations))
+                                  tags=fn_tags, taglen=maxlen))
 
     print(stats.disassembly_to_string())
     print(stats.analysis_to_string())