[nix] make trace and cover orthogonal

chipsalliance · Oct 5, 2024 · ee14e96 · ee14e96
1 parent 2697bc9
commit ee14e96
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/nix/t1/conversion/sv-to-vcs-simulator.nix b/nix/t1/conversion/sv-to-vcs-simulator.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   # require license
   __noChroot = true;
   dontPatchELF = true;
+  enableCover = !enableTrace;
 
   src = rtl;
 
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
     "-timescale=1ns/1ps"
     "-file"
     "filelist.f"
+  ]
+  ++ lib.optionals (enableCover) [
     "-cm"
     "line+cond+fsm+tgl+branch+assert"
     "-cm_dir"
@@ -69,16 +72,21 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin $out/lib
     cp $mainProgram $out/lib
     cp -r $mainProgram.daidir $out/lib
-    cp -r ./cm.vdb $out/lib
+    ${lib.optionalString enableCover ''
+      cp -r ./cm.vdb $out/lib 
+    ''}
 
     # We need to carefully handle string escape here, so don't use makeWrapper
     tee $out/bin/$mainProgram <<EOF
     #!${bash}/bin/bash
     export LD_LIBRARY_PATH="$out/lib/$mainProgram.daidir:\$LD_LIBRARY_PATH"
     _argv="\$@"
-    cp -r $out/lib/cm.vdb ./cm.vdb
-    chmod +w -R ./cm.vdb
-    ${vcs-fhs-env}/bin/vcs-fhs-env -c "$out/lib/$mainProgram -cm_dir ./cm.vdb \$_argv"
+
+    ${lib.optionalString enableCover ''
+      cp -r $out/lib/cm.vdb ./cm.vdb
+      chmod +w -R ./cm.vdb
+    ''}
+    ${vcs-fhs-env}/bin/vcs-fhs-env -c "$out/lib/$mainProgram ${lib.optionalString enableCover ''-cm_dir ./cm.vdb''} \$_argv"
     EOF
     chmod +x $out/bin/$mainProgram
 

diff --git a/nix/t1/run/run-vcs-emu.nix b/nix/t1/run/run-vcs-emu.nix
@@ -6,6 +6,7 @@ stdenvNoCC.mkDerivation (finalAttr: {
   name = "${testCase.pname}-vcs-result" + (lib.optionalString emulator.enableTrace "-trace");
   nativeBuildInputs = [ zstd jq ];
   __noChroot = true;
+  enableCover = !emulator.enableTrace;
 
   passthru.caseName = testCase.pname;
 
@@ -15,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttr: {
     emuDriverArgsArray=(
       "+t1_elf_file=${testCase}/bin/${testCase.pname}.elf"
       ${lib.optionalString emulator.enableTrace "+t1_wave_path=${testCase.pname}.fsdb"}
-      "-cm assert"
+      ${lib.optionalString enableCover "-cm assert"}
     )
     emuDriverArgs="''${emuDriverArgsArray[@]}"
     emuDriver="${emulator}/bin/${emulator.mainProgram}"
@@ -79,8 +80,10 @@ stdenvNoCC.mkDerivation (finalAttr: {
       mv perf.json $out/
     fi
 
-    cp -v cm.log "$out"
-    cp -vr cm.vdb "$out"
+    ${lib.optionalString enableCover ''
+      cp -v cm.log "$out"
+      cp -vr cm.vdb "$out"
+    ''}
 
     ${lib.optionalString emulator.enableTrace ''
       cp -v ${testCase.pname}.fsdb "$out"

diff --git a/script/emu/src/Main.scala b/script/emu/src/Main.scala
@@ -181,7 +181,7 @@ object Main:
       )
 
     val isTrace = finalEmuType.get.contains("-trace")
-    val isCover = isTrace
+    val isCover = !isTrace
 
     val finalConfig = tryRestoreFromCache("config", config)
     if finalConfig.isEmpty then