From 870918a78840444063040f95840ab72a2823d5a1 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 7 Oct 2018 22:04:49 -0400 Subject: [PATCH] Tests: Dump and test FST trace attributes. --- test_regress/driver.pl | 15 ++- test_regress/t/t_trace_complex.out | 66 +++++++------ test_regress/t/t_trace_complex.v | 2 + test_regress/t/t_trace_complex_fst.out | 38 +++++--- test_regress/t/t_trace_complex_lxt2.out | 74 ++++++++------- test_regress/t/t_trace_complex_params.out | 66 +++++++------ test_regress/t/t_trace_complex_params_fst.out | 38 +++++--- .../t/t_trace_complex_params_lxt2.out | 74 ++++++++------- test_regress/t/t_trace_complex_structs.out | 56 ++++++----- .../t/t_trace_complex_structs_fst.out | 30 +++--- .../t/t_trace_complex_structs_lxt2.out | 94 ++++++++++--------- 11 files changed, 319 insertions(+), 234 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 09472bd0c..22f0d4bba 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -1604,6 +1604,11 @@ sub vcd_identical { if ($a ne $b) { print "$a\n$b\n" if $::Debug; $self->error("VCD hier mismatch $fn1 $fn2\n"); + if ($ENV{HARNESS_UPDATE_GOLDEN}) { # Update golden files with current + warn "%Warning: HARNESS_UPDATE_GOLDEN set: cp $fn1 $fn2\n"; + eval "use File::Copy;"; + File::Copy::copy($fn1,$fn2); + } return 0; } } @@ -1620,7 +1625,7 @@ sub fst2vcd { my $out = `$cmd`; if (!$out || $out !~ /Usage:/) { $self->skip("No fst2vcd installed\n"); return 0; } - $cmd = qq{fst2vcd "$fn1" -o "$fn2"}; + $cmd = qq{fst2vcd -e "$fn1" -o "$fn2"}; print "\t$cmd\n" if $::Debug; $out = `$cmd`; return 1; @@ -1649,17 +1654,23 @@ sub _vcd_read { my $fh = IO::File->new ("<$filename"); if (!$fh) { warn "%Error: $! $filename\n"; return $data; } my @hier = ($data); + my $lasthier; while (defined(my $line = $fh->getline)) { if ($line =~ /\$scope module\s+(\S+)/) { $hier[$#hier]->{$1} ||= {}; push @hier, $hier[$#hier]->{$1}; + $lasthier = $hier[$#hier]; } elsif ($line =~ /(\$var \S+\s+\d+\s+)\S+\s+(\S+)/) { - $hier[$#hier]->{$1.$2} ||= 1; + $hier[$#hier]->{$1.$2} ||= {}; + $lasthier = $hier[$#hier]; + } elsif ($line =~ /(\$attrbegin .* \$end)/) { + if ($lasthier) { $lasthier->{$1} ||= 1; } } elsif ($line =~ /\$enddefinitions/) { last; } while ($line =~ s/\$upscope//) { pop @hier; + $lasthier = undef; } } return $data; diff --git a/test_regress/t/t_trace_complex.out b/test_regress/t/t_trace_complex.out index 1d3ca7362..f761cfe29 100644 --- a/test_regress/t/t_trace_complex.out +++ b/test_regress/t/t_trace_complex.out @@ -1,47 +1,48 @@ $version Generated by VerilatedVcd $end -$date Fri Oct 5 18:30:09 2018 +$date Sun Oct 7 21:58:06 2018 $end $timescale 1ns $end $scope module top $end - $var wire 1 : clk $end + $var wire 1 ; clk $end $scope module $unit $end $var wire 1 # global_bit $end $upscope $end $scope module t $end - $var wire 1 : clk $end + $var wire 1 ; clk $end $var wire 32 $ cyc [31:0] $end $var real 64 3 v_arr_real(0) $end $var real 64 5 v_arr_real(1) $end $var wire 2 * v_arrp [2:1] $end $var wire 4 + v_arrp_arrp [3:0] $end $var wire 4 , v_arrp_strp [3:0] $end - $var wire 1 ; v_arru(1) $end - $var wire 1 < v_arru(2) $end + $var wire 1 < v_arru(1) $end + $var wire 1 = v_arru(2) $end $var wire 2 - v_arru_arrp(3) [2:1] $end $var wire 2 . v_arru_arrp(4) [2:1] $end - $var wire 1 = v_arru_arru(3)(1) $end - $var wire 1 > v_arru_arru(3)(2) $end - $var wire 1 ? v_arru_arru(4)(1) $end - $var wire 1 @ v_arru_arru(4)(2) $end + $var wire 1 > v_arru_arru(3)(1) $end + $var wire 1 ? v_arru_arru(3)(2) $end + $var wire 1 @ v_arru_arru(4)(1) $end + $var wire 1 A v_arru_arru(4)(2) $end $var wire 2 / v_arru_strp(3) [1:0] $end $var wire 2 0 v_arru_strp(4) [1:0] $end $var wire 32 7 v_enumed [31:0] $end + $var wire 32 8 v_enumed2 [31:0] $end $var real 64 1 v_real $end $var wire 64 % v_str32x2 [63:0] $end $var wire 2 ' v_strp [1:0] $end $var wire 4 ( v_strp_strp [3:0] $end $var wire 2 ) v_unip_strp [1:0] $end $scope module p2 $end - $var wire 32 A PARAM [31:0] $end - $upscope $end - $scope module p3 $end $var wire 32 B PARAM [31:0] $end $upscope $end + $scope module p3 $end + $var wire 32 C PARAM [31:0] $end + $upscope $end $scope module unnamedblk1 $end - $var wire 32 8 b [31:0] $end + $var wire 32 9 b [31:0] $end $scope module unnamedblk2 $end - $var wire 32 9 a [31:0] $end + $var wire 32 : a [31:0] $end $upscope $end $upscope $end $upscope $end @@ -69,15 +70,16 @@ r0 5 b00000000000000000000000000000000 7 b00000000000000000000000000000000 8 b00000000000000000000000000000000 9 -0: +b00000000000000000000000000000000 : 0; 0< 0= 0> 0? 0@ -b00000000000000000000000000000010 A -b00000000000000000000000000000011 B +0A +b00000000000000000000000000000010 B +b00000000000000000000000000000011 C #10 b00000000000000000000000000000001 $ b0000000000000000000000000000000100000000000000000000000011111110 % @@ -95,11 +97,12 @@ r0.1 1 r0.2 3 r0.3 5 b00000000000000000000000000000001 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000000010 8 b00000000000000000000000000000101 9 -1: +b00000000000000000000000000000101 : +1; #15 -0: +0; #20 b00000000000000000000000000000010 $ b0000000000000000000000000000001000000000000000000000000011111101 % @@ -117,9 +120,10 @@ r0.2 1 r0.4 3 r0.6 5 b00000000000000000000000000000010 7 -1: +b00000000000000000000000000000100 8 +1; #25 -0: +0; #30 b00000000000000000000000000000011 $ b0000000000000000000000000000001100000000000000000000000011111100 % @@ -137,9 +141,10 @@ r0.3 1 r0.6000000000000001 3 r0.8999999999999999 5 b00000000000000000000000000000011 7 -1: +b00000000000000000000000000000110 8 +1; #35 -0: +0; #40 b00000000000000000000000000000100 $ b0000000000000000000000000000010000000000000000000000000011111011 % @@ -157,9 +162,10 @@ r0.4 1 r0.8 3 r1.2 5 b00000000000000000000000000000100 7 -1: +b00000000000000000000000000001000 8 +1; #45 -0: +0; #50 b00000000000000000000000000000101 $ b0000000000000000000000000000010100000000000000000000000011111010 % @@ -177,9 +183,10 @@ r0.5 1 r1 3 r1.5 5 b00000000000000000000000000000101 7 -1: +b00000000000000000000000000001010 8 +1; #55 -0: +0; #60 b00000000000000000000000000000110 $ b0000000000000000000000000000011000000000000000000000000011111001 % @@ -197,4 +204,5 @@ r0.6 1 r1.2 3 r1.8 5 b00000000000000000000000000000110 7 -1: +b00000000000000000000000000001100 8 +1; diff --git a/test_regress/t/t_trace_complex.v b/test_regress/t/t_trace_complex.v index 2c37c222f..8d64251ec 100644 --- a/test_regress/t/t_trace_complex.v +++ b/test_regress/t/t_trace_complex.v @@ -58,6 +58,7 @@ module t (clk); typedef enum int { ZERO=0, ONE, TWO, THREE } enumed_t; enumed_t v_enumed; + enumed_t v_enumed2; p #(.PARAM(2)) p2 (); p #(.PARAM(3)) p3 (); @@ -75,6 +76,7 @@ module t (clk); v_arr_real[0] <= v_arr_real[0] + 0.2; v_arr_real[1] <= v_arr_real[1] + 0.3; v_enumed <= v_enumed + 1; + v_enumed2 <= v_enumed2 + 2; for (integer b=3; b<=4; b++) begin v_arru[b] <= ~v_arru[b]; v_arru_strp[b] <= ~v_arru_strp[b]; diff --git a/test_regress/t/t_trace_complex_fst.out b/test_regress/t/t_trace_complex_fst.out index c735d729c..29596294f 100644 --- a/test_regress/t/t_trace_complex_fst.out +++ b/test_regress/t/t_trace_complex_fst.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:31:31 2018 + Sun Oct 7 21:45:40 2018 $end $version @@ -34,21 +34,22 @@ $var real 64 4 v_arr_real(0) $end $var real 64 5 v_arr_real(1) $end $var logic 64 6 v_str32x2 $end $var logic 32 7 v_enumed $end +$var logic 32 8 v_enumed2 $end $scope module unnamedblk1 $end -$var integer 32 8 b $end +$var integer 32 9 b $end $scope module unnamedblk2 $end -$var integer 32 9 a $end +$var integer 32 : a $end $upscope $end $upscope $end $scope module p2 $end -$var parameter 32 : PARAM $end +$var parameter 32 ; PARAM $end $upscope $end $scope module p3 $end -$var parameter 32 ; PARAM $end +$var parameter 32 < PARAM $end $upscope $end $upscope $end $scope module $unit $end -$var bit 1 < global_bit $end +$var bit 1 = global_bit $end $upscope $end $upscope $end $enddefinitions $end @@ -78,12 +79,14 @@ b0000000000000000000000000000000000000000000000000000000011111111 6 b00000000000000000000000000000000 7 b00000000000000000000000000000000 8 b00000000000000000000000000000000 9 -b00000000000000000000000000000010 : -b00000000000000000000000000000011 ; -1< +b00000000000000000000000000000000 : +b00000000000000000000000000000010 ; +b00000000000000000000000000000011 < +1= #10 +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000000010 8 b00000000000000000000000000000001 7 b0000000000000000000000000000000100000000000000000000000011111110 6 r0.3 5 @@ -121,14 +124,16 @@ r0.4 4 r0.6 5 b0000000000000000000000000000001000000000000000000000000011111101 6 b00000000000000000000000000000010 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000000100 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : #25 0! #30 1! +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000000110 8 b00000000000000000000000000000011 7 b0000000000000000000000000000001100000000000000000000000011111100 6 r0.8999999999999999 5 @@ -165,14 +170,16 @@ r0.8 4 r1.2 5 b0000000000000000000000000000010000000000000000000000000011111011 6 b00000000000000000000000000000100 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000001000 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : #45 0! #50 1! +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000001010 8 b00000000000000000000000000000101 7 b0000000000000000000000000000010100000000000000000000000011111010 6 r1.5 5 @@ -209,5 +216,6 @@ r1.2 4 r1.8 5 b0000000000000000000000000000011000000000000000000000000011111001 6 b00000000000000000000000000000110 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000001100 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : diff --git a/test_regress/t/t_trace_complex_lxt2.out b/test_regress/t/t_trace_complex_lxt2.out index 78cc39d16..d47cc79bd 100644 --- a/test_regress/t/t_trace_complex_lxt2.out +++ b/test_regress/t/t_trace_complex_lxt2.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:31:36 2018 + Sun Oct 7 21:58:06 2018 $end $version lxt2vcd @@ -40,11 +40,12 @@ $var wire 1 4 v_arru_arru(4)(2) $end $var wire 2 5 v_arru_strp(3) [1:0] $end $var wire 2 6 v_arru_strp(4) [1:0] $end $var wire 32 7 v_enumed [31:0] $end -$var real 1 8 v_real $end -$var wire 64 9 v_str32x2 [63:0] $end -$var wire 2 : v_strp [1:0] $end -$var wire 4 ; v_strp_strp [3:0] $end -$var wire 2 < v_unip_strp [1:0] $end +$var wire 32 8 v_enumed2 [31:0] $end +$var real 1 9 v_real $end +$var wire 64 : v_str32x2 [63:0] $end +$var wire 2 ; v_strp [1:0] $end +$var wire 4 < v_strp_strp [3:0] $end +$var wire 2 = v_unip_strp [1:0] $end $var wire 1 " clk $end $upscope $end $upscope $end @@ -74,17 +75,19 @@ b0 0 b0 5 b0 6 b0 7 -r0 8 -b11111111 9 -b0 : +b0 8 +r0 9 +b11111111 : b0 ; b0 < +b0 = #10 -b11 < -b1111 ; -b11 : -b100000000000000000000000011111110 9 -r0.1 8 +b11 = +b1111 < +b11 ; +b100000000000000000000000011111110 : +r0.1 9 +b10 8 b1 7 b11 6 b11 5 @@ -114,20 +117,22 @@ b0 0 b0 5 b0 6 b10 7 -r0.2 8 -b1000000000000000000000000011111101 9 -b0 : +b100 8 +r0.2 9 +b1000000000000000000000000011111101 : b0 ; b0 < +b0 = #25 0" #30 1" -b11 < -b1111 ; -b11 : -b1100000000000000000000000011111100 9 -r0.3 8 +b11 = +b1111 < +b11 ; +b1100000000000000000000000011111100 : +r0.3 9 +b110 8 b11 7 b11 6 b11 5 @@ -154,20 +159,22 @@ b0 0 b0 5 b0 6 b100 7 -r0.4 8 -b10000000000000000000000000011111011 9 -b0 : +b1000 8 +r0.4 9 +b10000000000000000000000000011111011 : b0 ; b0 < +b0 = #45 0" #50 1" -b11 < -b1111 ; -b11 : -b10100000000000000000000000011111010 9 -r0.5 8 +b11 = +b1111 < +b11 ; +b10100000000000000000000000011111010 : +r0.5 9 +b1010 8 b101 7 b11 6 b11 5 @@ -194,8 +201,9 @@ b0 0 b0 5 b0 6 b110 7 -r0.6 8 -b11000000000000000000000000011111001 9 -b0 : +b1100 8 +r0.6 9 +b11000000000000000000000000011111001 : b0 ; b0 < +b0 = diff --git a/test_regress/t/t_trace_complex_params.out b/test_regress/t/t_trace_complex_params.out index fb847ff3e..e8c8a9518 100644 --- a/test_regress/t/t_trace_complex_params.out +++ b/test_regress/t/t_trace_complex_params.out @@ -1,47 +1,48 @@ $version Generated by VerilatedVcd $end -$date Fri Oct 5 18:38:00 2018 +$date Sun Oct 7 21:58:07 2018 $end $timescale 1ns $end $scope module top $end - $var wire 1 : clk $end + $var wire 1 ; clk $end $scope module $unit $end $var wire 1 # global_bit $end $upscope $end $scope module t $end - $var wire 1 : clk $end + $var wire 1 ; clk $end $var wire 32 $ cyc [31:0] $end $var real 64 3 v_arr_real(0) $end $var real 64 5 v_arr_real(1) $end $var wire 2 * v_arrp [2:1] $end $var wire 4 + v_arrp_arrp [3:0] $end $var wire 4 , v_arrp_strp [3:0] $end - $var wire 1 ; v_arru(1) $end - $var wire 1 < v_arru(2) $end + $var wire 1 < v_arru(1) $end + $var wire 1 = v_arru(2) $end $var wire 2 - v_arru_arrp(3) [2:1] $end $var wire 2 . v_arru_arrp(4) [2:1] $end - $var wire 1 = v_arru_arru(3)(1) $end - $var wire 1 > v_arru_arru(3)(2) $end - $var wire 1 ? v_arru_arru(4)(1) $end - $var wire 1 @ v_arru_arru(4)(2) $end + $var wire 1 > v_arru_arru(3)(1) $end + $var wire 1 ? v_arru_arru(3)(2) $end + $var wire 1 @ v_arru_arru(4)(1) $end + $var wire 1 A v_arru_arru(4)(2) $end $var wire 2 / v_arru_strp(3) [1:0] $end $var wire 2 0 v_arru_strp(4) [1:0] $end $var wire 32 7 v_enumed [31:0] $end + $var wire 32 8 v_enumed2 [31:0] $end $var real 64 1 v_real $end $var wire 64 % v_str32x2 [63:0] $end $var wire 2 ' v_strp [1:0] $end $var wire 4 ( v_strp_strp [3:0] $end $var wire 2 ) v_unip_strp [1:0] $end $scope module p2 $end - $var wire 32 A PARAM [31:0] $end - $upscope $end - $scope module p3 $end $var wire 32 B PARAM [31:0] $end $upscope $end + $scope module p3 $end + $var wire 32 C PARAM [31:0] $end + $upscope $end $scope module unnamedblk1 $end - $var wire 32 8 b [31:0] $end + $var wire 32 9 b [31:0] $end $scope module unnamedblk2 $end - $var wire 32 9 a [31:0] $end + $var wire 32 : a [31:0] $end $upscope $end $upscope $end $upscope $end @@ -69,15 +70,16 @@ r0 5 b00000000000000000000000000000000 7 b00000000000000000000000000000000 8 b00000000000000000000000000000000 9 -0: +b00000000000000000000000000000000 : 0; 0< 0= 0> 0? 0@ -b00000000000000000000000000000010 A -b00000000000000000000000000000011 B +0A +b00000000000000000000000000000010 B +b00000000000000000000000000000011 C #10 b00000000000000000000000000000001 $ b0000000000000000000000000000000100000000000000000000000011111110 % @@ -95,11 +97,12 @@ r0.1 1 r0.2 3 r0.3 5 b00000000000000000000000000000001 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000000010 8 b00000000000000000000000000000101 9 -1: +b00000000000000000000000000000101 : +1; #15 -0: +0; #20 b00000000000000000000000000000010 $ b0000000000000000000000000000001000000000000000000000000011111101 % @@ -117,9 +120,10 @@ r0.2 1 r0.4 3 r0.6 5 b00000000000000000000000000000010 7 -1: +b00000000000000000000000000000100 8 +1; #25 -0: +0; #30 b00000000000000000000000000000011 $ b0000000000000000000000000000001100000000000000000000000011111100 % @@ -137,9 +141,10 @@ r0.3 1 r0.6000000000000001 3 r0.8999999999999999 5 b00000000000000000000000000000011 7 -1: +b00000000000000000000000000000110 8 +1; #35 -0: +0; #40 b00000000000000000000000000000100 $ b0000000000000000000000000000010000000000000000000000000011111011 % @@ -157,9 +162,10 @@ r0.4 1 r0.8 3 r1.2 5 b00000000000000000000000000000100 7 -1: +b00000000000000000000000000001000 8 +1; #45 -0: +0; #50 b00000000000000000000000000000101 $ b0000000000000000000000000000010100000000000000000000000011111010 % @@ -177,9 +183,10 @@ r0.5 1 r1 3 r1.5 5 b00000000000000000000000000000101 7 -1: +b00000000000000000000000000001010 8 +1; #55 -0: +0; #60 b00000000000000000000000000000110 $ b0000000000000000000000000000011000000000000000000000000011111001 % @@ -197,4 +204,5 @@ r0.6 1 r1.2 3 r1.8 5 b00000000000000000000000000000110 7 -1: +b00000000000000000000000000001100 8 +1; diff --git a/test_regress/t/t_trace_complex_params_fst.out b/test_regress/t/t_trace_complex_params_fst.out index 136238d14..da3667e03 100644 --- a/test_regress/t/t_trace_complex_params_fst.out +++ b/test_regress/t/t_trace_complex_params_fst.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:38:01 2018 + Sun Oct 7 21:45:42 2018 $end $version @@ -34,21 +34,22 @@ $var real 64 4 v_arr_real(0) $end $var real 64 5 v_arr_real(1) $end $var logic 64 6 v_str32x2 $end $var logic 32 7 v_enumed $end +$var logic 32 8 v_enumed2 $end $scope module unnamedblk1 $end -$var integer 32 8 b $end +$var integer 32 9 b $end $scope module unnamedblk2 $end -$var integer 32 9 a $end +$var integer 32 : a $end $upscope $end $upscope $end $scope module p2 $end -$var parameter 32 : PARAM $end +$var parameter 32 ; PARAM $end $upscope $end $scope module p3 $end -$var parameter 32 ; PARAM $end +$var parameter 32 < PARAM $end $upscope $end $upscope $end $scope module $unit $end -$var bit 1 < global_bit $end +$var bit 1 = global_bit $end $upscope $end $upscope $end $enddefinitions $end @@ -78,12 +79,14 @@ b0000000000000000000000000000000000000000000000000000000011111111 6 b00000000000000000000000000000000 7 b00000000000000000000000000000000 8 b00000000000000000000000000000000 9 -b00000000000000000000000000000010 : -b00000000000000000000000000000011 ; -1< +b00000000000000000000000000000000 : +b00000000000000000000000000000010 ; +b00000000000000000000000000000011 < +1= #10 +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000000010 8 b00000000000000000000000000000001 7 b0000000000000000000000000000000100000000000000000000000011111110 6 r0.3 5 @@ -121,14 +124,16 @@ r0.4 4 r0.6 5 b0000000000000000000000000000001000000000000000000000000011111101 6 b00000000000000000000000000000010 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000000100 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : #25 0! #30 1! +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000000110 8 b00000000000000000000000000000011 7 b0000000000000000000000000000001100000000000000000000000011111100 6 r0.8999999999999999 5 @@ -165,14 +170,16 @@ r0.8 4 r1.2 5 b0000000000000000000000000000010000000000000000000000000011111011 6 b00000000000000000000000000000100 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000001000 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : #45 0! #50 1! +b00000000000000000000000000000101 : b00000000000000000000000000000101 9 -b00000000000000000000000000000101 8 +b00000000000000000000000000001010 8 b00000000000000000000000000000101 7 b0000000000000000000000000000010100000000000000000000000011111010 6 r1.5 5 @@ -209,5 +216,6 @@ r1.2 4 r1.8 5 b0000000000000000000000000000011000000000000000000000000011111001 6 b00000000000000000000000000000110 7 -b00000000000000000000000000000101 8 +b00000000000000000000000000001100 8 b00000000000000000000000000000101 9 +b00000000000000000000000000000101 : diff --git a/test_regress/t/t_trace_complex_params_lxt2.out b/test_regress/t/t_trace_complex_params_lxt2.out index e4a324efb..0461aef11 100644 --- a/test_regress/t/t_trace_complex_params_lxt2.out +++ b/test_regress/t/t_trace_complex_params_lxt2.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:38:02 2018 + Sun Oct 7 21:58:07 2018 $end $version lxt2vcd @@ -40,11 +40,12 @@ $var wire 1 4 v_arru_arru(4)(2) $end $var wire 2 5 v_arru_strp(3) [1:0] $end $var wire 2 6 v_arru_strp(4) [1:0] $end $var wire 32 7 v_enumed [31:0] $end -$var real 1 8 v_real $end -$var wire 64 9 v_str32x2 [63:0] $end -$var wire 2 : v_strp [1:0] $end -$var wire 4 ; v_strp_strp [3:0] $end -$var wire 2 < v_unip_strp [1:0] $end +$var wire 32 8 v_enumed2 [31:0] $end +$var real 1 9 v_real $end +$var wire 64 : v_str32x2 [63:0] $end +$var wire 2 ; v_strp [1:0] $end +$var wire 4 < v_strp_strp [3:0] $end +$var wire 2 = v_unip_strp [1:0] $end $var wire 1 " clk $end $upscope $end $upscope $end @@ -74,17 +75,19 @@ b0 0 b0 5 b0 6 b0 7 -r0 8 -b11111111 9 -b0 : +b0 8 +r0 9 +b11111111 : b0 ; b0 < +b0 = #10 -b11 < -b1111 ; -b11 : -b100000000000000000000000011111110 9 -r0.1 8 +b11 = +b1111 < +b11 ; +b100000000000000000000000011111110 : +r0.1 9 +b10 8 b1 7 b11 6 b11 5 @@ -114,20 +117,22 @@ b0 0 b0 5 b0 6 b10 7 -r0.2 8 -b1000000000000000000000000011111101 9 -b0 : +b100 8 +r0.2 9 +b1000000000000000000000000011111101 : b0 ; b0 < +b0 = #25 0" #30 1" -b11 < -b1111 ; -b11 : -b1100000000000000000000000011111100 9 -r0.3 8 +b11 = +b1111 < +b11 ; +b1100000000000000000000000011111100 : +r0.3 9 +b110 8 b11 7 b11 6 b11 5 @@ -154,20 +159,22 @@ b0 0 b0 5 b0 6 b100 7 -r0.4 8 -b10000000000000000000000000011111011 9 -b0 : +b1000 8 +r0.4 9 +b10000000000000000000000000011111011 : b0 ; b0 < +b0 = #45 0" #50 1" -b11 < -b1111 ; -b11 : -b10100000000000000000000000011111010 9 -r0.5 8 +b11 = +b1111 < +b11 ; +b10100000000000000000000000011111010 : +r0.5 9 +b1010 8 b101 7 b11 6 b11 5 @@ -194,8 +201,9 @@ b0 0 b0 5 b0 6 b110 7 -r0.6 8 -b11000000000000000000000000011111001 9 -b0 : +b1100 8 +r0.6 9 +b11000000000000000000000000011111001 : b0 ; b0 < +b0 = diff --git a/test_regress/t/t_trace_complex_structs.out b/test_regress/t/t_trace_complex_structs.out index 16cfc73cd..95e589c80 100644 --- a/test_regress/t/t_trace_complex_structs.out +++ b/test_regress/t/t_trace_complex_structs.out @@ -1,35 +1,36 @@ $version Generated by VerilatedVcd $end -$date Fri Oct 5 18:38:02 2018 +$date Sun Oct 7 21:58:08 2018 $end $timescale 1ns $end $scope module top $end - $var wire 1 E clk $end + $var wire 1 F clk $end $scope module $unit $end $var wire 1 # global_bit $end $upscope $end $scope module t $end - $var wire 1 E clk $end + $var wire 1 F clk $end $var wire 32 $ cyc [31:0] $end $var real 64 > v_arr_real(0) $end $var real 64 @ v_arr_real(1) $end $var wire 2 / v_arrp [2:1] $end $var wire 2 0 v_arrp_arrp(3) [1:0] $end $var wire 2 1 v_arrp_arrp(4) [1:0] $end - $var wire 1 F v_arru(1) $end - $var wire 1 G v_arru(2) $end + $var wire 1 G v_arru(1) $end + $var wire 1 H v_arru(2) $end $var wire 2 6 v_arru_arrp(3) [2:1] $end $var wire 2 7 v_arru_arrp(4) [2:1] $end - $var wire 1 H v_arru_arru(3)(1) $end - $var wire 1 I v_arru_arru(3)(2) $end - $var wire 1 J v_arru_arru(4)(1) $end - $var wire 1 K v_arru_arru(4)(2) $end + $var wire 1 I v_arru_arru(3)(1) $end + $var wire 1 J v_arru_arru(3)(2) $end + $var wire 1 K v_arru_arru(4)(1) $end + $var wire 1 L v_arru_arru(4)(2) $end $var wire 32 B v_enumed [31:0] $end + $var wire 32 C v_enumed2 [31:0] $end $var real 64 < v_real $end $scope module unnamedblk1 $end - $var wire 32 C b [31:0] $end + $var wire 32 D b [31:0] $end $scope module unnamedblk2 $end - $var wire 32 D a [31:0] $end + $var wire 32 E a [31:0] $end $upscope $end $upscope $end $scope module v_arrp_strp(3) $end @@ -115,13 +116,14 @@ r0 @ b00000000000000000000000000000000 B b00000000000000000000000000000000 C b00000000000000000000000000000000 D -0E +b00000000000000000000000000000000 E 0F 0G 0H 0I 0J 0K +0L #10 b00000000000000000000000000000001 $ b00000000000000000000000011111110 % @@ -151,11 +153,12 @@ r0.1 < r0.2 > r0.3 @ b00000000000000000000000000000001 B -b00000000000000000000000000000101 C +b00000000000000000000000000000010 C b00000000000000000000000000000101 D -1E +b00000000000000000000000000000101 E +1F #15 -0E +0F #20 b00000000000000000000000000000010 $ b00000000000000000000000011111101 % @@ -185,9 +188,10 @@ r0.2 < r0.4 > r0.6 @ b00000000000000000000000000000010 B -1E +b00000000000000000000000000000100 C +1F #25 -0E +0F #30 b00000000000000000000000000000011 $ b00000000000000000000000011111100 % @@ -217,9 +221,10 @@ r0.3 < r0.6000000000000001 > r0.8999999999999999 @ b00000000000000000000000000000011 B -1E +b00000000000000000000000000000110 C +1F #35 -0E +0F #40 b00000000000000000000000000000100 $ b00000000000000000000000011111011 % @@ -249,9 +254,10 @@ r0.4 < r0.8 > r1.2 @ b00000000000000000000000000000100 B -1E +b00000000000000000000000000001000 C +1F #45 -0E +0F #50 b00000000000000000000000000000101 $ b00000000000000000000000011111010 % @@ -281,9 +287,10 @@ r0.5 < r1 > r1.5 @ b00000000000000000000000000000101 B -1E +b00000000000000000000000000001010 C +1F #55 -0E +0F #60 b00000000000000000000000000000110 $ b00000000000000000000000011111001 % @@ -313,4 +320,5 @@ r0.6 < r1.2 > r1.8 @ b00000000000000000000000000000110 B -1E +b00000000000000000000000000001100 C +1F diff --git a/test_regress/t/t_trace_complex_structs_fst.out b/test_regress/t/t_trace_complex_structs_fst.out index b981f0a9d..2e7b495c1 100644 --- a/test_regress/t/t_trace_complex_structs_fst.out +++ b/test_regress/t/t_trace_complex_structs_fst.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:38:03 2018 + Sun Oct 7 21:45:44 2018 $end $version @@ -74,15 +74,16 @@ $scope module v_str32x2(1) $end $var logic 32 B data $end $upscope $end $var logic 32 C v_enumed $end +$var logic 32 D v_enumed2 $end $scope module unnamedblk1 $end -$var integer 32 D b $end +$var integer 32 E b $end $scope module unnamedblk2 $end -$var integer 32 E a $end +$var integer 32 F a $end $upscope $end $upscope $end $upscope $end $scope module $unit $end -$var bit 1 F global_bit $end +$var bit 1 G global_bit $end $upscope $end $upscope $end $enddefinitions $end @@ -124,10 +125,12 @@ b00000000000000000000000000000000 B b00000000000000000000000000000000 C b00000000000000000000000000000000 D b00000000000000000000000000000000 E -1F +b00000000000000000000000000000000 F +1G #10 +b00000000000000000000000000000101 F b00000000000000000000000000000101 E -b00000000000000000000000000000101 D +b00000000000000000000000000000010 D b00000000000000000000000000000001 C b00000000000000000000000000000001 B b00000000000000000000000011111110 A @@ -189,14 +192,16 @@ r0.6 @ b00000000000000000000000011111101 A b00000000000000000000000000000010 B b00000000000000000000000000000010 C -b00000000000000000000000000000101 D +b00000000000000000000000000000100 D b00000000000000000000000000000101 E +b00000000000000000000000000000101 F #25 0! #30 1! +b00000000000000000000000000000101 F b00000000000000000000000000000101 E -b00000000000000000000000000000101 D +b00000000000000000000000000000110 D b00000000000000000000000000000011 C b00000000000000000000000000000011 B b00000000000000000000000011111100 A @@ -257,14 +262,16 @@ r1.2 @ b00000000000000000000000011111011 A b00000000000000000000000000000100 B b00000000000000000000000000000100 C -b00000000000000000000000000000101 D +b00000000000000000000000000001000 D b00000000000000000000000000000101 E +b00000000000000000000000000000101 F #45 0! #50 1! +b00000000000000000000000000000101 F b00000000000000000000000000000101 E -b00000000000000000000000000000101 D +b00000000000000000000000000001010 D b00000000000000000000000000000101 C b00000000000000000000000000000101 B b00000000000000000000000011111010 A @@ -325,5 +332,6 @@ r1.8 @ b00000000000000000000000011111001 A b00000000000000000000000000000110 B b00000000000000000000000000000110 C -b00000000000000000000000000000101 D +b00000000000000000000000000001100 D b00000000000000000000000000000101 E +b00000000000000000000000000000101 F diff --git a/test_regress/t/t_trace_complex_structs_lxt2.out b/test_regress/t/t_trace_complex_structs_lxt2.out index 9a9964e68..653cb756e 100644 --- a/test_regress/t/t_trace_complex_structs_lxt2.out +++ b/test_regress/t/t_trace_complex_structs_lxt2.out @@ -1,5 +1,5 @@ $date - Fri Oct 5 18:38:03 2018 + Sun Oct 7 21:58:08 2018 $end $version lxt2vcd @@ -48,38 +48,39 @@ $var wire 1 9 b0 $end $var wire 1 : b1 $end $upscope $end $var wire 32 ; v_enumed [31:0] $end -$var real 1 < v_real $end +$var wire 32 < v_enumed2 [31:0] $end +$var real 1 = v_real $end $scope module v_str32x2(0) $end -$var wire 32 = data [31:0] $end -$upscope $end -$scope module v_str32x2(1) $end $var wire 32 > data [31:0] $end $upscope $end +$scope module v_str32x2(1) $end +$var wire 32 ? data [31:0] $end +$upscope $end $scope module v_strp $end -$var wire 1 ? b0 $end -$var wire 1 @ b1 $end +$var wire 1 @ b0 $end +$var wire 1 A b1 $end $upscope $end $scope module v_strp_strp $end $scope module x0 $end -$var wire 1 A b0 $end -$var wire 1 B b1 $end +$var wire 1 B b0 $end +$var wire 1 C b1 $end $upscope $end $scope module x1 $end -$var wire 1 C b0 $end -$var wire 1 D b1 $end +$var wire 1 D b0 $end +$var wire 1 E b1 $end $upscope $end $upscope $end $scope module v_unip_strp $end $scope module x1 $end -$var wire 1 E b0 $end -$var wire 1 F b1 $end +$var wire 1 F b0 $end +$var wire 1 G b1 $end $upscope $end $upscope $end $var wire 1 " clk $end $scope module v_unip_strp $end $scope module x0 $end -$var wire 1 E b0 $end -$var wire 1 F b1 $end +$var wire 1 F b0 $end +$var wire 1 G b1 $end $upscope $end $upscope $end $upscope $end @@ -114,10 +115,10 @@ b0 2 09 0: b0 ; -r0 < -b11111111 = -b0 > -0? +b0 < +r0 = +b11111111 > +b0 ? 0@ 0A 0B @@ -125,7 +126,9 @@ b0 > 0D 0E 0F +0G #10 +1G 1F 1E 1D @@ -133,10 +136,10 @@ b0 > 1B 1A 1@ -1? -b1 > -b11111110 = -r0.1 < +b1 ? +b11111110 > +r0.1 = +b10 < b1 ; 1: 19 @@ -178,10 +181,10 @@ b0 2 09 0: b10 ; -r0.2 < -b11111101 = -b10 > -0? +b100 < +r0.2 = +b11111101 > +b10 ? 0@ 0A 0B @@ -189,10 +192,12 @@ b10 > 0D 0E 0F +0G #25 0" #30 1" +1G 1F 1E 1D @@ -200,10 +205,10 @@ b10 > 1B 1A 1@ -1? -b11 > -b11111100 = -r0.3 < +b11 ? +b11111100 > +r0.3 = +b110 < b11 ; 1: 19 @@ -242,10 +247,10 @@ b0 2 09 0: b100 ; -r0.4 < -b11111011 = -b100 > -0? +b1000 < +r0.4 = +b11111011 > +b100 ? 0@ 0A 0B @@ -253,10 +258,12 @@ b100 > 0D 0E 0F +0G #45 0" #50 1" +1G 1F 1E 1D @@ -264,10 +271,10 @@ b100 > 1B 1A 1@ -1? -b101 > -b11111010 = -r0.5 < +b101 ? +b11111010 > +r0.5 = +b1010 < b101 ; 1: 19 @@ -306,10 +313,10 @@ b0 2 09 0: b110 ; -r0.6 < -b11111001 = -b110 > -0? +b1100 < +r0.6 = +b11111001 > +b110 ? 0@ 0A 0B @@ -317,3 +324,4 @@ b110 > 0D 0E 0F +0G