Made AXI lite master VC compliant

Author: LarsAsplund

vunit/vhdl/verification_components/run.py

@@ -5,7 +5,7 @@
 # Copyright (c) 2014-2019, Lars Asplund lars.anders.asplund@gmail.com
 
 from os.path import join, dirname
-from vunit import VUnit
+from vunit import VUnit, ComplianceTest
 from itertools import product
 
 root = dirname(__file__)
@@ -132,5 +132,11 @@ def gen_avalon_master_tests(obj, *args):
         name="max_waits=%d" % max_waits, generics=dict(max_waits=max_waits)
     )
 
+test_lib = ui.add_library("test_lib")
+ComplianceTest(lib, "axi_lite_master", "bus_master_pkg").add_vhdl_testbench(
+    test_lib, join(root, "compliance_test")
+)
+
+ui.set_compile_option("rivierapro.vcom_flags", ["-dbg"])
 
 ui.main()

vunit/vhdl/verification_components/src/axi_lite_master.vhd

@@ -49,7 +49,7 @@ entity axi_lite_master is
 end entity;
 
 architecture a of axi_lite_master is
-  constant reply_queue, message_queue : queue_t := new_queue;
+  constant reply_queue, message_queue, transaction_token_queue : queue_t := new_queue;
 begin
   main : process
     variable request_msg : msg_t;
@@ -58,13 +58,18 @@ begin
     receive(net, bus_handle.p_actor, request_msg);
     msg_type := message_type(request_msg);
 
+    handle_wait_for_time(net, msg_type, request_msg);
+
     if is_read(msg_type) or is_write(msg_type) then
       push(message_queue, request_msg);
+      push(transaction_token_queue, true);
     elsif msg_type = wait_until_idle_msg then
-      wait until ((bvalid and bready) = '1' or (rvalid and rready) = '1') and is_empty(message_queue) and rising_edge(aclk);
+      if not is_empty(transaction_token_queue) then
+        wait until rising_edge(aclk) and is_empty(transaction_token_queue);
+      end if;
       handle_wait_until_idle(net, msg_type, request_msg);
-    else
-      unexpected_msg_type(msg_type);
+    elsif bus_handle.p_fail_on_unexpected_msg_type then
+      unexpected_msg_type(msg_type, bus_handle.p_logger);
     end if;
   end process;
 
@@ -74,6 +79,7 @@ begin
     variable msg_type : msg_type_t;
     variable w_done, aw_done : boolean;
     variable expected_resp : axi_resp_t;
+    variable transaction_token : boolean;
   begin
     wait until rising_edge(aclk) and not is_empty(message_queue);
 
@@ -93,6 +99,7 @@ begin
       wait until (rvalid and rready) = '1' and rising_edge(aclk);
       rready <= '0';
       check_axi_resp(bus_handle, rresp, expected_resp, "rresp");
+      transaction_token := pop(transaction_token_queue);
 
       if is_visible(bus_handle.p_logger, debug) then
         debug(bus_handle.p_logger,
@@ -130,6 +137,7 @@ begin
       wait until (bvalid and bready) = '1' and rising_edge(aclk);
       bready <= '0';
       check_axi_resp(bus_handle, bresp, expected_resp, "bresp");
+      transaction_token := pop(transaction_token_queue);
 
       if is_visible(bus_handle.p_logger, debug) then
         debug(bus_handle.p_logger,

vunit/vhdl/verification_components/src/bus_master_pkg-body.vhd

@@ -15,20 +15,36 @@ use work.check_pkg.all;
 
 package body bus_master_pkg is
 
-  impure function new_bus(data_length : natural;
-                          address_length : natural;
+  impure function new_bus(data_length : natural := 32;
+                          address_length : natural := 32;
                           byte_length : natural := 8;
                           logger : logger_t := bus_logger;
-                          actor : actor_t := null_actor) return bus_master_t is
+                          actor : actor_t := null_actor;
+                          checker : checker_t := null_checker;
+                          fail_on_unexpected_msg_type : boolean := true) return bus_master_t is
     variable p_actor : actor_t;
+    variable p_checker : checker_t;
   begin
     p_actor := actor when actor /= null_actor else new_actor;
 
+    if checker = null_checker then
+      if logger = bus_logger then
+        p_checker := bus_checker;
+      else
+        p_checker := new_checker(logger);
+      end if;
+    else
+      p_checker := checker;
+    end if;
+
     return (p_actor => p_actor,
             p_data_length => data_length,
             p_address_length => address_length,
             p_byte_length => byte_length,
-            p_logger => logger);
+            p_logger => logger,
+            p_checker => p_checker,
+            p_fail_on_unexpected_msg_type => fail_on_unexpected_msg_type);
+
   end;
 
   function get_logger(bus_handle : bus_master_t) return logger_t is

vunit/vhdl/verification_components/src/bus_master_pkg.vhd

@@ -10,6 +10,7 @@ library ieee;
 use ieee.std_logic_1164.all;
 
 use work.logger_pkg.all;
+use work.checker_pkg.all;
 context work.com_context;
 use work.sync_pkg.all;
 use work.queue_pkg.all;
@@ -24,20 +25,25 @@ package bus_master_pkg is
     p_address_length : natural;
     p_byte_length : natural;
     p_logger : logger_t;
+    p_checker : checker_t;
+    p_fail_on_unexpected_msg_type : boolean;
   end record;
 
   -- Reference to non-blocking bus command
   alias bus_reference_t is msg_t;
 
   -- Default logger object for bus master instances
   constant bus_logger : logger_t := get_logger("vunit_lib:bus_master_pkg");
+  constant bus_checker : checker_t := new_checker(bus_logger);
 
   -- Create new handle for bus master VC
-  impure function new_bus(data_length : natural;
-                          address_length : natural;
+  impure function new_bus(data_length : natural := 32;
+                          address_length : natural := 32;
                           byte_length : natural := 8;
                           logger : logger_t := bus_logger;
-                          actor : actor_t := null_actor) return bus_master_t;
+                          actor : actor_t := null_actor;
+                          checker : checker_t := null_checker;
+                          fail_on_unexpected_msg_type : boolean := true) return bus_master_t;
 
   -- Return the logger used by the bus master
   function get_logger(bus_handle : bus_master_t) return logger_t;