[nix] draft vcs linking

chipsalliance · Jul 21, 2024 · 7978a65 · 7978a65
1 parent 9c96cb3
commit 7978a65
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/difftest/default.nix b/difftest/default.nix
@@ -8,7 +8,10 @@
 , rust-bindgen
 
 , verilator
-, verilated
+, verilated ? null
+
+, vcs-lib ? null
+
 , cmake
 , clang-tools
 }:
@@ -35,6 +38,7 @@ let
     buildInputs = [
       spike_interfaces
       verilated
+      vcs-lib
     ];
 
     nativeBuildInputs = [
@@ -43,10 +47,12 @@ let
     ];
 
     buildFeatures = lib.optionals verilated.enable-trace [ "trace" ];
+    # buildFeatures = lib.optionals vcs-lib.enable-trace [ "trace" ];
 
     env = {
       VERILATED_INC_DIR = "${verilated}/include";
       VERILATED_LIB_DIR = "${verilated}/lib";
+      VCS_LIB_DIR = "${vcs-lib}/lib";
       DESIGN_VLEN = elaborateConfig.parameter.vLen;
       DESIGN_DLEN = elaborateConfig.parameter.dLen;
     };

diff --git a/difftest/online_vcs/build.rs b/difftest/online_vcs/build.rs
@@ -1,3 +1,5 @@
 fn main() {
+  let vcs_lib_dir = env::var("VCS_LIB_DIR").unwrap();
+  println!("cargo:rustc-link-search=native={}", Path::new(&vcs_lib_dir).join("lib").display());
   println!("cargo::rustc-link-lib=TestBench");
 }
diff --git a/nix/t1/default.nix b/nix/t1/default.nix
@@ -117,8 +117,8 @@ lib.makeScope newScope
           };
           vcs-emu-compiled = innerSelf.callPackage ./vcs.nix { rtl = vcs-emu-rtl; };
           vcs-emu-compiled-trace = innerSelf.callPackage ./vcs.nix { rtl = vcs-emu-rtl; enable-trace = true; };
-          vcs-emu = innerSelf.callPackage ../../difftest/default.nix { verilated = vcs-emu-compiled; };
-          vcs-emu-trace = innerSelf.callPackage ../../difftest/default.nix { verilated = vcs-emu-compiled-trace; };
+          vcs-emu = innerSelf.callPackage ../../difftest/default.nix { vcs-lib = vcs-emu-compiled; };
+          vcs-emu-trace = innerSelf.callPackage ../../difftest/default.nix { vcs-lib = vcs-emu-compiled-trace; };
         };
 
         subsystem = rec {