From d33ad7600b8e62e1bba71ba534ee5cd34e7e2c7e Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 23 Nov 2014 22:00:00 -0500 Subject: [PATCH] Commentary. Cleanup stale SystemPerl references. --- bin/verilator | 11 +++++------ include/verilated_cov.h | 2 +- include/verilated_cov_key.h | 2 +- include/verilated_vcd_c.cpp | 2 +- include/verilated_vcd_c.h | 2 +- include/verilated_vcd_sc.cpp | 2 +- include/verilated_vcd_sc.h | 2 +- nodist/spdiff | 4 ++++ src/V3EmitC.cpp | 4 ++-- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/bin/verilator b/bin/verilator index 1e0475cf6..01c52fa45 100755 --- a/bin/verilator +++ b/bin/verilator @@ -1321,7 +1321,7 @@ your operating system (as an RPM), first you need to point to the kit: Now we run Verilator on our little example. - verilator -Wall --sp our.v + verilator -Wall --sc our.v We then can compile it @@ -1350,7 +1350,7 @@ And we get the same output as the C++ example: Really, you're better off using a Makefile to do all this for you. Then, when your source changes it will automatically run all of these steps. See -the test_sp directory in the distribution for an example. +the test_sc directory in the distribution for an example. =head1 BENCHMARKING & OPTIMIZATION @@ -3466,7 +3466,7 @@ Add the --trace switch to Verilator, and in your top level C sc_main code, include verilated_vcd_sc.h. Then call Verilated::traceEverOn(true). Then create a VerilatedVcdSc object as you would create a normal SystemC trace file. For an example, see the call to VerilatedVcdSc in the -test_sp/sc_main.cpp file of the distribution, and below. +test_sc/sc_main.cpp file of the distribution, and below. Alternatively you may use the C++ trace mechanism described in the previous question, however the timescale and timeprecision will not inherited from @@ -3518,8 +3518,7 @@ network disk. Network disks are generally far slower. =item How do I do coverage analysis? Verilator supports both block (line) coverage and user inserted functional -coverage. Both require the SystemPerl package to be installed but do not -require use of the SystemPerl output mode. +coverage. First, run verilator with the --coverage option. If you're using your own makefile, compile the model with the GCC flag -DVM_COVERAGE (if using @@ -3533,7 +3532,7 @@ Verilator_coverage reads the logs/coverage.pl file(s), and creates an annotated source code listing showing code coverage details. For an example, after running 'make test' in the Verilator distribution, -see the test_sp/logs/coverage_source directory. Grep for lines starting +see the test_sc/logs directory. Grep for lines starting with '%' to see what lines Verilator believes need more coverage. =item Where is the translate_off command? (How do I ignore a construct?) diff --git a/include/verilated_cov.h b/include/verilated_cov.h index 7a721b0bc..dac339d42 100644 --- a/include/verilated_cov.h +++ b/include/verilated_cov.h @@ -95,7 +95,7 @@ struct VlCovCvtToCStr { //============================================================================= // VerilatedCov -/// SystemPerl coverage global class +/// Verilator coverage global class //// /// Global class with methods affecting all coverage data. diff --git a/include/verilated_cov_key.h b/include/verilated_cov_key.h index d2bd8af96..3276a4a50 100644 --- a/include/verilated_cov_key.h +++ b/include/verilated_cov_key.h @@ -68,7 +68,7 @@ VLCOVGEN_ITEM("name=>'weight', short=>'w', group=>0, default=>undef, descr //============================================================================= // VerilatedCovKey -/// SystemPerl coverage global class +/// Verilator coverage global class //// /// Global class with methods affecting all coverage data. diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp index 8aa36e291..202e9cdb0 100644 --- a/include/verilated_vcd_c.cpp +++ b/include/verilated_vcd_c.cpp @@ -57,7 +57,7 @@ vector VerilatedVcd::s_vcdVecp; ///< List of all created traces // VerilatedVcdCallInfo /// Internal callback routines for each module being traced. //// -/// Each SystemPerl module that wishes to be traced registers a set of +/// Each module that wishes to be traced registers a set of /// callbacks stored in this class. When the trace file is being /// constructed, this class provides the callback routines to be executed. diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h index daf4c3b2f..228c7b2a9 100644 --- a/include/verilated_vcd_c.h +++ b/include/verilated_vcd_c.h @@ -395,7 +395,7 @@ public: /// Create a VCD dump file in C standalone (no SystemC) simulations. class VerilatedVcdC { - VerilatedVcd m_sptrace; ///< SystemPerl trace file being created + VerilatedVcd m_sptrace; ///< Trace file being created public: // CONSTRUCTORS VerilatedVcdC() {} diff --git a/include/verilated_vcd_sc.cpp b/include/verilated_vcd_sc.cpp index a6935c4bb..14ea6a614 100644 --- a/include/verilated_vcd_sc.cpp +++ b/include/verilated_vcd_sc.cpp @@ -15,7 +15,7 @@ //============================================================================= /// /// \file -/// \brief SystemPerl Tracing in VCD Format +/// \brief Verilator tracing in VCD Format /// /// AUTHOR: Wilson Snyder /// diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h index 9ae96cd60..08a656751 100644 --- a/include/verilated_vcd_sc.h +++ b/include/verilated_vcd_sc.h @@ -15,7 +15,7 @@ //============================================================================= /// /// \file -/// \brief SystemPerl tracing in VCD format +/// \brief Verilator tracing in VCD format /// /// AUTHOR: Wilson Snyder /// diff --git a/nodist/spdiff b/nodist/spdiff index 4deed21f0..b7852561a 100755 --- a/nodist/spdiff +++ b/nodist/spdiff @@ -125,6 +125,10 @@ sub prep { $wholefile =~ s/\bSpTraceVcdSig\b/VerilatedVcdSig/g; $wholefile =~ s/\bSpScBvExposer/VlScBvExposer/g; # + $wholefile =~ s/Each SystemPerl module/Each module/g; + $wholefile =~ s/\bSystemPerl [Tt]race file being created/Trace file being created/g; + $wholefile =~ s/\bSystemPerl [Tt]rac/Verilator trac/g; # trace/tracing + # $wholefile =~ s/\b(uint[0-9]+_t)/vl$1/g; $wholefile =~ s/%ll/%" VL_PRI64 "/g; $wholefile =~ s/\(long long unsigned\)n/ n/g; # printQuad diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index 9f9fef375..53e359704 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -227,9 +227,9 @@ public: 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 SystemPerl to + // design, don't really count the bucket, and rely on verilator_cov to // aggregate counts. This is because Verilator combines all - // hiearchies itself, and if SystemPerl also did it, you'd end up + // hiearchies 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(nodep->fileline()->filename());