From 8b40d7a407533821f423f4ccf2580aea62f64774 Mon Sep 17 00:00:00 2001 From: Matthew Ballance Date: Fri, 27 Mar 2026 00:43:03 +0000 Subject: [PATCH] Update t_vlcov_covergroup to produce its own data instead of relying on a cached file Signed-off-by: Matthew Ballance --- test_regress/t/t_vlcov_covergroup.out | 35 +++++++++++----------- test_regress/t/t_vlcov_covergroup.py | 21 +++++++++++-- test_regress/t/t_vlcov_covergroup_data.dat | 10 ------- 3 files changed, 36 insertions(+), 30 deletions(-) delete mode 100644 test_regress/t/t_vlcov_covergroup_data.dat diff --git a/test_regress/t/t_vlcov_covergroup.out b/test_regress/t/t_vlcov_covergroup.out index dcbd99805..e0eae46f8 100644 --- a/test_regress/t/t_vlcov_covergroup.out +++ b/test_regress/t/t_vlcov_covergroup.out @@ -1,31 +1,30 @@ COVERGROUP COVERAGE REPORT ========================== -TOTAL: 3/6 bins covered (50.00%) - (1 ignored, 1 illegal) +TOTAL: 8/8 bins covered (100.00%) ------------------------------------------------------------------------------ -Covergroup Type: mycg [t/t_vlcov_covergroup_data.dat:10] - Type Coverage: 3/6 bins (50.00%) +Covergroup Type: cg [t/t_covergroup_cross_simple.v:15] + Type Coverage: 8/8 bins (100.00%) - Coverpoint: cp_b - Coverage: 1/1 bins (100.00%) + Coverpoint: cp_addr + Coverage: 2/2 bins (100.00%) Bins: - IGNORE b_skip 1 hits - ILLEGAL b_bad 0 hits - COVERED b0 2 hits + COVERED addr0 2 hits + COVERED addr1 2 hits - Cross: cp_a_x_cp_b - Coverage: 1/3 bins (33.33%) + Coverpoint: cp_cmd + Coverage: 2/2 bins (100.00%) Bins: - ZERO high_x_b0 0 hits - COVERED low_x_b0 2 hits - ZERO low_x_b_skip 0 hits + COVERED read 2 hits + COVERED write 2 hits - Coverpoint: cp_a - Coverage: 1/2 bins (50.00%) + Cross: addr_cmd + Coverage: 4/4 bins (100.00%) Bins: - COVERED low 3 hits - ZERO high 0 hits + COVERED addr0_x_read 1 hits + COVERED addr0_x_write 1 hits + COVERED addr1_x_read 1 hits + COVERED addr1_x_write 1 hits ------------------------------------------------------------------------------ diff --git a/test_regress/t/t_vlcov_covergroup.py b/test_regress/t/t_vlcov_covergroup.py index 055286679..1736f22dc 100755 --- a/test_regress/t/t_vlcov_covergroup.py +++ b/test_regress/t/t_vlcov_covergroup.py @@ -10,12 +10,18 @@ import vltest_bootstrap -test.scenarios('dist') +test.scenarios('vlt') + +test.top_filename = "t/t_covergroup_cross_simple.v" + +test.compile(verilator_flags2=['--coverage']) + +test.execute() test.run(cmd=[ os.environ["VERILATOR_ROOT"] + "/bin/verilator_coverage", "--covergroup", - test.t_dir + "/t_vlcov_covergroup_data.dat", + test.obj_dir + "/coverage.dat", ], logfile=test.obj_dir + "/covergroup.log", tee=False, @@ -23,4 +29,15 @@ test.run(cmd=[ test.files_identical(test.obj_dir + "/covergroup.log", test.golden_filename) +test.run(cmd=[ + os.environ["VERILATOR_ROOT"] + "/bin/verilator_coverage", + "--annotate", + test.obj_dir + "/annotated", + test.obj_dir + "/coverage.dat", +], + verilator_run=True) + +test.files_identical(test.obj_dir + "/annotated/t_covergroup_cross_simple.v", + "t/" + test.name + ".annotate.out") + test.passes() diff --git a/test_regress/t/t_vlcov_covergroup_data.dat b/test_regress/t/t_vlcov_covergroup_data.dat deleted file mode 100644 index 0e742db1e..000000000 --- a/test_regress/t/t_vlcov_covergroup_data.dat +++ /dev/null @@ -1,10 +0,0 @@ -# SystemC::Coverage-3 -C 'tlinepagev_line/tft/t_vlcov_covergroup_data.datl10htop.t' 5 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl5n4binlowhmycg.cp_a.low' 3 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl6n4binhighhmycg.cp_a.high' 0 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl9n4binb0hmycg.cp_b.b0' 2 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl10n4binb_skipbin_typeignorehmycg.cp_b.b_skip' 1 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl11n4binb_badbin_typeillegalhmycg.cp_b.b_bad' 0 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl13n7binlow_x_b0cross1hmycg.cp_a_x_cp_b.low_x_b0' 2 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl13n7binhigh_x_b0cross1hmycg.cp_a_x_cp_b.high_x_b0' 0 -C 'tcovergrouppagev_covergroup/mycgft/t_vlcov_covergroup_data.datl13n7binlow_x_b_skipcross1hmycg.cp_a_x_cp_b.low_x_b_skip' 0