Add coverpoint declaration only if referenced by map

Signed-off-by: Ryszard Rozak <[email protected]>
antmicro · Jan 14, 2025 · 7c36ed9 · 7c36ed9
1 parent 1ec294f
commit 7c36ed9
Showing 1 changed file with 31 additions and 26 deletions.
diff --git a/src/V3EmitCFunc.h b/src/V3EmitCFunc.h
@@ -607,32 +607,37 @@ class EmitCFunc VL_NOT_FINAL : public EmitCConstInit {
         iterateChildrenConst(nodep);
     }
     void visit(AstCoverDecl* nodep) override {
-        putns(nodep, "vlSelf->__vlCoverInsert(");  // As Declared in emitCoverageDecl
-        puts("&(vlSymsp->__Vcoverage[");
-        puts(cvtToStr(nodep->dataDeclThisp()->binNum()));
-        puts("])");
-        // If this isn't the first instantiation of this module under this
-        // design, don't really count the bucket, and rely on verilator_cov to
-        // aggregate counts.  This is because Verilator combines all
-        // hierarchies itself, and if verilator_cov also did it, you'd end up
-        // with (number-of-instant) times too many counts in this bin.
-        puts(", first");  // Enable, passed from __Vconfigure parameter
-        puts(", ");
-        putsQuoted(protect(nodep->fileline()->filename()));
-        puts(", ");
-        puts(cvtToStr(nodep->fileline()->lineno()));
-        puts(", ");
-        puts(cvtToStr(nodep->offset() + nodep->fileline()->firstColumn()));
-        puts(", ");
-        putsQuoted((!nodep->hier().empty() ? "." : "")
-                   + protectWordsIf(nodep->hier(), nodep->protect()));
-        puts(", ");
-        putsQuoted(protectWordsIf(nodep->page(), nodep->protect()));
-        puts(", ");
-        putsQuoted(protectWordsIf(nodep->comment(), nodep->protect()));
-        puts(", ");
-        putsQuoted(nodep->linescov());
-        puts(");\n");
+        std::string key = nodep->modName() + nodep->varName() + cvtToStr(nodep->index());
+        if (nodep->varName() == "" || m_indices.find(key) == m_indices.end()
+            || m_indices[key] == nodep->dataDeclThisp()->binNum()) {
+            if (nodep->varName() != "") { m_indices[key] = nodep->dataDeclThisp()->binNum(); }
+            putns(nodep, "vlSelf->__vlCoverInsert(");  // As Declared in emitCoverageDecl
+            puts("&(vlSymsp->__Vcoverage[");
+            puts(cvtToStr(nodep->dataDeclThisp()->binNum()));
+            puts("])");
+            // If this isn't the first instantiation of this module under this
+            // design, don't really count the bucket, and rely on verilator_cov to
+            // aggregate counts.  This is because Verilator combines all
+            // hierarchies itself, and if verilator_cov also did it, you'd end up
+            // with (number-of-instant) times too many counts in this bin.
+            puts(", first");  // Enable, passed from __Vconfigure parameter
+            puts(", ");
+            putsQuoted(protect(nodep->fileline()->filename()));
+            puts(", ");
+            puts(cvtToStr(nodep->fileline()->lineno()));
+            puts(", ");
+            puts(cvtToStr(nodep->offset() + nodep->fileline()->firstColumn()));
+            puts(", ");
+            putsQuoted((!nodep->hier().empty() ? "." : "")
+                       + protectWordsIf(nodep->hier(), nodep->protect()));
+            puts(", ");
+            putsQuoted(protectWordsIf(nodep->page(), nodep->protect()));
+            puts(", ");
+            putsQuoted(protectWordsIf(nodep->comment(), nodep->protect()));
+            puts(", ");
+            putsQuoted(nodep->linescov());
+            puts(");\n");
+        }
     }
     void visit(AstCoverInc* nodep) override {
         int binNum;