[nix] use vcs rtlink in all cases

chipsalliance · Feb 25, 2025 · 84134cf · 84134cf
1 parent 0dd0af8
commit 84134cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/nix/t1/run/default.nix b/nix/t1/run/default.nix
@@ -5,7 +5,6 @@
 , verilator-emu
 , verilator-emu-trace
 , vcs-emu
-, vcs-emu-rtlink
 , vcs-emu-cover
 , vcs-emu-trace
 , vcs-dpi-lib
@@ -44,7 +43,7 @@ let
 
             vcs-emu = runEmu {
               inherit testCase;
-              emulator = vcs-emu-rtlink;
+              emulator = vcs-emu;
             };
 
             vcs-emu-trace = runEmu {
@@ -73,7 +72,7 @@ let
 
             vcs-prof-vcd = runFsdb2vcd (runEmu {
               inherit testCase;
-              emulator = vcs-emu-rtlink;
+              emulator = vcs-emu;
               emuExtraArgs = {
                 vcsDpiLib = vcs-dpi-lib;
               };

diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix
@@ -140,17 +140,19 @@ forEachTop (topName: generator: self: {
 
   inherit (t1Scope) sim-checker;
 
+  # We do not use vcs-emu-static every day,
+  # but we may switch back to static once rtLink breaks
+  vcs-emu-static = self.vcs-emu.override {
+    mainProgram = "${topName}-vcs-simulator-static";
+    vcsLinkLibs = [ "${self.vcs-dpi-lib}/lib/libdpi_${topName}.a" ];
+    rtLinkDpiLib = null;
+  };
+
   vcs-emu = t1Scope.sv-to-vcs-simulator {
     mainProgram = "${topName}-vcs-simulator";
     topModule = "TestBench";
     rtl = self.rtl;
     vsrc = lib.filesystem.listFilesRecursive self.clean-vsrc.outPath;
-    vcsLinkLibs = [ "${self.vcs-dpi-lib}/lib/libdpi_${topName}.a" ];
-    rtLinkDpiLib = self.vcs-dpi-lib;
-  };
-  vcs-emu-rtlink = self.vcs-emu.override {
-    mainProgram = "${topName}-vcs-simulator-rtlink";
-    vcsLinkLibs = [ ];
     rtLinkDpiLib = self.vcs-dpi-lib;
   };
   vcs-emu-cover = self.vcs-emu.override {