luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Traces show array instances using brackets instead of parens (#3092) (#3095)

This commit is contained in:
Pieter Kapsenberg 2021-08-12 10:40:44 -07:00 committed by GitHub
parent 00fe36f44c
commit d1836b7b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 1501 additions and 1505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/verilated_fst_c.cpp
View File

@ -204,7 +204,7 @@ void VerilatedFst::declare(vluint32_t code, const char* name, int dtypenum, fstV
std::stringstream name_ss; std::stringstream name_ss;
name_ss << symbol_name; name_ss << symbol_name;
if (array) name_ss << "(" << arraynum << ")"; if (array) name_ss << "[" << arraynum << "]";
std::string name_str = name_ss.str(); std::string name_str = name_ss.str();
if (dtypenum > 0) { if (dtypenum > 0) {

6
include/verilated_vcd_c.cpp
View File

@ -431,9 +431,9 @@ void VerilatedVcd::dumpHeader() {
for (; *np && *np != ' ' && *np != '\t'; np++) { for (; *np && *np != ' ' && *np != '\t'; np++) {
if (*np == '[') { if (*np == '[') {
printStr("("); printStr("[");
} else if (*np == ']') { } else if (*np == ']') {
printStr(")"); printStr("]");
} else if (!(*np & '\x80')) { } else if (!(*np & '\x80')) {
*m_writep++ = *np; *m_writep++ = *np;
} }
@ -532,7 +532,7 @@ void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep,
decl += " "; decl += " ";
decl += basename; decl += basename;
if (array) { if (array) {
VL_SNPRINTF(buf, bufsize, "(%d)", arraynum); VL_SNPRINTF(buf, bufsize, "[%d]", arraynum);
decl += buf; decl += buf;
hiername += buf; hiername += buf;
} }

4
src/V3TraceDecl.cpp
View File

@ -253,7 +253,7 @@ private:
VL_RESTORER(m_traShowname); VL_RESTORER(m_traShowname);
VL_RESTORER(m_traValuep); VL_RESTORER(m_traValuep);
{ {
m_traShowname += string("(") + cvtToStr(i) + string(")"); m_traShowname += string("[") + cvtToStr(i) + string("]");
m_traValuep = new AstArraySel( m_traValuep = new AstArraySel(
nodep->fileline(), m_traValuep->cloneTree(true), i - nodep->lo()); nodep->fileline(), m_traValuep->cloneTree(true), i - nodep->lo());
@ -278,7 +278,7 @@ private:
VL_RESTORER(m_traShowname); VL_RESTORER(m_traShowname);
VL_RESTORER(m_traValuep); VL_RESTORER(m_traValuep);
{ {
m_traShowname += string("(") + cvtToStr(i) + string(")"); m_traShowname += string("[") + cvtToStr(i) + string("]");
m_traValuep m_traValuep
= new AstSel(nodep->fileline(), m_traValuep->cloneTree(true), = new AstSel(nodep->fileline(), m_traValuep->cloneTree(true),
(i - nodep->lo()) * subtypep->width(), subtypep->width()); (i - nodep->lo()) * subtypep->width(), subtypep->width());

1588
test_regress/t/t_split_var_2_trace.out
View File

File diff suppressed because it is too large Load Diff

35
test_regress/t/t_trace_complex.out
View File

@ -1,7 +1,6 @@
$version Generated by VerilatedVcd $end $version Generated by VerilatedVcd $end
$date Mon Nov 16 17:48:27 2020 $date Wed Aug 11 12:40:46 2021 $end
$end $timescale 1ps $end
$timescale 1ps $end
$scope module top $end $scope module top $end
$var wire 1 = clk $end $var wire 1 = clk $end
@ -12,24 +11,24 @@ $timescale 1ps $end
$var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$var wire 1 = clk $end $var wire 1 = clk $end
$var wire 32 $ cyc [31:0] $end $var wire 32 $ cyc [31:0] $end
$var wire 8 E unpacked_array(-1) [7:0] $end $var wire 8 E unpacked_array[-1] [7:0] $end
$var wire 8 D unpacked_array(-2) [7:0] $end $var wire 8 D unpacked_array[-2] [7:0] $end
$var wire 8 F unpacked_array(0) [7:0] $end $var wire 8 F unpacked_array[0] [7:0] $end
$var real 64 1 v_arr_real(0) $end $var real 64 1 v_arr_real[0] $end
$var real 64 3 v_arr_real(1) $end $var real 64 3 v_arr_real[1] $end
$var wire 2 ( v_arrp [2:1] $end $var wire 2 ( v_arrp [2:1] $end
$var wire 4 ) v_arrp_arrp [3:0] $end $var wire 4 ) v_arrp_arrp [3:0] $end
$var wire 4 * v_arrp_strp [3:0] $end $var wire 4 * v_arrp_strp [3:0] $end
$var wire 1 > v_arru(1) $end $var wire 1 > v_arru[1] $end
$var wire 1 ? v_arru(2) $end $var wire 1 ? v_arru[2] $end
$var wire 2 + v_arru_arrp(3) [2:1] $end $var wire 2 + v_arru_arrp[3] [2:1] $end
$var wire 2 , v_arru_arrp(4) [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][1] $end
$var wire 1 A v_arru_arru(3)(2) $end $var wire 1 A v_arru_arru[3][2] $end
$var wire 1 B v_arru_arru(4)(1) $end $var wire 1 B v_arru_arru[4][1] $end
$var wire 1 C v_arru_arru(4)(2) $end $var wire 1 C v_arru_arru[4][2] $end
$var wire 2 - v_arru_strp(3) [1:0] $end $var wire 2 - v_arru_strp[3] [1:0] $end
$var wire 2 . v_arru_strp(4) [1:0] $end $var wire 2 . v_arru_strp[4] [1:0] $end
$var wire 3 9 v_enumb [2:0] $end $var wire 3 9 v_enumb [2:0] $end
$var wire 6 : v_enumb2_str [5:0] $end $var wire 6 : v_enumb2_str [5:0] $end
$var wire 32 7 v_enumed [31:0] $end $var wire 32 7 v_enumed [31:0] $end

8
test_regress/t/t_trace_complex.pl
View File

@ -23,10 +23,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

35
test_regress/t/t_trace_complex_fst.out
View File

@ -1,5 +1,5 @@
$date $date
Mon Nov 16 17:51:08 2020 Wed Aug 11 12:40:48 2021
$end $end
$version $version
@ -19,19 +19,19 @@ $var logic 2 % v_unip_strp $end
$var logic 2 & v_arrp $end $var logic 2 & v_arrp $end
$var logic 4 ' v_arrp_arrp $end $var logic 4 ' v_arrp_arrp $end
$var logic 4 ( v_arrp_strp $end $var logic 4 ( v_arrp_strp $end
$var logic 1 ) v_arru(1) $end $var logic 1 ) v_arru[1] $end
$var logic 1 * v_arru(2) $end $var logic 1 * v_arru[2] $end
$var logic 1 + v_arru_arru(3)(1) $end $var logic 1 + v_arru_arru[3][1] $end
$var logic 1 , v_arru_arru(3)(2) $end $var logic 1 , v_arru_arru[3][2] $end
$var logic 1 - v_arru_arru(4)(1) $end $var logic 1 - v_arru_arru[4][1] $end
$var logic 1 . v_arru_arru(4)(2) $end $var logic 1 . v_arru_arru[4][2] $end
$var logic 2 / v_arru_arrp(3) $end $var logic 2 / v_arru_arrp[3] $end
$var logic 2 0 v_arru_arrp(4) $end $var logic 2 0 v_arru_arrp[4] $end
$var logic 2 1 v_arru_strp(3) $end $var logic 2 1 v_arru_strp[3] $end
$var logic 2 2 v_arru_strp(4) $end $var logic 2 2 v_arru_strp[4] $end
$var real 64 3 v_real $end $var real 64 3 v_real $end
$var real 64 4 v_arr_real(0) $end $var real 64 4 v_arr_real[0] $end
$var real 64 5 v_arr_real(1) $end $var real 64 5 v_arr_real[1] $end
$var logic 64 6 v_str32x2 $end $var logic 64 6 v_str32x2 $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$attrbegin misc 07 "" 1 $end $attrbegin misc 07 "" 1 $end
@ -42,9 +42,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 9 v_enumb $end $var logic 3 9 v_enumb $end
$var logic 6 : v_enumb2_str $end $var logic 6 : v_enumb2_str $end
$var logic 8 ; unpacked_array(-2) $end $var logic 8 ; unpacked_array[-2] $end
$var logic 8 < unpacked_array(-1) $end $var logic 8 < unpacked_array[-1] $end
$var logic 8 = unpacked_array(0) $end $var logic 8 = unpacked_array[0] $end
$var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 ? b $end $var integer 32 ? b $end
@ -67,8 +67,8 @@ $var bit 1 D global_bit $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end
$dumpvars
#0 #0
$dumpvars
1D 1D
b00000000000000000000000000000100 C b00000000000000000000000000000100 C
b00000000000000000000000000000011 B b00000000000000000000000000000011 B
@ -105,6 +105,7 @@ b0000 $
b00 # b00 #
b00000000000000000000000000000000 " b00000000000000000000000000000000 "
0! 0!
$end
#10 #10
1! 1!
b00000000000000000000000000000001 " b00000000000000000000000000000001 "

35
test_regress/t/t_trace_complex_fst_sc.out
View File

@ -1,5 +1,5 @@
$date $date
Mon Apr 19 17:05:53 2021 Wed Aug 11 12:40:52 2021
$end $end
$version $version
@ -18,19 +18,19 @@ $var logic 2 % v_unip_strp $end
$var logic 2 & v_arrp $end $var logic 2 & v_arrp $end
$var logic 4 ' v_arrp_arrp $end $var logic 4 ' v_arrp_arrp $end
$var logic 4 ( v_arrp_strp $end $var logic 4 ( v_arrp_strp $end
$var logic 1 ) v_arru(1) $end $var logic 1 ) v_arru[1] $end
$var logic 1 * v_arru(2) $end $var logic 1 * v_arru[2] $end
$var logic 1 + v_arru_arru(3)(1) $end $var logic 1 + v_arru_arru[3][1] $end
$var logic 1 , v_arru_arru(3)(2) $end $var logic 1 , v_arru_arru[3][2] $end
$var logic 1 - v_arru_arru(4)(1) $end $var logic 1 - v_arru_arru[4][1] $end
$var logic 1 . v_arru_arru(4)(2) $end $var logic 1 . v_arru_arru[4][2] $end
$var logic 2 / v_arru_arrp(3) $end $var logic 2 / v_arru_arrp[3] $end
$var logic 2 0 v_arru_arrp(4) $end $var logic 2 0 v_arru_arrp[4] $end
$var logic 2 1 v_arru_strp(3) $end $var logic 2 1 v_arru_strp[3] $end
$var logic 2 2 v_arru_strp(4) $end $var logic 2 2 v_arru_strp[4] $end
$var real 64 3 v_real $end $var real 64 3 v_real $end
$var real 64 4 v_arr_real(0) $end $var real 64 4 v_arr_real[0] $end
$var real 64 5 v_arr_real(1) $end $var real 64 5 v_arr_real[1] $end
$var logic 64 6 v_str32x2 $end $var logic 64 6 v_str32x2 $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$attrbegin misc 07 "" 1 $end $attrbegin misc 07 "" 1 $end
@ -41,9 +41,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 9 v_enumb $end $var logic 3 9 v_enumb $end
$var logic 6 : v_enumb2_str $end $var logic 6 : v_enumb2_str $end
$var logic 8 ; unpacked_array(-2) $end $var logic 8 ; unpacked_array[-2] $end
$var logic 8 < unpacked_array(-1) $end $var logic 8 < unpacked_array[-1] $end
$var logic 8 = unpacked_array(0) $end $var logic 8 = unpacked_array[0] $end
$var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 ? b $end $var integer 32 ? b $end
@ -66,8 +66,8 @@ $var bit 1 D global_bit $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end
$dumpvars
#0 #0
$dumpvars
1D 1D
b00000000000000000000000000000100 C b00000000000000000000000000000100 C
b00000000000000000000000000000011 B b00000000000000000000000000000011 B
@ -104,6 +104,7 @@ b0000 $
b00 # b00 #
b00000000000000000000000000000000 " b00000000000000000000000000000000 "
0! 0!
$end
#10 #10
1! 1!
b00000000000000000000000000000001 " b00000000000000000000000000000001 "

8
test_regress/t/t_trace_complex_old_api.pl
View File

@ -28,10 +28,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

35
test_regress/t/t_trace_complex_params.out
View File

@ -1,7 +1,6 @@
$version Generated by VerilatedVcd $end $version Generated by VerilatedVcd $end
$date Mon Nov 16 17:51:08 2020 $date Wed Aug 11 12:41:11 2021 $end
$end $timescale 1ps $end
$timescale 1ps $end
$scope module top $end $scope module top $end
$var wire 1 = clk $end $var wire 1 = clk $end
@ -12,24 +11,24 @@ $timescale 1ps $end
$var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 G LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$var wire 1 = clk $end $var wire 1 = clk $end
$var wire 32 $ cyc [31:0] $end $var wire 32 $ cyc [31:0] $end
$var wire 8 E unpacked_array(-1) [7:0] $end $var wire 8 E unpacked_array[-1] [7:0] $end
$var wire 8 D unpacked_array(-2) [7:0] $end $var wire 8 D unpacked_array[-2] [7:0] $end
$var wire 8 F unpacked_array(0) [7:0] $end $var wire 8 F unpacked_array[0] [7:0] $end
$var real 64 1 v_arr_real(0) $end $var real 64 1 v_arr_real[0] $end
$var real 64 3 v_arr_real(1) $end $var real 64 3 v_arr_real[1] $end
$var wire 2 ( v_arrp [2:1] $end $var wire 2 ( v_arrp [2:1] $end
$var wire 4 ) v_arrp_arrp [3:0] $end $var wire 4 ) v_arrp_arrp [3:0] $end
$var wire 4 * v_arrp_strp [3:0] $end $var wire 4 * v_arrp_strp [3:0] $end
$var wire 1 > v_arru(1) $end $var wire 1 > v_arru[1] $end
$var wire 1 ? v_arru(2) $end $var wire 1 ? v_arru[2] $end
$var wire 2 + v_arru_arrp(3) [2:1] $end $var wire 2 + v_arru_arrp[3] [2:1] $end
$var wire 2 , v_arru_arrp(4) [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][1] $end
$var wire 1 A v_arru_arru(3)(2) $end $var wire 1 A v_arru_arru[3][2] $end
$var wire 1 B v_arru_arru(4)(1) $end $var wire 1 B v_arru_arru[4][1] $end
$var wire 1 C v_arru_arru(4)(2) $end $var wire 1 C v_arru_arru[4][2] $end
$var wire 2 - v_arru_strp(3) [1:0] $end $var wire 2 - v_arru_strp[3] [1:0] $end
$var wire 2 . v_arru_strp(4) [1:0] $end $var wire 2 . v_arru_strp[4] [1:0] $end
$var wire 3 9 v_enumb [2:0] $end $var wire 3 9 v_enumb [2:0] $end
$var wire 6 : v_enumb2_str [5:0] $end $var wire 6 : v_enumb2_str [5:0] $end
$var wire 32 7 v_enumed [31:0] $end $var wire 32 7 v_enumed [31:0] $end

35
test_regress/t/t_trace_complex_params_fst.out
View File

@ -1,5 +1,5 @@
$date $date
Mon Nov 16 17:51:08 2020 Wed Aug 11 12:41:14 2021
$end $end
$version $version
@ -19,19 +19,19 @@ $var logic 2 % v_unip_strp $end
$var logic 2 & v_arrp $end $var logic 2 & v_arrp $end
$var logic 4 ' v_arrp_arrp $end $var logic 4 ' v_arrp_arrp $end
$var logic 4 ( v_arrp_strp $end $var logic 4 ( v_arrp_strp $end
$var logic 1 ) v_arru(1) $end $var logic 1 ) v_arru[1] $end
$var logic 1 * v_arru(2) $end $var logic 1 * v_arru[2] $end
$var logic 1 + v_arru_arru(3)(1) $end $var logic 1 + v_arru_arru[3][1] $end
$var logic 1 , v_arru_arru(3)(2) $end $var logic 1 , v_arru_arru[3][2] $end
$var logic 1 - v_arru_arru(4)(1) $end $var logic 1 - v_arru_arru[4][1] $end
$var logic 1 . v_arru_arru(4)(2) $end $var logic 1 . v_arru_arru[4][2] $end
$var logic 2 / v_arru_arrp(3) $end $var logic 2 / v_arru_arrp[3] $end
$var logic 2 0 v_arru_arrp(4) $end $var logic 2 0 v_arru_arrp[4] $end
$var logic 2 1 v_arru_strp(3) $end $var logic 2 1 v_arru_strp[3] $end
$var logic 2 2 v_arru_strp(4) $end $var logic 2 2 v_arru_strp[4] $end
$var real 64 3 v_real $end $var real 64 3 v_real $end
$var real 64 4 v_arr_real(0) $end $var real 64 4 v_arr_real[0] $end
$var real 64 5 v_arr_real(1) $end $var real 64 5 v_arr_real[1] $end
$var logic 64 6 v_str32x2 $end $var logic 64 6 v_str32x2 $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$attrbegin misc 07 "" 1 $end $attrbegin misc 07 "" 1 $end
@ -42,9 +42,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 9 v_enumb $end $var logic 3 9 v_enumb $end
$var logic 6 : v_enumb2_str $end $var logic 6 : v_enumb2_str $end
$var logic 8 ; unpacked_array(-2) $end $var logic 8 ; unpacked_array[-2] $end
$var logic 8 < unpacked_array(-1) $end $var logic 8 < unpacked_array[-1] $end
$var logic 8 = unpacked_array(0) $end $var logic 8 = unpacked_array[0] $end
$var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 ? b $end $var integer 32 ? b $end
@ -67,8 +67,8 @@ $var bit 1 D global_bit $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end
$dumpvars
#0 #0
$dumpvars
1D 1D
b00000000000000000000000000000100 C b00000000000000000000000000000100 C
b00000000000000000000000000000011 B b00000000000000000000000000000011 B
@ -105,6 +105,7 @@ b0000 $
b00 # b00 #
b00000000000000000000000000000000 " b00000000000000000000000000000000 "
0! 0!
$end
#10 #10
1! 1!
b00000000000000000000000000000001 " b00000000000000000000000000000001 "

35
test_regress/t/t_trace_complex_params_fst_sc.out
View File

@ -1,5 +1,5 @@
$date $date
Mon Apr 19 17:07:10 2021 Wed Aug 11 12:41:17 2021
$end $end
$version $version
@ -18,19 +18,19 @@ $var logic 2 % v_unip_strp $end
$var logic 2 & v_arrp $end $var logic 2 & v_arrp $end
$var logic 4 ' v_arrp_arrp $end $var logic 4 ' v_arrp_arrp $end
$var logic 4 ( v_arrp_strp $end $var logic 4 ( v_arrp_strp $end
$var logic 1 ) v_arru(1) $end $var logic 1 ) v_arru[1] $end
$var logic 1 * v_arru(2) $end $var logic 1 * v_arru[2] $end
$var logic 1 + v_arru_arru(3)(1) $end $var logic 1 + v_arru_arru[3][1] $end
$var logic 1 , v_arru_arru(3)(2) $end $var logic 1 , v_arru_arru[3][2] $end
$var logic 1 - v_arru_arru(4)(1) $end $var logic 1 - v_arru_arru[4][1] $end
$var logic 1 . v_arru_arru(4)(2) $end $var logic 1 . v_arru_arru[4][2] $end
$var logic 2 / v_arru_arrp(3) $end $var logic 2 / v_arru_arrp[3] $end
$var logic 2 0 v_arru_arrp(4) $end $var logic 2 0 v_arru_arrp[4] $end
$var logic 2 1 v_arru_strp(3) $end $var logic 2 1 v_arru_strp[3] $end
$var logic 2 2 v_arru_strp(4) $end $var logic 2 2 v_arru_strp[4] $end
$var real 64 3 v_real $end $var real 64 3 v_real $end
$var real 64 4 v_arr_real(0) $end $var real 64 4 v_arr_real[0] $end
$var real 64 5 v_arr_real(1) $end $var real 64 5 v_arr_real[1] $end
$var logic 64 6 v_str32x2 $end $var logic 64 6 v_str32x2 $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$attrbegin misc 07 "" 1 $end $attrbegin misc 07 "" 1 $end
@ -41,9 +41,9 @@ $attrbegin misc 07 t.enumb_t 4 BZERO BONE BTWO BTHREE 000 001 010 011 2 $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 9 v_enumb $end $var logic 3 9 v_enumb $end
$var logic 6 : v_enumb2_str $end $var logic 6 : v_enumb2_str $end
$var logic 8 ; unpacked_array(-2) $end $var logic 8 ; unpacked_array[-2] $end
$var logic 8 < unpacked_array(-1) $end $var logic 8 < unpacked_array[-1] $end
$var logic 8 = unpacked_array(0) $end $var logic 8 = unpacked_array[0] $end
$var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 > LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 ? b $end $var integer 32 ? b $end
@ -66,8 +66,8 @@ $var bit 1 D global_bit $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end
$dumpvars
#0 #0
$dumpvars
1D 1D
b00000000000000000000000000000100 C b00000000000000000000000000000100 C
b00000000000000000000000000000011 B b00000000000000000000000000000011 B
@ -104,6 +104,7 @@ b0000 $
b00 # b00 #
b00000000000000000000000000000000 " b00000000000000000000000000000000 "
0! 0!
$end
#10 #10
1! 1!
b00000000000000000000000000000001 " b00000000000000000000000000000001 "

8
test_regress/t/t_trace_complex_portable.pl
View File

@ -28,10 +28,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

57
test_regress/t/t_trace_complex_structs.out
View File

@ -1,7 +1,6 @@
$version Generated by VerilatedVcd $end $version Generated by VerilatedVcd $end
$date Mon Nov 16 17:51:09 2020 $date Wed Aug 11 12:41:22 2021 $end
$end $timescale 1ps $end
$timescale 1ps $end
$scope module top $end $scope module top $end
$var wire 1 I clk $end $var wire 1 I clk $end
@ -12,22 +11,22 @@ $timescale 1ps $end
$var wire 1 S LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var wire 1 S LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$var wire 1 I clk $end $var wire 1 I clk $end
$var wire 32 $ cyc [31:0] $end $var wire 32 $ cyc [31:0] $end
$var wire 8 Q unpacked_array(-1) [7:0] $end $var wire 8 Q unpacked_array[-1] [7:0] $end
$var wire 8 P unpacked_array(-2) [7:0] $end $var wire 8 P unpacked_array[-2] [7:0] $end
$var wire 8 R unpacked_array(0) [7:0] $end $var wire 8 R unpacked_array[0] [7:0] $end
$var real 64 < v_arr_real(0) $end $var real 64 < v_arr_real[0] $end
$var real 64 > v_arr_real(1) $end $var real 64 > v_arr_real[1] $end
$var wire 2 - v_arrp [2:1] $end $var wire 2 - v_arrp [2:1] $end
$var wire 2 . v_arrp_arrp(3) [2:1] $end $var wire 2 . v_arrp_arrp[3] [2:1] $end
$var wire 2 / v_arrp_arrp(4) [2:1] $end $var wire 2 / v_arrp_arrp[4] [2:1] $end
$var wire 1 J v_arru(1) $end $var wire 1 J v_arru[1] $end
$var wire 1 K v_arru(2) $end $var wire 1 K v_arru[2] $end
$var wire 2 4 v_arru_arrp(3) [2:1] $end $var wire 2 4 v_arru_arrp[3] [2:1] $end
$var wire 2 5 v_arru_arrp(4) [2:1] $end $var wire 2 5 v_arru_arrp[4] [2:1] $end
$var wire 1 L v_arru_arru(3)(1) $end $var wire 1 L v_arru_arru[3][1] $end
$var wire 1 M v_arru_arru(3)(2) $end $var wire 1 M v_arru_arru[3][2] $end
$var wire 1 N v_arru_arru(4)(1) $end $var wire 1 N v_arru_arru[4][1] $end
$var wire 1 O v_arru_arru(4)(2) $end $var wire 1 O v_arru_arru[4][2] $end
$var wire 3 D v_enumb [2:0] $end $var wire 3 D v_enumb [2:0] $end
$var wire 32 B v_enumed [31:0] $end $var wire 32 B v_enumed [31:0] $end
$var wire 32 C v_enumed2 [31:0] $end $var wire 32 C v_enumed2 [31:0] $end
@ -38,19 +37,19 @@ $timescale 1ps $end
$var wire 32 H a [31:0] $end $var wire 32 H a [31:0] $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$scope struct v_arrp_strp(3) $end $scope struct v_arrp_strp[3] $end
$var wire 1 1 b0 $end $var wire 1 1 b0 $end
$var wire 1 0 b1 $end $var wire 1 0 b1 $end
$upscope $end $upscope $end
$scope struct v_arrp_strp(4) $end $scope struct v_arrp_strp[4] $end
$var wire 1 3 b0 $end $var wire 1 3 b0 $end
$var wire 1 2 b1 $end $var wire 1 2 b1 $end
$upscope $end $upscope $end
$scope struct v_arru_strp(3) $end $scope struct v_arru_strp[3] $end
$var wire 1 7 b0 $end $var wire 1 7 b0 $end
$var wire 1 6 b1 $end $var wire 1 6 b1 $end
$upscope $end $upscope $end
$scope struct v_arru_strp(4) $end $scope struct v_arru_strp[4] $end
$var wire 1 9 b0 $end $var wire 1 9 b0 $end
$var wire 1 8 b1 $end $var wire 1 8 b1 $end
$upscope $end $upscope $end
@ -58,16 +57,12 @@ $timescale 1ps $end
$var wire 3 E a [2:0] $end $var wire 3 E a [2:0] $end
$var wire 3 F b [2:0] $end $var wire 3 F b [2:0] $end
$upscope $end $upscope $end
$scope struct v_str32x2(0) $end $scope struct v_str32x2[0] $end
$var wire 32 @ data [31:0] $end $var wire 32 @ data [31:0] $end
$upscope $end $upscope $end
$scope struct v_str32x2(1) $end $scope struct v_str32x2[1] $end
$var wire 32 A data [31:0] $end $var wire 32 A data [31:0] $end
$upscope $end $upscope $end
$scope struct v_strp $end
$var wire 1 & b0 $end
$var wire 1 % b1 $end
$upscope $end
$scope struct v_strp_strp $end $scope struct v_strp_strp $end
$scope struct x0 $end $scope struct x0 $end
$var wire 1 * b0 $end $var wire 1 * b0 $end
@ -78,7 +73,11 @@ $timescale 1ps $end
$var wire 1 ' b1 $end $var wire 1 ' b1 $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$scope struct v_unip_strp $end $scope struct v_strp $end
$var wire 1 & b0 $end
$var wire 1 % b1 $end
$upscope $end
$scope union v_unip_strp $end
$scope struct x0 $end $scope struct x0 $end
$var wire 1 , b0 $end $var wire 1 , b0 $end
$var wire 1 + b1 $end $var wire 1 + b1 $end

8
test_regress/t/t_trace_complex_structs.pl
View File

@ -25,10 +25,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

44
test_regress/t/t_trace_complex_structs_fst.out
View File

@ -1,5 +1,5 @@
$date $date
Mon Nov 16 17:51:13 2020 Wed Aug 11 12:41:25 2021
$end $end
$version $version
@ -38,39 +38,39 @@ $var logic 1 * b0 $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$var logic 2 + v_arrp $end $var logic 2 + v_arrp $end
$var logic 2 , v_arrp_arrp(3) $end $var logic 2 , v_arrp_arrp[3] $end
$var logic 2 - v_arrp_arrp(4) $end $var logic 2 - v_arrp_arrp[4] $end
$scope struct v_arrp_strp(3) $end $scope struct v_arrp_strp[3] $end
$var logic 1 . b1 $end $var logic 1 . b1 $end
$var logic 1 / b0 $end $var logic 1 / b0 $end
$upscope $end $upscope $end
$scope struct v_arrp_strp(4) $end $scope struct v_arrp_strp[4] $end
$var logic 1 0 b1 $end $var logic 1 0 b1 $end
$var logic 1 1 b0 $end $var logic 1 1 b0 $end
$upscope $end $upscope $end
$var logic 1 2 v_arru(1) $end $var logic 1 2 v_arru[1] $end
$var logic 1 3 v_arru(2) $end $var logic 1 3 v_arru[2] $end
$var logic 1 4 v_arru_arru(3)(1) $end $var logic 1 4 v_arru_arru[3][1] $end
$var logic 1 5 v_arru_arru(3)(2) $end $var logic 1 5 v_arru_arru[3][2] $end
$var logic 1 6 v_arru_arru(4)(1) $end $var logic 1 6 v_arru_arru[4][1] $end
$var logic 1 7 v_arru_arru(4)(2) $end $var logic 1 7 v_arru_arru[4][2] $end
$var logic 2 8 v_arru_arrp(3) $end $var logic 2 8 v_arru_arrp[3] $end
$var logic 2 9 v_arru_arrp(4) $end $var logic 2 9 v_arru_arrp[4] $end
$scope struct v_arru_strp(3) $end $scope struct v_arru_strp[3] $end
$var logic 1 : b1 $end $var logic 1 : b1 $end
$var logic 1 ; b0 $end $var logic 1 ; b0 $end
$upscope $end $upscope $end
$scope struct v_arru_strp(4) $end $scope struct v_arru_strp[4] $end
$var logic 1 < b1 $end $var logic 1 < b1 $end
$var logic 1 = b0 $end $var logic 1 = b0 $end
$upscope $end $upscope $end
$var real 64 > v_real $end $var real 64 > v_real $end
$var real 64 ? v_arr_real(0) $end $var real 64 ? v_arr_real[0] $end
$var real 64 @ v_arr_real(1) $end $var real 64 @ v_arr_real[1] $end
$scope struct v_str32x2(0) $end $scope struct v_str32x2[0] $end
$var logic 32 A data $end $var logic 32 A data $end
$upscope $end $upscope $end
$scope struct v_str32x2(1) $end $scope struct v_str32x2[1] $end
$var logic 32 B data $end $var logic 32 B data $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$upscope $end $upscope $end
@ -87,9 +87,9 @@ $var logic 3 F a $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 G b $end $var logic 3 G b $end
$upscope $end $upscope $end
$var logic 8 H unpacked_array(-2) $end $var logic 8 H unpacked_array[-2] $end
$var logic 8 I unpacked_array(-1) $end $var logic 8 I unpacked_array[-1] $end
$var logic 8 J unpacked_array(0) $end $var logic 8 J unpacked_array[0] $end
$var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 L b $end $var integer 32 L b $end

44
test_regress/t/t_trace_complex_structs_fst_sc.out
View File

@ -1,5 +1,5 @@
$date $date
Thu Apr 1 15:22:14 2021 Wed Aug 11 12:41:29 2021
$end $end
$version $version
@ -37,39 +37,39 @@ $var logic 1 * b0 $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$var logic 2 + v_arrp $end $var logic 2 + v_arrp $end
$var logic 2 , v_arrp_arrp(3) $end $var logic 2 , v_arrp_arrp[3] $end
$var logic 2 - v_arrp_arrp(4) $end $var logic 2 - v_arrp_arrp[4] $end
$scope struct v_arrp_strp(3) $end $scope struct v_arrp_strp[3] $end
$var logic 1 . b1 $end $var logic 1 . b1 $end
$var logic 1 / b0 $end $var logic 1 / b0 $end
$upscope $end $upscope $end
$scope struct v_arrp_strp(4) $end $scope struct v_arrp_strp[4] $end
$var logic 1 0 b1 $end $var logic 1 0 b1 $end
$var logic 1 1 b0 $end $var logic 1 1 b0 $end
$upscope $end $upscope $end
$var logic 1 2 v_arru(1) $end $var logic 1 2 v_arru[1] $end
$var logic 1 3 v_arru(2) $end $var logic 1 3 v_arru[2] $end
$var logic 1 4 v_arru_arru(3)(1) $end $var logic 1 4 v_arru_arru[3][1] $end
$var logic 1 5 v_arru_arru(3)(2) $end $var logic 1 5 v_arru_arru[3][2] $end
$var logic 1 6 v_arru_arru(4)(1) $end $var logic 1 6 v_arru_arru[4][1] $end
$var logic 1 7 v_arru_arru(4)(2) $end $var logic 1 7 v_arru_arru[4][2] $end
$var logic 2 8 v_arru_arrp(3) $end $var logic 2 8 v_arru_arrp[3] $end
$var logic 2 9 v_arru_arrp(4) $end $var logic 2 9 v_arru_arrp[4] $end
$scope struct v_arru_strp(3) $end $scope struct v_arru_strp[3] $end
$var logic 1 : b1 $end $var logic 1 : b1 $end
$var logic 1 ; b0 $end $var logic 1 ; b0 $end
$upscope $end $upscope $end
$scope struct v_arru_strp(4) $end $scope struct v_arru_strp[4] $end
$var logic 1 < b1 $end $var logic 1 < b1 $end
$var logic 1 = b0 $end $var logic 1 = b0 $end
$upscope $end $upscope $end
$var real 64 > v_real $end $var real 64 > v_real $end
$var real 64 ? v_arr_real(0) $end $var real 64 ? v_arr_real[0] $end
$var real 64 @ v_arr_real(1) $end $var real 64 @ v_arr_real[1] $end
$scope struct v_str32x2(0) $end $scope struct v_str32x2[0] $end
$var logic 32 A data $end $var logic 32 A data $end
$upscope $end $upscope $end
$scope struct v_str32x2(1) $end $scope struct v_str32x2[1] $end
$var logic 32 B data $end $var logic 32 B data $end
$attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end $attrbegin misc 07 t.enumed_t 4 ZERO ONE TWO THREE 00000000000000000000000000000000 00000000000000000000000000000001 00000000000000000000000000000010 00000000000000000000000000000011 1 $end
$upscope $end $upscope $end
@ -86,9 +86,9 @@ $var logic 3 F a $end
$attrbegin misc 07 "" 2 $end $attrbegin misc 07 "" 2 $end
$var logic 3 G b $end $var logic 3 G b $end
$upscope $end $upscope $end
$var logic 8 H unpacked_array(-2) $end $var logic 8 H unpacked_array[-2] $end
$var logic 8 I unpacked_array(-1) $end $var logic 8 I unpacked_array[-1] $end
$var logic 8 J unpacked_array(0) $end $var logic 8 J unpacked_array[0] $end
$var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end $var bit 1 K LONGSTART_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_a_very_long_name_which_will_get_hashed_LONGEND $end
$scope module unnamedblk1 $end $scope module unnamedblk1 $end
$var integer 32 L b $end $var integer 32 L b $end

8
test_regress/t/t_trace_complex_threads_1.pl
View File

@ -26,10 +26,10 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/); file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

428
test_regress/t/t_trace_fst.out
View File

File diff suppressed because it is too large Load Diff

428
test_regress/t/t_trace_fst_cmake.out
View File

File diff suppressed because it is too large Load Diff

8
test_regress/t/t_trace_fst_sc.out
View File

@ -1,5 +1,5 @@
$date $date
Thu Apr 1 14:28:55 2021 Wed Aug 11 00:05:19 2021
$end $end
$version $version
@ -37,9 +37,9 @@ $var wire 1 ! clk $end
$var wire 1 # rstn $end $var wire 1 # rstn $end
$var wire 5 5 state $end $var wire 5 5 state $end
$var logic 5 6 state_w $end $var logic 5 6 state_w $end
$var logic 5 7 state_array(0) $end $var logic 5 7 state_array[0] $end
$var logic 5 8 state_array(1) $end $var logic 5 8 state_array[1] $end
$var logic 5 9 state_array(2) $end $var logic 5 9 state_array[2] $end
$scope module unnamedblk2 $end $scope module unnamedblk2 $end
$var int 32 : i $end $var int 32 : i $end
$upscope $end $upscope $end

8
test_regress/t/t_trace_fst_sc_cmake.out
View File

@ -1,5 +1,5 @@
$date $date
Thu Apr 1 14:28:55 2021 Wed Aug 11 02:14:06 2021
$end $end
$version $version
@ -37,9 +37,9 @@ $var wire 1 ! clk $end
$var wire 1 # rstn $end $var wire 1 # rstn $end
$var wire 5 5 state $end $var wire 5 5 state $end
$var logic 5 6 state_w $end $var logic 5 6 state_w $end
$var logic 5 7 state_array(0) $end $var logic 5 7 state_array[0] $end
$var logic 5 8 state_array(1) $end $var logic 5 8 state_array[1] $end
$var logic 5 9 state_array(2) $end $var logic 5 9 state_array[2] $end
$scope module unnamedblk2 $end $scope module unnamedblk2 $end
$var int 32 : i $end $var int 32 : i $end
$upscope $end $upscope $end

20
test_regress/t/t_trace_packed_struct_fst.out
View File

@ -1,5 +1,5 @@
$date $date
Sun Apr 19 04:15:38 2020 Wed Aug 11 12:42:37 2021
$end $end
$version $version
@ -13,21 +13,23 @@ $var wire 1 ! clk $end
$scope module t $end $scope module t $end
$var wire 1 ! clk $end $var wire 1 ! clk $end
$var int 32 " cnt $end $var int 32 " cnt $end
$var parameter 96 # v(0) $end $var parameter 96 # v[0] $end
$var parameter 96 $ v(1) $end $var parameter 96 $ v[1] $end
$var parameter 96 % v(2) $end $var parameter 96 % v[2] $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end
#0
$dumpvars $dumpvars
0!
b00000000000000000000000000000000 "
b001100000000000000000000000000100011000000000000000000000000000100110000000000000000000000000000 #
b001000000000000000000000000000100010000000000000000000000000000100100000000000000000000000000000 $
b000100000000000000000000000000100001000000000000000000000000000100010000000000000000000000000000 % b000100000000000000000000000000100001000000000000000000000000000100010000000000000000000000000000 %
b001000000000000000000000000000100010000000000000000000000000000100100000000000000000000000000000 $
b001100000000000000000000000000100011000000000000000000000000000100110000000000000000000000000000 #
b00000000000000000000000000000000 "
0!
$end
#10 #10
b00000000000000000000000000000001 "
1! 1!
b00000000000000000000000000000001 "
#15 #15
0! 0!
#20 #20

8
test_regress/t/t_trace_packed_struct_fst_sc.out
View File

@ -1,5 +1,5 @@
$date $date
Thu Apr 1 15:33:45 2021 Wed Aug 11 12:42:40 2021
$end $end
$version $version
@ -12,9 +12,9 @@ $scope module top $end
$scope module t $end $scope module t $end
$var wire 1 ! clk $end $var wire 1 ! clk $end
$var int 32 " cnt $end $var int 32 " cnt $end
$var parameter 96 # v(0) $end $var parameter 96 # v[0] $end
$var parameter 96 $ v(1) $end $var parameter 96 $ v[1] $end
$var parameter 96 % v(2) $end $var parameter 96 % v[2] $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$enddefinitions $end $enddefinitions $end

111
test_regress/t/t_trace_public.out
View File

@ -1,31 +1,30 @@
$version Generated by SpTraceVcd $end $version Generated by VerilatedVcd $end
$date Tue Nov 3 09:34:23 2009 $date Tue Aug 10 15:49:51 2021 $end
$end
$timescale 1ps $end $timescale 1ps $end
$scope module top $end $scope module top $end
$var wire 1 6 CLK $end $var wire 1 5 CLK $end
$var wire 1 7 RESET $end $var wire 1 6 RESET $end
$scope module t $end $scope module t $end
$var wire 1 6 CLK $end $var wire 1 5 CLK $end
$var wire 1 # RESET $end $var wire 1 # RESET $end
$var wire 32 $ val [31:0] $end $var wire 32 & val [31:0] $end
$var wire 2 3 vec(3) [2:1] $end $var wire 2 $ vec[3] [2:1] $end
$var wire 2 4 vec(4) [2:1] $end $var wire 2 % vec[4] [2:1] $end
$scope module glbl $end $scope module glbl $end
$var wire 1 5 GSR $end $var wire 1 7 GSR $end
$upscope $end $upscope $end
$scope module little $end $scope module little $end
$var wire 1 6 clk $end $var wire 1 5 clk $end
$var wire 128 / i128 [63:190] $end $var wire 128 1 i128 [63:190] $end
$var wire 49 - i48 [1:49] $end $var wire 49 / i48 [1:49] $end
$var wire 8 , i8 [0:7] $end $var wire 8 . i8 [0:7] $end
$upscope $end $upscope $end
$scope module neg $end $scope module neg $end
$var wire 1 6 clk $end $var wire 1 5 clk $end
$var wire 128 ( i128 [63:-64] $end $var wire 128 * i128 [63:-64] $end
$var wire 48 & i48 [-1:-48] $end $var wire 48 ( i48 [-1:-48] $end
$var wire 8 % i8 [0:-7] $end $var wire 8 ' i8 [0:-7] $end
$upscope $end $upscope $end
$upscope $end $upscope $end
$upscope $end $upscope $end
@ -34,63 +33,63 @@ $enddefinitions $end
#0 #0
1# 1#
b00000000000000000000000000000000 $ b00 $
b00000000 % b00 %
b000000000000000000000000000000000000000000000000 & b00000000000000000000000000000000 &
b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 ( b00000000 '
b00000000 , b000000000000000000000000000000000000000000000000 (
b0000000000000000000000000000000000000000000000000 - b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 *
b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 / b00000000 .
b00 3 b0000000000000000000000000000000000000000000000000 /
b00 4 b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 1
15 05
16
17 17
06
#1 #1
#2 #2
#3 #3
b11111111 % b11111111 '
b111111111111111111111111111111111111111111111111 & b111111111111111111111111111111111111111111111111 (
b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 ( b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 *
b11111111 , b11111111 .
b1111111111111111111111111111111111111111111111111 - b1111111111111111111111111111111111111111111111111 /
b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 / b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 1
16 15
#4 #4
#5 #5
#6 #6
06
#7
05 05
#7
07
#8 #8
#9 #9
0# 0#
b00000000 % b00000000 '
b000000000000000000000000000000000000000000000000 & b000000000000000000000000000000000000000000000000 (
b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 ( b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 *
b00000000 , b00000000 .
b0000000000000000000000000000000000000000000000000 - b0000000000000000000000000000000000000000000000000 /
b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 / b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 1
07 15
16 06
#10 #10
#11 #11
#12 #12
06 05
#13 #13
#14 #14
#15 #15
b00000000000000000000000000000001 $ b00000000000000000000000000000001 &
b11111111 % b11111111 '
b111111111111111111111111111111111111111111111111 & b111111111111111111111111111111111111111111111111 (
b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 ( b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 *
b11111111 , b11111111 .
b1111111111111111111111111111111111111111111111111 - b1111111111111111111111111111111111111111111111111 /
b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 / b11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 1
16 15
#16 #16
#17 #17
#18 #18
06 05
#19 #19
#20 #20