Allow for underscores and capital letters in ISA for ISS

Newer versions of Spike need the required bitmanip sub-extensions to be specified separately in the ISA string as _Zba_Zbb_Zbc_Zbc_Xbitmanip (where Xbitmanip comprises all sub-extensions not part of v.1.0.0 but remaining in draft v.0.9.4) instead of just b. Previously, run.py would print an error message when parsing such an ISA string but still call Spike with the correct arguments which is confusing. With this commit, run.py is modified to accept such ISA strings and not print the error message. Signed-off-by: Pirmin Vogel <[email protected]>
ctopal · Nov 26, 2021 · e6d82cc · e6d82cc
1 parent adb99ae
commit e6d82cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/run.py b/run.py
@@ -147,7 +147,7 @@ def parse_iss_yaml(iss, iss_yaml, isa, setting_dir, debug_cmd):
             cmd = re.sub("\<path_var\>",
                          get_env_var(entry['path_var'], debug_cmd=debug_cmd),
                          cmd)
-            m = re.search(r"rv(?P<xlen>[0-9]+?)(?P<variant>[a-z]+?)$", isa)
+            m = re.search(r"rv(?P<xlen>[0-9]+?)(?P<variant>[a-zA-Z_]+?)$", isa)
             if m:
                 cmd = re.sub("\<xlen\>", m.group('xlen'), cmd)
             else: