asolkar/axipg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup in script and trace workaround file

Browse Source
This commit is contained in:
Mahesh Asolkar
2025-08-24 21:02:01 -07:00
parent 5451131e1a
commit 4efbada1d8
2 changed files with 135 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/gen_axi_intf.pl
View File

@@ -2,14 +2,27 @@
use strict;
use warnings;
use Data::Dumper;
use Getopt::Long;
my $app = {};
$app->{'cfg'}->{'gen_intf'} = 0;
$app->{'cfg'}->{'gen_trace_wa'} = 0;
GetOptions("gen_intf" => \$app->{'cfg'}->{'gen_intf'},
"gen_trace_wa" => \$app->{'cfg'}->{'gen_trace_wa'});
get_axi_intf_data($app);
augment_intf_data($app);
#print Dumper($app->{'intf_data'}); # Debugging output
gen_intf($app);
if ($app->{'cfg'}->{'gen_intf'}) {
gen_intf($app);
}
if ($app->{'cfg'}->{'gen_trace_wa'}) {
show_trace_interface_driver($app);
}
# -----------------
# Subroutines
@@ -38,8 +51,6 @@ sub gen_intf {
show_modport($app, 'Subordinate');
print "endinterface // axi_intf\n";
show_trace_interface_driver($app);
}
# -----------------
@@ -94,10 +105,11 @@ sub show_interface {
sub show_trace_interface_driver {
my ($app) = @_;
print qq{
`ifdef VERI_TRACE_EN
print qq{`ifdef VERI_TRACE_EN
// --------------------------------------------------
// Work around Verilator's lack of support for virutal interface tracing
// Work around Verilator's lack of support for virutal interface tracing:
// Issue #5044: Wires driven through virtual interface traced improperly
// https://github.com/verilator/verilator/issues/5044
`AXI_INTF t_if (.ACLK(clk), .ARESETn(rst_n));
};
foreach my $section (@{$app->{'intf_data'}->{'sections'}}) {
@@ -105,12 +117,16 @@ sub show_trace_interface_driver {
# Display signals
foreach my $signal (@{$section->{'signals'}}) {
my $line = "";
if ($signal->{'s'} eq 'External') {
printf " // External signal: %-$app->{'intf_data'}->{'info'}->{'sig_width'}s // $signal->{'d'} [$signal->{'s'}]\n",
$line = sprintf " // External signal: %-$app->{'intf_data'}->{'info'}->{'sig_width'}s // $signal->{'d'} [$signal->{'s'}]",
"$signal->{'n'};";
} else {
printf " always @(a_if.$signal->{'n'}) t_if.$signal->{'n'} <= a_if.$signal->{'n'};\n";
$line = sprintf " always @(a_if.%-$app->{'intf_data'}->{'info'}->{'sig_width'}s t_if.%-$app->{'intf_data'}->{'info'}->{'sig_width'}s <= a_if.%-$app->{'intf_data'}->{'info'}->{'sig_width'}s",
"$signal->{'n'})", $signal->{'n'}, "$signal->{'n'};";
}
$line =~ s/\s+$//;
print "$line\n";
}
}

222
tb/verilator_trace_workaround.svh
View File

@@ -1,124 +1,124 @@
// Issue #5044: Wires driven through virtual interface traced improperly
// https://github.com/verilator/verilator/issues/5044
`ifdef VERI_TRACE_EN
// --------------------------------------------------
// Work around Verilator's lack of support for virutal interface tracing
// Work around Verilator's lack of support for virutal interface tracing:
// Issue #5044: Wires driven through virtual interface traced improperly
// https://github.com/verilator/verilator/issues/5044
`AXI_INTF t_if (.ACLK(clk), .ARESETn(rst_n));
// A2.4.1 Clock and reset signals
// External signal: ACLK; // External Global clock signal [External]
// External signal: ARESETn; // External Global reset signal [External]
// A2.1.1 Write request channel
always @(a_if.AWVALID) t_if.AWVALID <= a_if.AWVALID;
always @(a_if.AWREADY) t_if.AWREADY <= a_if.AWREADY;
always @(a_if.AWID) t_if.AWID <= a_if.AWID;
always @(a_if.AWADDR) t_if.AWADDR <= a_if.AWADDR;
always @(a_if.AWREGION) t_if.AWREGION <= a_if.AWREGION;
always @(a_if.AWLEN) t_if.AWLEN <= a_if.AWLEN;
always @(a_if.AWSIZE) t_if.AWSIZE <= a_if.AWSIZE;
always @(a_if.AWBURST) t_if.AWBURST <= a_if.AWBURST;
always @(a_if.AWLOCK) t_if.AWLOCK <= a_if.AWLOCK;
always @(a_if.AWCACHE) t_if.AWCACHE <= a_if.AWCACHE;
always @(a_if.AWPROT) t_if.AWPROT <= a_if.AWPROT;
always @(a_if.AWNSE) t_if.AWNSE <= a_if.AWNSE;
always @(a_if.AWQOS) t_if.AWQOS <= a_if.AWQOS;
always @(a_if.AWUSER) t_if.AWUSER <= a_if.AWUSER;
always @(a_if.AWDOMAIN) t_if.AWDOMAIN <= a_if.AWDOMAIN;
always @(a_if.AWSNOOP) t_if.AWSNOOP <= a_if.AWSNOOP;
always @(a_if.AWSTASHNID) t_if.AWSTASHNID <= a_if.AWSTASHNID;
always @(a_if.AWSTASHNIDEN) t_if.AWSTASHNIDEN <= a_if.AWSTASHNIDEN;
always @(a_if.AWSTASHLPID) t_if.AWSTASHLPID <= a_if.AWSTASHLPID;
always @(a_if.AWSTASHLPIDEN) t_if.AWSTASHLPIDEN <= a_if.AWSTASHLPIDEN;
always @(a_if.AWTRACE) t_if.AWTRACE <= a_if.AWTRACE;
always @(a_if.AWLOOP) t_if.AWLOOP <= a_if.AWLOOP;
always @(a_if.AWMMUVALID) t_if.AWMMUVALID <= a_if.AWMMUVALID;
always @(a_if.AWMMUSECSID) t_if.AWMMUSECSID <= a_if.AWMMUSECSID;
always @(a_if.AWMMUSID) t_if.AWMMUSID <= a_if.AWMMUSID;
always @(a_if.AWMMUSSIDV) t_if.AWMMUSSIDV <= a_if.AWMMUSSIDV;
always @(a_if.AWMMUSSID) t_if.AWMMUSSID <= a_if.AWMMUSSID;
always @(a_if.AWMMUATST) t_if.AWMMUATST <= a_if.AWMMUATST;
always @(a_if.AWMMUFLOW) t_if.AWMMUFLOW <= a_if.AWMMUFLOW;
always @(a_if.AWPBHA) t_if.AWPBHA <= a_if.AWPBHA;
always @(a_if.AWNSAID) t_if.AWNSAID <= a_if.AWNSAID;
always @(a_if.AWSUBSYSID) t_if.AWSUBSYSID <= a_if.AWSUBSYSID;
always @(a_if.AWATOP) t_if.AWATOP <= a_if.AWATOP;
always @(a_if.AWMPAM) t_if.AWMPAM <= a_if.AWMPAM;
always @(a_if.AWIDUNQ) t_if.AWIDUNQ <= a_if.AWIDUNQ;
always @(a_if.AWCMO) t_if.AWCMO <= a_if.AWCMO;
always @(a_if.AWTAGOP) t_if.AWTAGOP <= a_if.AWTAGOP;
always @(a_if.AWMECID) t_if.AWMECID <= a_if.AWMECID;
always @(a_if.AWVALID) t_if.AWVALID <= a_if.AWVALID;
always @(a_if.AWREADY) t_if.AWREADY <= a_if.AWREADY;
always @(a_if.AWID) t_if.AWID <= a_if.AWID;
always @(a_if.AWADDR) t_if.AWADDR <= a_if.AWADDR;
always @(a_if.AWREGION) t_if.AWREGION <= a_if.AWREGION;
always @(a_if.AWLEN) t_if.AWLEN <= a_if.AWLEN;
always @(a_if.AWSIZE) t_if.AWSIZE <= a_if.AWSIZE;
always @(a_if.AWBURST) t_if.AWBURST <= a_if.AWBURST;
always @(a_if.AWLOCK) t_if.AWLOCK <= a_if.AWLOCK;
always @(a_if.AWCACHE) t_if.AWCACHE <= a_if.AWCACHE;
always @(a_if.AWPROT) t_if.AWPROT <= a_if.AWPROT;
always @(a_if.AWNSE) t_if.AWNSE <= a_if.AWNSE;
always @(a_if.AWQOS) t_if.AWQOS <= a_if.AWQOS;
always @(a_if.AWUSER) t_if.AWUSER <= a_if.AWUSER;
always @(a_if.AWDOMAIN) t_if.AWDOMAIN <= a_if.AWDOMAIN;
always @(a_if.AWSNOOP) t_if.AWSNOOP <= a_if.AWSNOOP;
always @(a_if.AWSTASHNID) t_if.AWSTASHNID <= a_if.AWSTASHNID;
always @(a_if.AWSTASHNIDEN) t_if.AWSTASHNIDEN <= a_if.AWSTASHNIDEN;
always @(a_if.AWSTASHLPID) t_if.AWSTASHLPID <= a_if.AWSTASHLPID;
always @(a_if.AWSTASHLPIDEN) t_if.AWSTASHLPIDEN <= a_if.AWSTASHLPIDEN;
always @(a_if.AWTRACE) t_if.AWTRACE <= a_if.AWTRACE;
always @(a_if.AWLOOP) t_if.AWLOOP <= a_if.AWLOOP;
always @(a_if.AWMMUVALID) t_if.AWMMUVALID <= a_if.AWMMUVALID;
always @(a_if.AWMMUSECSID) t_if.AWMMUSECSID <= a_if.AWMMUSECSID;
always @(a_if.AWMMUSID) t_if.AWMMUSID <= a_if.AWMMUSID;
always @(a_if.AWMMUSSIDV) t_if.AWMMUSSIDV <= a_if.AWMMUSSIDV;
always @(a_if.AWMMUSSID) t_if.AWMMUSSID <= a_if.AWMMUSSID;
always @(a_if.AWMMUATST) t_if.AWMMUATST <= a_if.AWMMUATST;
always @(a_if.AWMMUFLOW) t_if.AWMMUFLOW <= a_if.AWMMUFLOW;
always @(a_if.AWPBHA) t_if.AWPBHA <= a_if.AWPBHA;
always @(a_if.AWNSAID) t_if.AWNSAID <= a_if.AWNSAID;
always @(a_if.AWSUBSYSID) t_if.AWSUBSYSID <= a_if.AWSUBSYSID;
always @(a_if.AWATOP) t_if.AWATOP <= a_if.AWATOP;
always @(a_if.AWMPAM) t_if.AWMPAM <= a_if.AWMPAM;
always @(a_if.AWIDUNQ) t_if.AWIDUNQ <= a_if.AWIDUNQ;
always @(a_if.AWCMO) t_if.AWCMO <= a_if.AWCMO;
always @(a_if.AWTAGOP) t_if.AWTAGOP <= a_if.AWTAGOP;
always @(a_if.AWMECID) t_if.AWMECID <= a_if.AWMECID;
// A2.1.1 Write request channel
always @(a_if.WVALID) t_if.WVALID <= a_if.WVALID;
always @(a_if.WREADY) t_if.WREADY <= a_if.WREADY;
always @(a_if.WDATA) t_if.WDATA <= a_if.WDATA;
always @(a_if.WSTRB) t_if.WSTRB <= a_if.WSTRB;
always @(a_if.WTAG) t_if.WTAG <= a_if.WTAG;
always @(a_if.WTAGUPDATE) t_if.WTAGUPDATE <= a_if.WTAGUPDATE;
always @(a_if.WLAST) t_if.WLAST <= a_if.WLAST;
always @(a_if.WUSER) t_if.WUSER <= a_if.WUSER;
always @(a_if.WPOISON) t_if.WPOISON <= a_if.WPOISON;
always @(a_if.WTRACE) t_if.WTRACE <= a_if.WTRACE;
always @(a_if.WVALID) t_if.WVALID <= a_if.WVALID;
always @(a_if.WREADY) t_if.WREADY <= a_if.WREADY;
always @(a_if.WDATA) t_if.WDATA <= a_if.WDATA;
always @(a_if.WSTRB) t_if.WSTRB <= a_if.WSTRB;
always @(a_if.WTAG) t_if.WTAG <= a_if.WTAG;
always @(a_if.WTAGUPDATE) t_if.WTAGUPDATE <= a_if.WTAGUPDATE;
always @(a_if.WLAST) t_if.WLAST <= a_if.WLAST;
always @(a_if.WUSER) t_if.WUSER <= a_if.WUSER;
always @(a_if.WPOISON) t_if.WPOISON <= a_if.WPOISON;
always @(a_if.WTRACE) t_if.WTRACE <= a_if.WTRACE;
// A2.1.3 Write response channel
always @(a_if.BVALID) t_if.BVALID <= a_if.BVALID;
always @(a_if.BREADY) t_if.BREADY <= a_if.BREADY;
always @(a_if.BID) t_if.BID <= a_if.BID;
always @(a_if.BIDUNQ) t_if.BIDUNQ <= a_if.BIDUNQ;
always @(a_if.BRESP) t_if.BRESP <= a_if.BRESP;
always @(a_if.BCOMP) t_if.BCOMP <= a_if.BCOMP;
always @(a_if.BPERSIST) t_if.BPERSIST <= a_if.BPERSIST;
always @(a_if.BTAGMATCH) t_if.BTAGMATCH <= a_if.BTAGMATCH;
always @(a_if.BUSER) t_if.BUSER <= a_if.BUSER;
always @(a_if.BTRACE) t_if.BTRACE <= a_if.BTRACE;
always @(a_if.BLOOP) t_if.BLOOP <= a_if.BLOOP;
always @(a_if.BBUSY) t_if.BBUSY <= a_if.BBUSY;
always @(a_if.BVALID) t_if.BVALID <= a_if.BVALID;
always @(a_if.BREADY) t_if.BREADY <= a_if.BREADY;
always @(a_if.BID) t_if.BID <= a_if.BID;
always @(a_if.BIDUNQ) t_if.BIDUNQ <= a_if.BIDUNQ;
always @(a_if.BRESP) t_if.BRESP <= a_if.BRESP;
always @(a_if.BCOMP) t_if.BCOMP <= a_if.BCOMP;
always @(a_if.BPERSIST) t_if.BPERSIST <= a_if.BPERSIST;
always @(a_if.BTAGMATCH) t_if.BTAGMATCH <= a_if.BTAGMATCH;
always @(a_if.BUSER) t_if.BUSER <= a_if.BUSER;
always @(a_if.BTRACE) t_if.BTRACE <= a_if.BTRACE;
always @(a_if.BLOOP) t_if.BLOOP <= a_if.BLOOP;
always @(a_if.BBUSY) t_if.BBUSY <= a_if.BBUSY;
// A2.2.1 Read request channel
always @(a_if.ARVALID) t_if.ARVALID <= a_if.ARVALID;
always @(a_if.ARREADY) t_if.ARREADY <= a_if.ARREADY;
always @(a_if.ARID) t_if.ARID <= a_if.ARID;
always @(a_if.ARADDR) t_if.ARADDR <= a_if.ARADDR;
always @(a_if.ARREGION) t_if.ARREGION <= a_if.ARREGION;
always @(a_if.ARLEN) t_if.ARLEN <= a_if.ARLEN;
always @(a_if.ARSIZE) t_if.ARSIZE <= a_if.ARSIZE;
always @(a_if.ARBURST) t_if.ARBURST <= a_if.ARBURST;
always @(a_if.ARLOCK) t_if.ARLOCK <= a_if.ARLOCK;
always @(a_if.ARCACHE) t_if.ARCACHE <= a_if.ARCACHE;
always @(a_if.ARPROT) t_if.ARPROT <= a_if.ARPROT;
always @(a_if.ARNSE) t_if.ARNSE <= a_if.ARNSE;
always @(a_if.ARQOS) t_if.ARQOS <= a_if.ARQOS;
always @(a_if.ARUSER) t_if.ARUSER <= a_if.ARUSER;
always @(a_if.ARDOMAIN) t_if.ARDOMAIN <= a_if.ARDOMAIN;
always @(a_if.ARSNOOP) t_if.ARSNOOP <= a_if.ARSNOOP;
always @(a_if.ARTRACE) t_if.ARTRACE <= a_if.ARTRACE;
always @(a_if.ARLOOP) t_if.ARLOOP <= a_if.ARLOOP;
always @(a_if.ARMMUVALID) t_if.ARMMUVALID <= a_if.ARMMUVALID;
always @(a_if.ARMMUSECSID) t_if.ARMMUSECSID <= a_if.ARMMUSECSID;
always @(a_if.ARMMUSID) t_if.ARMMUSID <= a_if.ARMMUSID;
always @(a_if.ARMMUSSIDV) t_if.ARMMUSSIDV <= a_if.ARMMUSSIDV;
always @(a_if.ARMMUSSID) t_if.ARMMUSSID <= a_if.ARMMUSSID;
always @(a_if.ARMMUATST) t_if.ARMMUATST <= a_if.ARMMUATST;
always @(a_if.ARMMUFLOW) t_if.ARMMUFLOW <= a_if.ARMMUFLOW;
always @(a_if.ARPBHA) t_if.ARPBHA <= a_if.ARPBHA;
always @(a_if.ARNSAID) t_if.ARNSAID <= a_if.ARNSAID;
always @(a_if.ARSUBSYSID) t_if.ARSUBSYSID <= a_if.ARSUBSYSID;
always @(a_if.ARCHUNKEN) t_if.ARCHUNKEN <= a_if.ARCHUNKEN;
always @(a_if.ARIDUNQ) t_if.ARIDUNQ <= a_if.ARIDUNQ;
always @(a_if.ARTAGOP) t_if.ARTAGOP <= a_if.ARTAGOP;
always @(a_if.ARMECID) t_if.ARMECID <= a_if.ARMECID;
always @(a_if.ARVALID) t_if.ARVALID <= a_if.ARVALID;
always @(a_if.ARREADY) t_if.ARREADY <= a_if.ARREADY;
always @(a_if.ARID) t_if.ARID <= a_if.ARID;
always @(a_if.ARADDR) t_if.ARADDR <= a_if.ARADDR;
always @(a_if.ARREGION) t_if.ARREGION <= a_if.ARREGION;
always @(a_if.ARLEN) t_if.ARLEN <= a_if.ARLEN;
always @(a_if.ARSIZE) t_if.ARSIZE <= a_if.ARSIZE;
always @(a_if.ARBURST) t_if.ARBURST <= a_if.ARBURST;
always @(a_if.ARLOCK) t_if.ARLOCK <= a_if.ARLOCK;
always @(a_if.ARCACHE) t_if.ARCACHE <= a_if.ARCACHE;
always @(a_if.ARPROT) t_if.ARPROT <= a_if.ARPROT;
always @(a_if.ARNSE) t_if.ARNSE <= a_if.ARNSE;
always @(a_if.ARQOS) t_if.ARQOS <= a_if.ARQOS;
always @(a_if.ARUSER) t_if.ARUSER <= a_if.ARUSER;
always @(a_if.ARDOMAIN) t_if.ARDOMAIN <= a_if.ARDOMAIN;
always @(a_if.ARSNOOP) t_if.ARSNOOP <= a_if.ARSNOOP;
always @(a_if.ARTRACE) t_if.ARTRACE <= a_if.ARTRACE;
always @(a_if.ARLOOP) t_if.ARLOOP <= a_if.ARLOOP;
always @(a_if.ARMMUVALID) t_if.ARMMUVALID <= a_if.ARMMUVALID;
always @(a_if.ARMMUSECSID) t_if.ARMMUSECSID <= a_if.ARMMUSECSID;
always @(a_if.ARMMUSID) t_if.ARMMUSID <= a_if.ARMMUSID;
always @(a_if.ARMMUSSIDV) t_if.ARMMUSSIDV <= a_if.ARMMUSSIDV;
always @(a_if.ARMMUSSID) t_if.ARMMUSSID <= a_if.ARMMUSSID;
always @(a_if.ARMMUATST) t_if.ARMMUATST <= a_if.ARMMUATST;
always @(a_if.ARMMUFLOW) t_if.ARMMUFLOW <= a_if.ARMMUFLOW;
always @(a_if.ARPBHA) t_if.ARPBHA <= a_if.ARPBHA;
always @(a_if.ARNSAID) t_if.ARNSAID <= a_if.ARNSAID;
always @(a_if.ARSUBSYSID) t_if.ARSUBSYSID <= a_if.ARSUBSYSID;
always @(a_if.ARCHUNKEN) t_if.ARCHUNKEN <= a_if.ARCHUNKEN;
always @(a_if.ARIDUNQ) t_if.ARIDUNQ <= a_if.ARIDUNQ;
always @(a_if.ARTAGOP) t_if.ARTAGOP <= a_if.ARTAGOP;
always @(a_if.ARMECID) t_if.ARMECID <= a_if.ARMECID;
// A2.2.2 Read data channel
always @(a_if.RVALID) t_if.RVALID <= a_if.RVALID;
always @(a_if.RREADY) t_if.RREADY <= a_if.RREADY;
always @(a_if.RID) t_if.RID <= a_if.RID;
always @(a_if.RIDUNQ) t_if.RIDUNQ <= a_if.RIDUNQ;
always @(a_if.RDATA) t_if.RDATA <= a_if.RDATA;
always @(a_if.RTAG) t_if.RTAG <= a_if.RTAG;
always @(a_if.RRESP) t_if.RRESP <= a_if.RRESP;
always @(a_if.RLAST) t_if.RLAST <= a_if.RLAST;
always @(a_if.RUSER) t_if.RUSER <= a_if.RUSER;
always @(a_if.RPOISON) t_if.RPOISON <= a_if.RPOISON;
always @(a_if.RTRACE) t_if.RTRACE <= a_if.RTRACE;
always @(a_if.RLOOP) t_if.RLOOP <= a_if.RLOOP;
always @(a_if.RCHUNKV) t_if.RCHUNKV <= a_if.RCHUNKV;
always @(a_if.RCHUNKNUM) t_if.RCHUNKNUM <= a_if.RCHUNKNUM;
always @(a_if.RCHUNKSTRB) t_if.RCHUNKSTRB <= a_if.RCHUNKSTRB;
always @(a_if.RBUSY) t_if.RBUSY <= a_if.RBUSY;
always @(a_if.RVALID) t_if.RVALID <= a_if.RVALID;
always @(a_if.RREADY) t_if.RREADY <= a_if.RREADY;
always @(a_if.RID) t_if.RID <= a_if.RID;
always @(a_if.RIDUNQ) t_if.RIDUNQ <= a_if.RIDUNQ;
always @(a_if.RDATA) t_if.RDATA <= a_if.RDATA;
always @(a_if.RTAG) t_if.RTAG <= a_if.RTAG;
always @(a_if.RRESP) t_if.RRESP <= a_if.RRESP;
always @(a_if.RLAST) t_if.RLAST <= a_if.RLAST;
always @(a_if.RUSER) t_if.RUSER <= a_if.RUSER;
always @(a_if.RPOISON) t_if.RPOISON <= a_if.RPOISON;
always @(a_if.RTRACE) t_if.RTRACE <= a_if.RTRACE;
always @(a_if.RLOOP) t_if.RLOOP <= a_if.RLOOP;
always @(a_if.RCHUNKV) t_if.RCHUNKV <= a_if.RCHUNKV;
always @(a_if.RCHUNKNUM) t_if.RCHUNKNUM <= a_if.RCHUNKNUM;
always @(a_if.RCHUNKSTRB) t_if.RCHUNKSTRB <= a_if.RCHUNKSTRB;
always @(a_if.RBUSY) t_if.RBUSY <= a_if.RBUSY;
`endif