[nix] feed spike isa string from build system

Signed-off-by: Avimitin <[email protected]>
chipsalliance · Jul 27, 2024 · 353d75c · 353d75c
1 parent 85614a3
commit 353d75c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/difftest/default.nix b/difftest/default.nix
@@ -48,6 +48,10 @@ let
       VERILATED_LIB_DIR = "${verilated}/lib";
       SPIKE_LIB_DIR = "${libspike}/lib";
       SPIKE_INTERFACES_LIB_DIR = "${libspike_interfaces}/lib";
+      SPIKE_ISA_STRING =
+        "rv32gc" +
+        (builtins.concatStringsSep "_" elaborateConfig.parameter.extensions)
+        + "_Zvl${toString elaborateConfig.parameter.vLen}b";
       DESIGN_VLEN = elaborateConfig.parameter.vLen;
       DESIGN_DLEN = elaborateConfig.parameter.dLen;
     };

diff --git a/difftest/test_common/src/lib.rs b/difftest/test_common/src/lib.rs
@@ -32,7 +32,7 @@ pub struct CommonArgs {
   pub dlen: u32,
 
   /// ISA config
-  #[arg(long, default_value = "rv32gcv")]
+  #[arg(long, default_value = env!("SPIKE_ISA_STRING"))]
   pub set: String,
 }