Integrated AXI protocol checker into other AXI VCs. Some lint fixing.

FAIG2014 · Aug 2, 2018 · 1fb8cf0 · 1fb8cf0
1 parent 605e144
commit 1fb8cf0
Show file tree

Hide file tree

Showing 14 changed files with 333 additions and 237 deletions.
diff --git a/vunit/vhdl/verification_components/src/axi_slave_pkg.vhd b/vunit/vhdl/verification_components/src/axi_slave_pkg.vhd
@@ -275,7 +275,6 @@ package body axi_slave_pkg is
                            variable stat  : inout axi_statistics_t;
                            clear : boolean := false) is
     variable request_msg, reply_msg : msg_t;
-    variable ack : boolean;
   begin
     deallocate(stat);
     request_msg := new_msg(axi_slave_get_statistics_msg);

diff --git a/vunit/vhdl/verification_components/src/axi_slave_private_pkg.vhd b/vunit/vhdl/verification_components/src/axi_slave_private_pkg.vhd
@@ -364,7 +364,7 @@ package body axi_slave_private_pkg is
     end;
 
     impure function pop_resp return axi_burst_t is
-      variable resp_burst : axi_burst_t := pop_axi_burst(p_resp_queue);
+      constant resp_burst : axi_burst_t := pop_axi_burst(p_resp_queue);
     begin
       if is_visible(p_axi_slave.p_logger, debug) then
         debug(p_axi_slave.p_logger,
@@ -499,7 +499,7 @@ package body axi_slave_private_pkg is
     variable clear_stat : boolean;
     variable stat : axi_statistics_t;
   begin
-    loop
+    while true loop
       receive(net, self.get_actor, request_msg);
       msg_type := message_type(request_msg);
 

diff --git a/vunit/vhdl/verification_components/src/axi_statistics_pkg.vhd b/vunit/vhdl/verification_components/src/axi_statistics_pkg.vhd
@@ -110,7 +110,7 @@ package body axi_statistics_pkg is
   end;
 
   impure function copy(stat : axi_statistics_t) return axi_statistics_t is
-    variable stat2 : axi_statistics_t := new_axi_statistics;
+    constant stat2 : axi_statistics_t := new_axi_statistics;
   begin
     for i in 0 to length(stat.p_count_by_burst_length)-1 loop
       set(stat2.p_count_by_burst_length, i, get(stat.p_count_by_burst_length, i));

diff --git a/vunit/vhdl/verification_components/src/axi_stream_master.vhd b/vunit/vhdl/verification_components/src/axi_stream_master.vhd
@@ -70,5 +70,18 @@ begin
       );
   end generate axi_stream_monitor_generate;
 
+  axi_stream_protocol_checker_generate : if master.p_protocol_checker /= null_axi_stream_protocol_checker generate
+    axi_stream_protocol_checker_inst: entity work.axi_stream_protocol_checker
+      generic map (
+        protocol_checker => master.p_protocol_checker)
+      port map (
+        aclk     => aclk,
+        areset_n => open,
+        tvalid   => tvalid,
+        tready   => tready,
+        tdata    => tdata,
+        tlast    => tlast,
+        tid      => open);
+  end generate axi_stream_protocol_checker_generate;
 
 end architecture;
diff --git a/vunit/vhdl/verification_components/src/axi_stream_monitor.vhd b/vunit/vhdl/verification_components/src/axi_stream_monitor.vhd
@@ -41,4 +41,18 @@ begin
     publish(net, monitor.p_actor, msg);
   end process;
 
+  axi_stream_protocol_checker_generate : if monitor.p_protocol_checker /= null_axi_stream_protocol_checker generate
+    axi_stream_protocol_checker_inst: entity work.axi_stream_protocol_checker
+      generic map (
+        protocol_checker => monitor.p_protocol_checker)
+      port map (
+        aclk     => aclk,
+        areset_n => open,
+        tvalid   => tvalid,
+        tready   => tready,
+        tdata    => tdata,
+        tlast    => tlast,
+        tid      => open);
+  end generate axi_stream_protocol_checker_generate;
+
 end architecture;