[ISAC]: dump_yaml return string if outfile is None

- replace deprecated `ruamel.yaml.round_trip_dump` with `utils.dump_yaml`
- optimize dump_yaml in util to support dumping to string

Signed-off-by: MingZhu Yan <[email protected]>

Author: trdthg

riscv-isac/riscv_isac/coverage.py

@@ -675,7 +675,7 @@ def __add__(self, o):
 
 def pretty_print_yaml(yaml):
     res = ''''''
-    for line in ruamel.yaml.round_trip_dump(yaml, indent=5, block_seq_indent=3).splitlines(True):
+    for line in utils.dump_yaml(yaml).splitlines(True):
         res += line
     return res
 
@@ -1662,7 +1662,7 @@ def compute(trace_file, test_name, cgf, parser_name, decoder_name, detailed, xle
     rpt_str = gen_report(rcgf, detailed)
     logger.info('Writing out updated cgf : ' + test_name + '.cgf')
     dump_file = open(test_name+'.cgf', 'w')
-    dump_file.write(ruamel.yaml.round_trip_dump(rcgf, indent=5, block_seq_indent=3))
+    utils.dump_yaml(rcgf, test_name+'.cgf')
     dump_file.close()
 
     if sig_addrs:

riscv-isac/riscv_isac/utils.py

@@ -1,6 +1,7 @@
 # See LICENSE.incore for details
 
 """Common Utils """
+import io
 import logging
 import os
 import pathlib
@@ -46,8 +47,15 @@ def get_value_at_location(elf_path, location, bytes):
                 return int.from_bytes(value, byteorder='little', signed=False)
     return None
 
-def dump_yaml(foo, outfile):
-    yaml.dump(foo, outfile)
+def dump_yaml(foo, outfile = None):
+    """
+    Dump yaml to outfile. If outfile is None, dump to string.
+    """
+    if outfile is None:
+        buf = io.StringIO()
+        yaml.dump(foo, buf)
+        return buf.getvalue()
+    return yaml.dump(foo, outfile)
 
 def load_yaml_file(foo):
     try: