Support set_time_unit/set_time_precision in C traces, msg2261.

2017-06-20 19:33:58 -04:00 · 2017-06-20 19:33:58 -04:00 · 6c87724af8
commit 6c87724af8
parent c7a5ff5e82
7 changed files with 1072 additions and 2 deletions
--- a/2
+++ b/2
@ -5,6 +5,8 @@ The contributors that suggested a given feature are shown in []. Thanks!

 * Verilator 3.905 devel

+***   Support set_time_unit/set_time_precision in C traces, msg2261.
+
 ***   Fix extract of packed array with non-zero LSB, bug1172. [James Pallister]

 ***   Fix shifts by more than 32-bit numbers, bug1174. [Clifford Wolf]
--- a/include/verilated_vcd_c.h
+++ b/include/verilated_vcd_c.h
@ -428,6 +428,15 @@ public:
    void dump (double timestamp) { dump((vluint64_t)timestamp); }
    void dump (vluint32_t timestamp) { dump((vluint64_t)timestamp); }
    void dump (int timestamp) { dump((vluint64_t)timestamp); }
+    /// Set time units (s/ms, defaults to ns)
+    /// See also VL_TIME_PRECISION, and VL_TIME_MULTIPLIER in verilated.h
+    void set_time_unit (const char* unit) { m_sptrace.set_time_unit(unit); }
+    void set_time_unit (const string& unit) { set_time_unit(unit.c_str()); }
+    /// Set time resolution (s/ms, defaults to ns)
+    /// See also VL_TIME_PRECISION, and VL_TIME_MULTIPLIER in verilated.h
+    void set_time_resolution (const char* unit) { m_sptrace.set_time_resolution(unit); }
+    void set_time_resolution (const string& unit) { set_time_resolution(unit.c_str()); }
+
    /// Internal class access
    inline VerilatedVcd* spTrace () { return &m_sptrace; };
 };
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@ -1463,9 +1463,12 @@ sub vcd_identical {
    if (!-r $fn2) { $self->error("File does not exist $fn2\n"); return 0; }
    {
 	# vcddiff to check transitions, if installed
-	my $out = `vcddiff --help`;
+	my $cmd = qq{vcddiff --help};
+	print "\t$cmd\n" if $::Debug;
+	my $out = `$cmd`;
 	if ($out !~ /Usage:/) { $self->skip("No vcddiff installed\n"); return 0; }
-	my $cmd = qq{vcddiff "$fn1" "$fn2"};
+
+	$cmd = qq{vcddiff "$fn1" "$fn2"};
 	print "\t$cmd\n" if $::Debug;
 	$out = `$cmd`;
 	if ($out ne '') {
--- a/test_regress/t/t_trace_timescale.cpp
+++ b/test_regress/t/t_trace_timescale.cpp
@ -0,0 +1,48 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+#include <verilated.h>
+#include <verilated_vcd_c.h>
+
+#if defined(T_TRACE_TIMESCALE)
+# include "Vt_trace_timescale.h"
+#else
+# error "Unknown test"
+#endif
+
+unsigned long long main_time = 0;
+double sc_time_stamp() {
+    return ((double)main_time) / VL_TIME_MULTIPLIER;
+}
+
+int main(int argc, char **argv, char **env) {
+    VM_PREFIX* top = new VM_PREFIX("top");
+
+    Verilated::debug(0);
+    Verilated::traceEverOn(true);
+
+    VerilatedVcdC* tfp = new VerilatedVcdC;
+    tfp->set_time_resolution("1ps");
+    tfp->set_time_unit("1ns");
+
+    top->trace(tfp,99);
+
+    tfp->open("obj_dir/t_trace_timescale/t_trace_timescale.vcd");
+
+    top->clk = 0;
+
+    while (main_time < 190*VL_TIME_MULTIPLIER) {
+	top->clk   = ~top->clk;
+	top->eval();
+	tfp->dump((unsigned int)(main_time));
+	main_time += VL_TIME_MULTIPLIER/2;
+    }
+    tfp->close();
+    top->final();
+    printf ("*-* All Finished *-*\n");
+    return 0;
+}
--- a/test_regress/t/t_trace_timescale.out
+++ b/test_regress/t/t_trace_timescale.out
@ -0,0 +1,965 @@
+$version Generated by VerilatedVcd $end
+$date Tue Jun 20 19:31:48 2017
+ $end
+$timescale   1ps $end
+
+ $scope module top $end
+  $var wire  1 $ clk $end
+  $scope module t $end
+   $var wire  1 $ clk $end
+   $var wire 32 # cyc [31:0] $end
+  $upscope $end
+ $upscope $end
+$enddefinitions $end
+
+
+#0
+b00000000000000000000000000000001 #
+1$
+#500
+0$
+#1000
+b00000000000000000000000000000010 #
+1$
+#1500
+0$
+#2000
+b00000000000000000000000000000011 #
+1$
+#2500
+0$
+#3000
+b00000000000000000000000000000100 #
+1$
+#3500
+0$
+#4000
+b00000000000000000000000000000101 #
+1$
+#4500
+0$
+#5000
+b00000000000000000000000000000110 #
+1$
+#5500
+0$
+#6000
+b00000000000000000000000000000111 #
+1$
+#6500
+0$
+#7000
+b00000000000000000000000000001000 #
+1$
+#7500
+0$
+#8000
+b00000000000000000000000000001001 #
+1$
+#8500
+0$
+#9000
+b00000000000000000000000000001010 #
+1$
+#9500
+0$
+#10000
+b00000000000000000000000000001011 #
+1$
+#10500
+0$
+#11000
+b00000000000000000000000000001100 #
+1$
+#11500
+0$
+#12000
+b00000000000000000000000000001101 #
+1$
+#12500
+0$
+#13000
+b00000000000000000000000000001110 #
+1$
+#13500
+0$
+#14000
+b00000000000000000000000000001111 #
+1$
+#14500
+0$
+#15000
+b00000000000000000000000000010000 #
+1$
+#15500
+0$
+#16000
+b00000000000000000000000000010001 #
+1$
+#16500
+0$
+#17000
+b00000000000000000000000000010010 #
+1$
+#17500
+0$
+#18000
+b00000000000000000000000000010011 #
+1$
+#18500
+0$
+#19000
+b00000000000000000000000000010100 #
+1$
+#19500
+0$
+#20000
+b00000000000000000000000000010101 #
+1$
+#20500
+0$
+#21000
+b00000000000000000000000000010110 #
+1$
+#21500
+0$
+#22000
+b00000000000000000000000000010111 #
+1$
+#22500
+0$
+#23000
+b00000000000000000000000000011000 #
+1$
+#23500
+0$
+#24000
+b00000000000000000000000000011001 #
+1$
+#24500
+0$
+#25000
+b00000000000000000000000000011010 #
+1$
+#25500
+0$
+#26000
+b00000000000000000000000000011011 #
+1$
+#26500
+0$
+#27000
+b00000000000000000000000000011100 #
+1$
+#27500
+0$
+#28000
+b00000000000000000000000000011101 #
+1$
+#28500
+0$
+#29000
+b00000000000000000000000000011110 #
+1$
+#29500
+0$
+#30000
+b00000000000000000000000000011111 #
+1$
+#30500
+0$
+#31000
+b00000000000000000000000000100000 #
+1$
+#31500
+0$
+#32000
+b00000000000000000000000000100001 #
+1$
+#32500
+0$
+#33000
+b00000000000000000000000000100010 #
+1$
+#33500
+0$
+#34000
+b00000000000000000000000000100011 #
+1$
+#34500
+0$
+#35000
+b00000000000000000000000000100100 #
+1$
+#35500
+0$
+#36000
+b00000000000000000000000000100101 #
+1$
+#36500
+0$
+#37000
+b00000000000000000000000000100110 #
+1$
+#37500
+0$
+#38000
+b00000000000000000000000000100111 #
+1$
+#38500
+0$
+#39000
+b00000000000000000000000000101000 #
+1$
+#39500
+0$
+#40000
+b00000000000000000000000000101001 #
+1$
+#40500
+0$
+#41000
+b00000000000000000000000000101010 #
+1$
+#41500
+0$
+#42000
+b00000000000000000000000000101011 #
+1$
+#42500
+0$
+#43000
+b00000000000000000000000000101100 #
+1$
+#43500
+0$
+#44000
+b00000000000000000000000000101101 #
+1$
+#44500
+0$
+#45000
+b00000000000000000000000000101110 #
+1$
+#45500
+0$
+#46000
+b00000000000000000000000000101111 #
+1$
+#46500
+0$
+#47000
+b00000000000000000000000000110000 #
+1$
+#47500
+0$
+#48000
+b00000000000000000000000000110001 #
+1$
+#48500
+0$
+#49000
+b00000000000000000000000000110010 #
+1$
+#49500
+0$
+#50000
+b00000000000000000000000000110011 #
+1$
+#50500
+0$
+#51000
+b00000000000000000000000000110100 #
+1$
+#51500
+0$
+#52000
+b00000000000000000000000000110101 #
+1$
+#52500
+0$
+#53000
+b00000000000000000000000000110110 #
+1$
+#53500
+0$
+#54000
+b00000000000000000000000000110111 #
+1$
+#54500
+0$
+#55000
+b00000000000000000000000000111000 #
+1$
+#55500
+0$
+#56000
+b00000000000000000000000000111001 #
+1$
+#56500
+0$
+#57000
+b00000000000000000000000000111010 #
+1$
+#57500
+0$
+#58000
+b00000000000000000000000000111011 #
+1$
+#58500
+0$
+#59000
+b00000000000000000000000000111100 #
+1$
+#59500
+0$
+#60000
+b00000000000000000000000000111101 #
+1$
+#60500
+0$
+#61000
+b00000000000000000000000000111110 #
+1$
+#61500
+0$
+#62000
+b00000000000000000000000000111111 #
+1$
+#62500
+0$
+#63000
+b00000000000000000000000001000000 #
+1$
+#63500
+0$
+#64000
+b00000000000000000000000001000001 #
+1$
+#64500
+0$
+#65000
+b00000000000000000000000001000010 #
+1$
+#65500
+0$
+#66000
+b00000000000000000000000001000011 #
+1$
+#66500
+0$
+#67000
+b00000000000000000000000001000100 #
+1$
+#67500
+0$
+#68000
+b00000000000000000000000001000101 #
+1$
+#68500
+0$
+#69000
+b00000000000000000000000001000110 #
+1$
+#69500
+0$
+#70000
+b00000000000000000000000001000111 #
+1$
+#70500
+0$
+#71000
+b00000000000000000000000001001000 #
+1$
+#71500
+0$
+#72000
+b00000000000000000000000001001001 #
+1$
+#72500
+0$
+#73000
+b00000000000000000000000001001010 #
+1$
+#73500
+0$
+#74000
+b00000000000000000000000001001011 #
+1$
+#74500
+0$
+#75000
+b00000000000000000000000001001100 #
+1$
+#75500
+0$
+#76000
+b00000000000000000000000001001101 #
+1$
+#76500
+0$
+#77000
+b00000000000000000000000001001110 #
+1$
+#77500
+0$
+#78000
+b00000000000000000000000001001111 #
+1$
+#78500
+0$
+#79000
+b00000000000000000000000001010000 #
+1$
+#79500
+0$
+#80000
+b00000000000000000000000001010001 #
+1$
+#80500
+0$
+#81000
+b00000000000000000000000001010010 #
+1$
+#81500
+0$
+#82000
+b00000000000000000000000001010011 #
+1$
+#82500
+0$
+#83000
+b00000000000000000000000001010100 #
+1$
+#83500
+0$
+#84000
+b00000000000000000000000001010101 #
+1$
+#84500
+0$
+#85000
+b00000000000000000000000001010110 #
+1$
+#85500
+0$
+#86000
+b00000000000000000000000001010111 #
+1$
+#86500
+0$
+#87000
+b00000000000000000000000001011000 #
+1$
+#87500
+0$
+#88000
+b00000000000000000000000001011001 #
+1$
+#88500
+0$
+#89000
+b00000000000000000000000001011010 #
+1$
+#89500
+0$
+#90000
+b00000000000000000000000001011011 #
+1$
+#90500
+0$
+#91000
+b00000000000000000000000001011100 #
+1$
+#91500
+0$
+#92000
+b00000000000000000000000001011101 #
+1$
+#92500
+0$
+#93000
+b00000000000000000000000001011110 #
+1$
+#93500
+0$
+#94000
+b00000000000000000000000001011111 #
+1$
+#94500
+0$
+#95000
+b00000000000000000000000001100000 #
+1$
+#95500
+0$
+#96000
+b00000000000000000000000001100001 #
+1$
+#96500
+0$
+#97000
+b00000000000000000000000001100010 #
+1$
+#97500
+0$
+#98000
+b00000000000000000000000001100011 #
+1$
+#98500
+0$
+#99000
+b00000000000000000000000001100100 #
+1$
+#99500
+0$
+#100000
+b00000000000000000000000001100101 #
+1$
+#100500
+0$
+#101000
+b00000000000000000000000001100110 #
+1$
+#101500
+0$
+#102000
+b00000000000000000000000001100111 #
+1$
+#102500
+0$
+#103000
+b00000000000000000000000001101000 #
+1$
+#103500
+0$
+#104000
+b00000000000000000000000001101001 #
+1$
+#104500
+0$
+#105000
+b00000000000000000000000001101010 #
+1$
+#105500
+0$
+#106000
+b00000000000000000000000001101011 #
+1$
+#106500
+0$
+#107000
+b00000000000000000000000001101100 #
+1$
+#107500
+0$
+#108000
+b00000000000000000000000001101101 #
+1$
+#108500
+0$
+#109000
+b00000000000000000000000001101110 #
+1$
+#109500
+0$
+#110000
+b00000000000000000000000001101111 #
+1$
+#110500
+0$
+#111000
+b00000000000000000000000001110000 #
+1$
+#111500
+0$
+#112000
+b00000000000000000000000001110001 #
+1$
+#112500
+0$
+#113000
+b00000000000000000000000001110010 #
+1$
+#113500
+0$
+#114000
+b00000000000000000000000001110011 #
+1$
+#114500
+0$
+#115000
+b00000000000000000000000001110100 #
+1$
+#115500
+0$
+#116000
+b00000000000000000000000001110101 #
+1$
+#116500
+0$
+#117000
+b00000000000000000000000001110110 #
+1$
+#117500
+0$
+#118000
+b00000000000000000000000001110111 #
+1$
+#118500
+0$
+#119000
+b00000000000000000000000001111000 #
+1$
+#119500
+0$
+#120000
+b00000000000000000000000001111001 #
+1$
+#120500
+0$
+#121000
+b00000000000000000000000001111010 #
+1$
+#121500
+0$
+#122000
+b00000000000000000000000001111011 #
+1$
+#122500
+0$
+#123000
+b00000000000000000000000001111100 #
+1$
+#123500
+0$
+#124000
+b00000000000000000000000001111101 #
+1$
+#124500
+0$
+#125000
+b00000000000000000000000001111110 #
+1$
+#125500
+0$
+#126000
+b00000000000000000000000001111111 #
+1$
+#126500
+0$
+#127000
+b00000000000000000000000010000000 #
+1$
+#127500
+0$
+#128000
+b00000000000000000000000010000001 #
+1$
+#128500
+0$
+#129000
+b00000000000000000000000010000010 #
+1$
+#129500
+0$
+#130000
+b00000000000000000000000010000011 #
+1$
+#130500
+0$
+#131000
+b00000000000000000000000010000100 #
+1$
+#131500
+0$
+#132000
+b00000000000000000000000010000101 #
+1$
+#132500
+0$
+#133000
+b00000000000000000000000010000110 #
+1$
+#133500
+0$
+#134000
+b00000000000000000000000010000111 #
+1$
+#134500
+0$
+#135000
+b00000000000000000000000010001000 #
+1$
+#135500
+0$
+#136000
+b00000000000000000000000010001001 #
+1$
+#136500
+0$
+#137000
+b00000000000000000000000010001010 #
+1$
+#137500
+0$
+#138000
+b00000000000000000000000010001011 #
+1$
+#138500
+0$
+#139000
+b00000000000000000000000010001100 #
+1$
+#139500
+0$
+#140000
+b00000000000000000000000010001101 #
+1$
+#140500
+0$
+#141000
+b00000000000000000000000010001110 #
+1$
+#141500
+0$
+#142000
+b00000000000000000000000010001111 #
+1$
+#142500
+0$
+#143000
+b00000000000000000000000010010000 #
+1$
+#143500
+0$
+#144000
+b00000000000000000000000010010001 #
+1$
+#144500
+0$
+#145000
+b00000000000000000000000010010010 #
+1$
+#145500
+0$
+#146000
+b00000000000000000000000010010011 #
+1$
+#146500
+0$
+#147000
+b00000000000000000000000010010100 #
+1$
+#147500
+0$
+#148000
+b00000000000000000000000010010101 #
+1$
+#148500
+0$
+#149000
+b00000000000000000000000010010110 #
+1$
+#149500
+0$
+#150000
+b00000000000000000000000010010111 #
+1$
+#150500
+0$
+#151000
+b00000000000000000000000010011000 #
+1$
+#151500
+0$
+#152000
+b00000000000000000000000010011001 #
+1$
+#152500
+0$
+#153000
+b00000000000000000000000010011010 #
+1$
+#153500
+0$
+#154000
+b00000000000000000000000010011011 #
+1$
+#154500
+0$
+#155000
+b00000000000000000000000010011100 #
+1$
+#155500
+0$
+#156000
+b00000000000000000000000010011101 #
+1$
+#156500
+0$
+#157000
+b00000000000000000000000010011110 #
+1$
+#157500
+0$
+#158000
+b00000000000000000000000010011111 #
+1$
+#158500
+0$
+#159000
+b00000000000000000000000010100000 #
+1$
+#159500
+0$
+#160000
+b00000000000000000000000010100001 #
+1$
+#160500
+0$
+#161000
+b00000000000000000000000010100010 #
+1$
+#161500
+0$
+#162000
+b00000000000000000000000010100011 #
+1$
+#162500
+0$
+#163000
+b00000000000000000000000010100100 #
+1$
+#163500
+0$
+#164000
+b00000000000000000000000010100101 #
+1$
+#164500
+0$
+#165000
+b00000000000000000000000010100110 #
+1$
+#165500
+0$
+#166000
+b00000000000000000000000010100111 #
+1$
+#166500
+0$
+#167000
+b00000000000000000000000010101000 #
+1$
+#167500
+0$
+#168000
+b00000000000000000000000010101001 #
+1$
+#168500
+0$
+#169000
+b00000000000000000000000010101010 #
+1$
+#169500
+0$
+#170000
+b00000000000000000000000010101011 #
+1$
+#170500
+0$
+#171000
+b00000000000000000000000010101100 #
+1$
+#171500
+0$
+#172000
+b00000000000000000000000010101101 #
+1$
+#172500
+0$
+#173000
+b00000000000000000000000010101110 #
+1$
+#173500
+0$
+#174000
+b00000000000000000000000010101111 #
+1$
+#174500
+0$
+#175000
+b00000000000000000000000010110000 #
+1$
+#175500
+0$
+#176000
+b00000000000000000000000010110001 #
+1$
+#176500
+0$
+#177000
+b00000000000000000000000010110010 #
+1$
+#177500
+0$
+#178000
+b00000000000000000000000010110011 #
+1$
+#178500
+0$
+#179000
+b00000000000000000000000010110100 #
+1$
+#179500
+0$
+#180000
+b00000000000000000000000010110101 #
+1$
+#180500
+0$
+#181000
+b00000000000000000000000010110110 #
+1$
+#181500
+0$
+#182000
+b00000000000000000000000010110111 #
+1$
+#182500
+0$
+#183000
+b00000000000000000000000010111000 #
+1$
+#183500
+0$
+#184000
+b00000000000000000000000010111001 #
+1$
+#184500
+0$
+#185000
+b00000000000000000000000010111010 #
+1$
+#185500
+0$
+#186000
+b00000000000000000000000010111011 #
+1$
+#186500
+0$
+#187000
+b00000000000000000000000010111100 #
+1$
+#187500
+0$
+#188000
+b00000000000000000000000010111101 #
+1$
+#188500
+0$
+#189000
+b00000000000000000000000010111110 #
+1$
+#189500
+0$
--- a/test_regress/t/t_trace_timescale.pl
+++ b/test_regress/t/t_trace_timescale.pl
@ -0,0 +1,27 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003-2013 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+
+$Self->{vlt} or $Self->skip("Verilator only test");
+
+compile (
+    make_top_shell => 0,
+    make_main => 0,
+    v_flags2 => ["--trace --exe $Self->{t_dir}/t_trace_timescale.cpp"],
+    make_flags => 'CPPFLAGS_ADD=-DVL_TIME_MULTIPLIER=1000',
+    );
+
+execute (
+    check_finished=>1,
+    );
+
+vcd_identical ("$Self->{obj_dir}/$Self->{name}.vcd",
+	       "t/$Self->{name}.out");
+
+ok(1);
+1;
--- a/test_regress/t/t_trace_timescale.v
+++ b/test_regress/t/t_trace_timescale.v
@ -0,0 +1,16 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2013 by Wilson Snyder.
+
+module t
+  (
+   input wire clk
+   );
+
+   integer    cyc; initial cyc = 0;
+
+   always @ (posedge clk) begin
+      cyc <= cyc + 1;
+   end
+endmodule