[difftest] refactor offline to offline_t1 to reduce spike_rs reuse

chipsalliance · Sep 8, 2024 · efd88e7 · efd88e7
1 parent d53f661
commit efd88e7
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/difftest/Cargo.lock b/difftest/Cargo.lock
diff --git a/difftest/Cargo.toml b/difftest/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = [
     "test_common",
     "spike_rs",
-    "offline",
+    "offline_t1",
     "dpi_t1",
     "dpi_t1rocket",
     "dpi_common",

diff --git a/difftest/default.nix b/difftest/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     root = ./.;
     fileset = unions [
       ./spike_rs
-      ./offline
+      ./offline_t1
       ./dpi_common
       ./dpi_t1
       ./dpi_t1rocket

diff --git a/difftest/offline-checker.nix → difftest/offline-checker-t1.nix b/difftest/offline-checker.nix → difftest/offline-checker-t1.nix
@@ -6,12 +6,12 @@
 }:
 
 rustPlatform.buildRustPackage {
-  name = "offline-checker";
+  name = "offline-checker-t1";
   src = with lib.fileset; toSource {
     root = ./.;
     fileset = unions [
       ./spike_rs
-      ./offline
+      ./offline_t1
       ./dpi_common
       ./dpi_t1
       ./dpi_t1rocket
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
   };
 
   buildFeatures = [ ];
-  buildAndTestSubdir = "./offline";
+  buildAndTestSubdir = "./offline_t1";
 
   env = {
     SPIKE_LIB_DIR = "${libspike}/lib";

diff --git a/difftest/offline/Cargo.toml → difftest/offline_t1/Cargo.toml b/difftest/offline/Cargo.toml → difftest/offline_t1/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "offline"
+name = "offline_t1"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/difftest/offline/src/difftest.rs → difftest/offline_t1/src/difftest.rs b/difftest/offline/src/difftest.rs → difftest/offline_t1/src/difftest.rs
diff --git a/difftest/offline/src/dut.rs → difftest/offline_t1/src/dut.rs b/difftest/offline/src/dut.rs → difftest/offline_t1/src/dut.rs
diff --git a/difftest/offline/src/json_events.rs → difftest/offline_t1/src/json_events.rs b/difftest/offline/src/json_events.rs → difftest/offline_t1/src/json_events.rs
diff --git a/difftest/offline/src/main.rs → difftest/offline_t1/src/main.rs b/difftest/offline/src/main.rs → difftest/offline_t1/src/main.rs
diff --git a/nix/t1/run/run-vcs-emu.nix b/nix/t1/run/run-vcs-emu.nix
@@ -59,8 +59,8 @@ stdenvNoCC.mkDerivation (finalAttr: {
       "ERROR"
     )
     offlineCheckArgs="''${offlineCheckArgsArray[@]}"
-    echo -e "[nix] running offline check: \033[0;34m${emulator}/bin/offline $offlineCheckArgs\033[0m"
-    "${offline-checker}/bin/offline" $offlineCheckArgs &> >(tee $out/offline-check-journal)
+    echo -e "[nix] running offline check: \033[0;34m${emulator}/bin/offline_t1 $offlineCheckArgs\033[0m"
+    "${offline-checker}/bin/offline_t1" $offlineCheckArgs &> >(tee $out/offline-check-journal)
 
     printf "$?" > $out/offline-check-status
     if [ "$(cat $out/offline-check-status)" != "0" ]; then

diff --git a/nix/t1/run/run-verilator-emu.nix b/nix/t1/run/run-verilator-emu.nix
@@ -56,8 +56,8 @@ stdenvNoCC.mkDerivation (finalAttr: {
       "info"
     )
     offlineCheckArgs="''${offlineCheckArgsArray[@]}"
-    echo -e "[nix] running offline check: \033[0;34m${offline-checker}/bin/offline $offlineCheckArgs\033[0m"
-    "${offline-checker}/bin/offline" $offlineCheckArgs &> $out/offline-check-journal
+    echo -e "[nix] running offline check: \033[0;34m${offline-checker}/bin/offline_t1 $offlineCheckArgs\033[0m"
+    "${offline-checker}/bin/offline_t1" $offlineCheckArgs &> $out/offline-check-journal
 
     printf "$?" > $out/offline-check-status
     if [ "$(cat $out/offline-check-status)" != "0" ]; then

diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix
@@ -150,7 +150,7 @@ lib.mapAttrs
         vcsLinkLibs = [ "${ipScope.vcs-dpi-lib-trace}/lib/libdpi_t1.a" ];
       };
 
-      offline-checker = ipScope.callPackage ../../difftest/offline-checker.nix { };
+      offline-checker = ipScope.callPackage ../../difftest/offline-checker-t1.nix { };
 
       run = ipScope.callPackage ./run { };
     }); # end of ipScope

diff --git a/script/emu/src/Main.scala b/script/emu/src/Main.scala
@@ -312,7 +312,7 @@ object Main:
 
     val offlineChecker = os.Path(
       resolveNixPath(s".#t1.${finalConfig}.ip.offline-checker")
-    ) / "bin" / "offline"
+    ) / "bin" / "offline_t1"
 
     val elfFile =
       if caseAttr.isDefined then resolveTestElfPath(finalConfig, caseAttr.get).toString