[nix] refactor whole test attribute under emulator

Signed-off-by: Avimitin <[email protected]>
chipsalliance · Aug 13, 2024 · 0d7f4e5 · 0d7f4e5
1 parent 7fbe2de
commit 0d7f4e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/script/ci/src/Main.scala b/script/ci/src/Main.scala
@@ -269,8 +269,8 @@ object Main:
         Logger.info("Fetching CI results")
         val resultAttr = emuType.toLowerCase() match
           case "verilator" =>
-            s".#t1.$config.ip.cases._allEmuResult"
-          case "vcs" => s".#t1.$config.ip.cases._allVCSEmuResult"
+            s".#t1.$config.ip.verilator-emu.cases._allEmuResult"
+          case "vcs" => s".#t1.$config.ip.cases.vcs-emu._allVCSEmuResult"
           case _     => Logger.fatal(s"Invalid test type ${emuType}")
         val emuResultPath = os.Path(nixResolvePath(
           resultAttr,

diff --git a/t1rocketemu/nix/rtl.nix b/t1rocketemu/nix/rtl.nix
@@ -22,5 +22,8 @@ stdenvNoCC.mkDerivation {
     mkdir -p $out
 
     firtool ${mlirbc} ${mfcArgs} -o $out
+    echo "Fixing generated filelist.f"
+    cp $out/filelist.f original.f
+    cat $out/firrtl_black_box_resource_files.f original.f > $out/filelist.f
   '';
 }
diff --git a/t1rocketemu/nix/vcs.nix b/t1rocketemu/nix/vcs.nix
@@ -2,6 +2,7 @@
 , bash
 , stdenv
 , rtl
+, rtlDesignMetadata
 , callPackage
 , vcs-dpi-lib
 , vcs-fhs-env
@@ -40,7 +41,7 @@ let
 
     passthru = {
       inherit (vcs-dpi-lib) enable-trace;
-      inherit vcs-fhs-env;
+      inherit vcs-fhs-env rtlDesignMetadata;
 
       cases = callPackage ../../tests {
         configName = "t1rocket";