[difftest] suffix all dpi module with -emu

Signed-off-by: Avimitin <[email protected]>
chipsalliance · Oct 14, 2024 · 0fb34e3 · 0fb34e3
1 parent 59047d8
commit 0fb34e3
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 22 deletions.
diff --git a/difftest/Cargo.toml b/difftest/Cargo.toml
@@ -2,10 +2,10 @@
 resolver = "2"
 members = [
     "spike_rs",
-    "offline_t1",
-    "offline_t1rocket",
-    "dpi_t1",
-    "dpi_t1rocket",
+    "offline_t1emu",
+    "offline_t1rocketemu",
+    "dpi_t1emu",
+    "dpi_t1rocketemu",
     "dpi_common",
 ]
 exclude = [

diff --git a/difftest/default.nix b/difftest/default.nix
@@ -13,7 +13,7 @@
 }:
 
 assert let
-  available = [ "dpi_t1" "dpi_t1rocket" "offline_t1" "offline_t1rocket" ];
+  available = [ "dpi_t1emu" "dpi_t1rocketemu" "offline_t1emu" "offline_t1rocketemu" ];
 in
 lib.assertMsg (lib.elem moduleType available) "emuType is not in ${lib.concatStringsSep ", " available}";
 # if emuType is empty, then moduleType must be offline-*, or user should give valid emuType
@@ -25,11 +25,11 @@ rustPlatform.buildRustPackage {
     root = ./.;
     fileset = unions [
       ./spike_rs
-      ./offline_t1
-      ./offline_t1rocket
+      ./offline_t1emu
+      ./offline_t1rocketemu
       ./dpi_common
-      ./dpi_t1
-      ./dpi_t1rocket
+      ./dpi_t1emu
+      ./dpi_t1rocketemu
       ./Cargo.lock
       ./Cargo.toml
       ./.rustfmt.toml

diff --git a/difftest/dpi_t1/Cargo.toml → difftest/dpi_t1emu/Cargo.toml b/difftest/dpi_t1/Cargo.toml → difftest/dpi_t1emu/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dpi_t1"
+name = "dpi_t1emu"
 edition = "2021"
 version.workspace = true
 

diff --git a/difftest/dpi_t1/src/dpi.rs → difftest/dpi_t1emu/src/dpi.rs b/difftest/dpi_t1/src/dpi.rs → difftest/dpi_t1emu/src/dpi.rs
diff --git a/difftest/dpi_t1/src/drive.rs → difftest/dpi_t1emu/src/drive.rs b/difftest/dpi_t1/src/drive.rs → difftest/dpi_t1emu/src/drive.rs
diff --git a/difftest/dpi_t1/src/lib.rs → difftest/dpi_t1emu/src/lib.rs b/difftest/dpi_t1/src/lib.rs → difftest/dpi_t1emu/src/lib.rs
diff --git a/difftest/dpi_t1rocket/Cargo.toml → difftest/dpi_t1rocketemu/Cargo.toml b/difftest/dpi_t1rocket/Cargo.toml → difftest/dpi_t1rocketemu/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dpi_t1rocket"
+name = "dpi_t1rocketemu"
 edition = "2021"
 version.workspace = true
 

diff --git a/difftest/dpi_t1rocket/src/dpi.rs → difftest/dpi_t1rocketemu/src/dpi.rs b/difftest/dpi_t1rocket/src/dpi.rs → difftest/dpi_t1rocketemu/src/dpi.rs
diff --git a/difftest/dpi_t1rocket/src/drive.rs → difftest/dpi_t1rocketemu/src/drive.rs b/difftest/dpi_t1rocket/src/drive.rs → difftest/dpi_t1rocketemu/src/drive.rs
diff --git a/difftest/dpi_t1rocket/src/lib.rs → difftest/dpi_t1rocketemu/src/lib.rs b/difftest/dpi_t1rocket/src/lib.rs → difftest/dpi_t1rocketemu/src/lib.rs
diff --git a/difftest/offline_t1/Cargo.toml → difftest/offline_t1emu/Cargo.toml b/difftest/offline_t1/Cargo.toml → difftest/offline_t1emu/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "offline_t1"
+name = "offline_t1emu"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/difftest/offline_t1/src/difftest.rs → difftest/offline_t1emu/src/difftest.rs b/difftest/offline_t1/src/difftest.rs → difftest/offline_t1emu/src/difftest.rs
diff --git a/difftest/offline_t1/src/dut.rs → difftest/offline_t1emu/src/dut.rs b/difftest/offline_t1/src/dut.rs → difftest/offline_t1emu/src/dut.rs
diff --git a/difftest/offline_t1/src/json_events.rs → difftest/offline_t1emu/src/json_events.rs b/difftest/offline_t1/src/json_events.rs → difftest/offline_t1emu/src/json_events.rs
diff --git a/difftest/offline_t1/src/main.rs → difftest/offline_t1emu/src/main.rs b/difftest/offline_t1/src/main.rs → difftest/offline_t1emu/src/main.rs
diff --git a/difftest/offline_t1rocket/Cargo.toml → difftest/offline_t1rocketemu/Cargo.toml b/difftest/offline_t1rocket/Cargo.toml → difftest/offline_t1rocketemu/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "offline_t1rocket"
+name = "offline_t1rocketemu"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/difftest/offline_t1rocket/src/difftest.rs → difftest/offline_t1rocketemu/src/difftest.rs b/difftest/offline_t1rocket/src/difftest.rs → difftest/offline_t1rocketemu/src/difftest.rs
diff --git a/difftest/offline_t1rocket/src/dut.rs → difftest/offline_t1rocketemu/src/dut.rs b/difftest/offline_t1rocket/src/dut.rs → difftest/offline_t1rocketemu/src/dut.rs
diff --git a/difftest/offline_t1rocket/src/json_events.rs → ...st/offline_t1rocketemu/src/json_events.rs b/difftest/offline_t1rocket/src/json_events.rs → ...st/offline_t1rocketemu/src/json_events.rs
diff --git a/difftest/offline_t1rocket/src/main.rs → difftest/offline_t1rocketemu/src/main.rs b/difftest/offline_t1rocket/src/main.rs → difftest/offline_t1rocketemu/src/main.rs
diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix
@@ -72,25 +72,25 @@ lib.mapAttrs
         verilator-dpi-lib = mostInnerScope.makeDifftest {
           outputName = "${shortName}-verilator-dpi-lib";
           emuType = "verilator";
-          moduleType = "dpi_t1";
+          moduleType = "dpi_${shortName}";
         };
         verilator-dpi-lib-trace = mostInnerScope.makeDifftest {
           outputName = "${shortName}-verilator-trace-dpi-lib";
           emuType = "verilator";
-          moduleType = "dpi_t1";
+          moduleType = "dpi_${shortName}";
           enableTrace = true;
         };
 
         verilator-emu = t1Scope.sv-to-verilator-emulator {
           mainProgram = "${shortName}-verilated-simulator";
           rtl = mostInnerScope.rtl;
-          extraVerilatorArgs = [ "${mostInnerScope.verilator-dpi-lib}/lib/libdpi_t1.a" ];
+          extraVerilatorArgs = [ "${mostInnerScope.verilator-dpi-lib}/lib/libdpi_${shortName}.a" ];
         };
         verilator-emu-trace = t1Scope.sv-to-verilator-emulator {
           mainProgram = "${shortName}-verilated-trace-simulator";
           rtl = mostInnerScope.rtl;
           enableTrace = true;
-          extraVerilatorArgs = [ "${mostInnerScope.verilator-dpi-lib-trace}/lib/libdpi_t1.a" ];
+          extraVerilatorArgs = [ "${mostInnerScope.verilator-dpi-lib-trace}/lib/libdpi_${shortName}.a" ];
         };
 
         # ---------------------------------------------------------------------------------
@@ -99,30 +99,30 @@ lib.mapAttrs
         vcs-dpi-lib = mostInnerScope.makeDifftest {
           outputName = "${shortName}-vcs-dpi-lib";
           emuType = "vcs";
-          moduleType = "dpi_t1";
+          moduleType = "dpi_${shortName}";
         };
         vcs-dpi-lib-trace = mostInnerScope.makeDifftest {
           outputName = "${shortName}-vcs-dpi-trace-lib";
           emuType = "vcs";
           enableTrace = true;
-          moduleType = "dpi_t1";
+          moduleType = "dpi_${shortName}";
         };
 
         offline-checker = mostInnerScope.makeDifftest {
           outputName = "${shortName}-offline-checker";
-          moduleType = "offline_t1";
+          moduleType = "offline_${shortName}";
         };
 
         vcs-emu = t1Scope.sv-to-vcs-simulator {
           mainProgram = "${shortName}-vcs-simulator";
           rtl = mostInnerScope.rtl;
-          vcsLinkLibs = [ "${mostInnerScope.vcs-dpi-lib}/lib/libdpi_t1.a" ];
+          vcsLinkLibs = [ "${mostInnerScope.vcs-dpi-lib}/lib/libdpi_${shortName}.a" ];
         };
         vcs-emu-trace = t1Scope.sv-to-vcs-simulator {
           mainProgram = "${shortName}-vcs-trace-simulator";
           rtl = mostInnerScope.rtl;
           enableTrace = true;
-          vcsLinkLibs = [ "${mostInnerScope.vcs-dpi-lib-trace}/lib/libdpi_t1.a" ];
+          vcsLinkLibs = [ "${mostInnerScope.vcs-dpi-lib-trace}/lib/libdpi_${shortName}.a" ];
         };
 
         run = mostInnerScope.callPackage ./run { };