Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Fix some coverage lost when multithreaded, #2151.

Browse Source
This commit is contained in:
Wilson Snyder 2020-02-03 18:43:41 -05:00
parent 2ca9f73b31
commit f3ebdc40c6
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@ -168,10 +168,10 @@ The contributors that suggested a given feature are shown in []. Thanks!
* Verilator 4.020 2019-10-06 * Verilator 4.020 2019-10-06
*** Support $fseek, $ftell, $frewind, #1496. [Howard Su]
*** Add --public-flat-rw, #1511. [Stefan Wallentowitz] *** Add --public-flat-rw, #1511. [Stefan Wallentowitz]
*** Support $fseek, $ftell, $frewind, #1496. [Howard Su]
*** Support vpiModule, #1469. [Stefan Wallentowitz] *** Support vpiModule, #1469. [Stefan Wallentowitz]
**** Make Syms file honor --output-split-cfuncs, #1499. [Todd Strader] **** Make Syms file honor --output-split-cfuncs, #1499. [Todd Strader]
@ -192,6 +192,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
**** Fix case statements with strings, #1536. [Philipp Wagner] **** Fix case statements with strings, #1536. [Philipp Wagner]
**** Fix some coverage lost when multithreaded, #2151.
* Verilator 4.018 2019-08-29 * Verilator 4.018 2019-08-29

32
src/V3EmitC.cpp
View File

@ -382,10 +382,16 @@ public:
puts(");\n"); puts(");\n");
} }
virtual void visit(AstCoverInc* nodep) VL_OVERRIDE { virtual void visit(AstCoverInc* nodep) VL_OVERRIDE {
if (v3Global.opt.threads()) {
puts("vlSymsp->__Vcoverage[");
puts(cvtToStr(nodep->declp()->dataDeclThisp()->binNum()));
puts("].fetch_add(1, std::memory_order_relaxed);\n");
} else {
puts("++(vlSymsp->__Vcoverage["); puts("++(vlSymsp->__Vcoverage[");
puts(cvtToStr(nodep->declp()->dataDeclThisp()->binNum())); puts(cvtToStr(nodep->declp()->dataDeclThisp()->binNum()));
puts("]);\n"); puts("]);\n");
} }
}
virtual void visit(AstCReturn* nodep) VL_OVERRIDE { virtual void visit(AstCReturn* nodep) VL_OVERRIDE {
puts("return ("); puts("return (");
iterateAndNextNull(nodep->lhsp()); iterateAndNextNull(nodep->lhsp());
@ -1953,7 +1959,9 @@ void EmitCImp::emitCoverageDecl(AstNodeModule* modp) {
if (v3Global.opt.coverage()) { if (v3Global.opt.coverage()) {
ofp()->putsPrivate(true); ofp()->putsPrivate(true);
putsDecoration("// Coverage\n"); putsDecoration("// Coverage\n");
puts("void __vlCoverInsert(uint32_t* countp, bool enable, const char* filenamep, int lineno, int column,\n"); puts("void __vlCoverInsert(");
puts(v3Global.opt.threads() ? "std::atomic<uint32_t>" : "uint32_t");
puts("* countp, bool enable, const char* filenamep, int lineno, int column,\n");
puts( "const char* hierp, const char* pagep, const char* commentp);\n"); puts( "const char* hierp, const char* pagep, const char* commentp);\n");
} }
} }
@ -2068,14 +2076,22 @@ void EmitCImp::emitCoverageImp(AstNodeModule* modp) {
puts("\n// Coverage\n"); puts("\n// Coverage\n");
// Rather than putting out VL_COVER_INSERT calls directly, we do it via this function // Rather than putting out VL_COVER_INSERT calls directly, we do it via this function
// This gets around gcc slowness constructing all of the template arguments. // This gets around gcc slowness constructing all of the template arguments.
puts("void " + prefixNameProtect(m_modp) puts("void " + prefixNameProtect(m_modp) + "::__vlCoverInsert(");
+ "::__vlCoverInsert(uint32_t* countp, bool enable," puts(v3Global.opt.threads() ? "std::atomic<uint32_t>" : "uint32_t");
+ " const char* filenamep, int lineno, int column,\n"); puts("* countp, bool enable, const char* filenamep, int lineno, int column,\n");
puts( "const char* hierp, const char* pagep, const char* commentp) {\n"); puts( "const char* hierp, const char* pagep, const char* commentp) {\n");
puts( "static uint32_t fake_zero_count = 0;\n"); // static doesn't need save-restore as constant if (v3Global.opt.threads()) {
puts( "if (!enable) countp = &fake_zero_count;\n"); // Used for second++ instantiation of identical bin puts( "assert(sizeof(uint32_t) == sizeof(std::atomic<uint32_t>));\n");
puts( "*countp = 0;\n"); puts( "uint32_t* count32p = reinterpret_cast<uint32_t*>(countp);\n");
puts( "VL_COVER_INSERT(countp,"); } else {
puts( "uint32_t* count32p = countp;\n");
}
// static doesn't need save-restore as is constant
puts( "static uint32_t fake_zero_count = 0;\n");
// Used for second++ instantiation of identical bin
puts( "if (!enable) count32p = &fake_zero_count;\n");
puts( "*count32p = 0;\n");
puts("VL_COVER_INSERT(count32p,");
puts( " \"filename\",filenamep,"); puts( " \"filename\",filenamep,");
puts( " \"lineno\",lineno,"); puts( " \"lineno\",lineno,");
puts( " \"column\",column,\n"); puts( " \"column\",column,\n");

5
src/V3EmitCSyms.cpp
View File

@ -437,7 +437,10 @@ void EmitCSyms::emitSymHdr() {
if (m_coverBins) { if (m_coverBins) {
puts("\n// COVERAGE\n"); puts("\n// COVERAGE\n");
puts("uint32_t __Vcoverage["); puts(cvtToStr(m_coverBins)); puts("];\n"); puts(v3Global.opt.threads() ? "std::atomic<uint32_t>" : "uint32_t");
puts(" __Vcoverage[");
puts(cvtToStr(m_coverBins));
puts("];\n");
} }
if (!m_scopeNames.empty()) { // Scope names if (!m_scopeNames.empty()) { // Scope names