Add Spike-specific extension option in cva6.py for issue #3249

verif/sim/cva6.py

@@ -150,6 +150,15 @@ def parse_iss_yaml(iss, iss_yaml, isa, target, setting_dir, debug_cmd, priv, spi
       if m: cmd = re.sub(r"\<xlen\>", m.group('xlen'), cmd)
       if iss == "ovpsim":
         cmd = re.sub(r"\<cfg_path\>", setting_dir, cmd)
+      elif iss == "spike":
+        spike_isa = isa
+        if spike_extension_list != ['']:
+          for i in spike_extension_list:
+            if i != "":
+              spike_isa += (f"_{i}")
+        cmd = re.sub(r"\<variant\>", spike_isa, cmd)
+        cmd = re.sub(r"\<priv\>", priv, cmd)
+        cmd = re.sub(r"\<target\>", target, cmd)
       elif iss == "whisper":
         if m:
           # TODO: Support u/s mode
@@ -793,6 +802,9 @@ def parse_args(cwd):
                       help="Choose additional z, s, x extensions")
   parser.add_argument("--spike_params", type=str, default="",
                       help="Spike command line parameters, run spike --help and spike --print-params to see more")
+  parser.add_argument("--spike_extension", type=str, default="",
+                      help="Additional ISA extensions enabled only for Spike simulation. "
+                           "Use this for extensions not yet supported by the GCC toolchain (e.g., svadu).")
   rsg = parser.add_argument_group('Random seeds',
                                   'To control random seeds, use at most one '
                                   'of the --start_seed, --seed or --seed_yaml '
@@ -967,6 +979,9 @@ def load_config(args, cwd):
     isa_extension_list.append("zicsr")
     isa_extension_list.append("zifencei")
 
+  global spike_extension_list
+  spike_extension_list = args.spike_extension.split(",")
+
   args.spike_params = get_full_spike_param_args(args.spike_params) if args.spike_params else ""