[ot] scripts/opentitan: pyot.py: add a quieter log option

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>

Author: rivos-eblot

docs/opentitan/pyot.md

@@ -10,8 +10,8 @@ usage: pyot.py [-h] [-D DELAY] [-i ICOUNT] [-L LOG_FILE] [-M VARIANT] [-N LOG]
                [-t TRACE] [-S FIRST_SOC] [-s] [-U] [-b file] [-c JSON] [-e]
                [-f RAW] [-g file] [-K] [-l file] [-O RAW] [-o VMEM] [-r ELF]
                [-w CSV] [-x file] [-X] [-F TEST] [-k SECONDS] [-z] [-R]
-               [-T FACTOR] [-Z] [-v] [-V] [-d] [--log-time] [--debug LOGGER]
-               [--info LOGGER] [--warn LOGGER]
+               [-T FACTOR] [-Z] [-v] [-V] [-d] [--quiet] [--log-time]
+               [--debug LOGGER] [--info LOGGER] [--warn LOGGER]
 
 OpenTitan QEMU unit test sequencer.
 
@@ -82,6 +82,7 @@ Extras:
   -v, --verbose         increase verbosity
   -V, --vcp-verbose     increase verbosity of QEMU virtual comm ports
   -d                    enable debug mode
+  --quiet               quiet logging: only be verbose on errors
   --log-time            show local time in log messages
   --debug LOGGER        assign debug level to logger(s)
   --info LOGGER         assign info level to logger(s)
@@ -182,6 +183,7 @@ This tool may be used in two ways, which can be combined:
 * `-V` / `--vcp-verbose` can be repeated to increase verbosity of the QEMU virtual comm ports
 * `-v` / `--verbose` can be repeated to increase verbosity of the script, mostly for debug purpose.
 * `-d` only useful to debug the script, reports any Python traceback to the standard error stream.
+* `--quiet` only emit verbose log traces if an error is detected
 * `--log-time` show local time before each logged message
 * `--debug` enable the debug level for the selected logger, may be repeated
 * `--info` enable the info level for the selected logger, may be repeated

scripts/opentitan/pyot.py

@@ -288,8 +288,9 @@ def trig_match(bline):
             vcplogname = 'pyot.vcp'
             while connect_map:
                 if now() > timeout:
-                    raise TimeoutError(f'Cannot connect to QEMU VCPs '
-                                       f'{", ".join(connect_map)}')
+                    minfo = ', '.join(f'{d} @ {r[0]}:{r[1]}'
+                                      for d, r in connect_map.items())
+                    raise TimeoutError(f'Cannot connect to QEMU VCPs: {minfo}')
                 connected = []
                 for vcpid, (host, port) in connect_map.items():
                     try:
@@ -1778,7 +1779,7 @@ def main():
         exe.add_argument('-F', '--filter', metavar='TEST', action='append',
                          help='run tests with matching filter, prefix with "!" '
                               'to exclude matching tests')
-        exe.add_argument('-k', '--timeout', metavar='SECONDS', type=int,
+        exe.add_argument('-k', '--timeout', metavar='SECONDS', type=float,
                          help=f'exit after the specified seconds '
                               f'(default: {DEFAULT_TIMEOUT} secs)')
         exe.add_argument('-z', '--list', action='store_true',
@@ -1797,6 +1798,8 @@ def main():
                            help='increase verbosity of QEMU virtual comm ports')
         extra.add_argument('-d', action='store_true',
                            help='enable debug mode')
+        extra.add_argument('--quiet', action='store_true',
+                           help='quiet logging: only be verbose on errors')
         extra.add_argument('--log-time', action='store_true',
                            help='show local time in log messages')
         extra.add_argument('--debug', action='append', metavar='LOGGER',
@@ -1826,8 +1829,9 @@ def main():
         log = configure_loggers(args.verbose, 'pyot',
                                 args.vcp_verbose or 0,
                                 'pyot.vcp', name_width=16,
-                                ms=args.log_time, debug=args.debug,
-                                info=args.info, warning=args.warn)[0]
+                                ms=args.log_time, quiet=args.quiet,
+                                debug=args.debug, info=args.info,
+                                warning=args.warn)[0]
 
         qfm = QEMUFileManager(args.keep_tmp)
         qfm.set_qemu_src_dir(qemu_dir)