[tests] add coverage hierarchy file in the output of test target

chipsalliance · Dec 16, 2024 · c656b98 · c656b98
1 parent 81ed7eb
commit c656b98
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/t1/src/T1.scala b/t1/src/T1.scala
@@ -1046,7 +1046,7 @@ class T1(val parameter: T1Parameter)
       val coverMatch = BoolSequence(
         requestReg.valid && requestReg.bits.issue.instruction === BitPat("b" + instruction.encoding.toString)
       )
-      CoverProperty(coverMatch, label = Some(s"1_${instruction.name}"))
+      CoverProperty(coverMatch, label = Some(s"${instruction.name}"))
     }
 
     // // coverage for two instructions

diff --git a/tests/builder.nix b/tests/builder.nix
@@ -51,10 +51,10 @@ let
 
         mkdir -p $out/bin
         cp ${pname}.elf $out/bin
+        cp ${pname}.cover $out
 
         ${jqBin} --null-input \
           --arg name ${pname} \
-          --arg type ${casePrefix} \
           --arg elfPath "$out/bin/${pname}.elf" \
           '{ "name": $name, "elf": { "path": $elfPath } }' \
           > $out/${pname}.json

diff --git a/tests/coverage/mlir/hello.hier b/tests/coverage/mlir/hello.hier
diff --git a/tests/default.nix b/tests/default.nix
@@ -113,6 +113,7 @@ let
           mkdir -p $out/cases/${caseDrv.pname}
           cp ${caseDrv}/bin/${caseDrv.pname}.elf $out/cases/${caseDrv.pname}/
           cp ${caseDrv}/${caseDrv.pname}.json $out/configs/
+          cp ${caseDrv}/${caseDrv.pname}.cover $out/configs/
         '')
         allCases);
     in

diff --git a/tests/mlir/default.nix b/tests/mlir/default.nix
@@ -4,6 +4,7 @@
 , findAndBuild
 , getTestRequiredFeatures
 , t1main
+, jq
 }:
 
 let
@@ -54,6 +55,13 @@ let
           ${caseName}.c $pname.S ${t1main} \
           -o $pname.elf
 
+        if [ ! -f ${sourcePath}/${caseName}.json ]; then
+          echo "Error: ${sourcePath}/${caseName}.json not found" >&2
+        else
+          ${jq}/bin/jq -r '[.assert[] | "+assert " + .name] + [.tree[] | "+tree " + .name] + [.module[] | "+module " + .name] | .[]' \
+              ${sourcePath}/${caseName}.json > $pname.cover
+        fi
+
         runHook postBuild
       '';
 

diff --git a/tests/mlir/hello/hello.json b/tests/mlir/hello/hello.json
@@ -0,0 +1,15 @@
+{
+  "case": "mlir.hello",
+  "assert": [
+    {
+      "description": "vmv.v.i instruction covered",
+      "name": "vmv_v_i"
+    },
+    {
+      "description": "vmv.v.x instruction covered",
+      "name": "vmv_v_x"
+    }
+  ],
+  "tree": [],
+  "module": []
+}