- Added the ability to convert bus masters to sync handles

- Added the ability to specify actor for AXI stream masters and slaves
FAIG2014 · Jun 4, 2018 · 7e49623 · 7e49623
1 parent b2eb711
commit 7e49623
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/vunit/vhdl/verification_components/src/axi_stream_pkg.vhd b/vunit/vhdl/verification_components/src/axi_stream_pkg.vhd
@@ -30,9 +30,11 @@ package axi_stream_pkg is
 
   constant axi_stream_logger : logger_t := get_logger("vunit_lib:axi_stream_pkg");
   impure function new_axi_stream_master(data_length : natural;
-                                        logger : logger_t := axi_stream_logger) return axi_stream_master_t;
+                                        logger : logger_t := axi_stream_logger;
+                                        actor : actor_t := null_actor) return axi_stream_master_t;
   impure function new_axi_stream_slave(data_length : natural;
-                                       logger : logger_t := axi_stream_logger) return axi_stream_slave_t;
+                                       logger : logger_t := axi_stream_logger;
+                                       actor : actor_t := null_actor) return axi_stream_slave_t;
   impure function data_length(master : axi_stream_master_t) return natural;
   impure function data_length(master : axi_stream_slave_t) return natural;
   impure function as_stream(master : axi_stream_master_t) return stream_master_t;
@@ -51,17 +53,25 @@ end package;
 package body axi_stream_pkg is
 
   impure function new_axi_stream_master(data_length : natural;
-                                        logger : logger_t := axi_stream_logger) return axi_stream_master_t is
+                                        logger : logger_t := axi_stream_logger;
+                                        actor : actor_t := null_actor) return axi_stream_master_t is
+    variable p_actor : actor_t;
   begin
-    return (p_actor => new_actor,
+    p_actor := actor when actor /= null_actor else new_actor;
+
+    return (p_actor => p_actor,
             p_data_length => data_length,
             p_logger => logger);
   end;
 
   impure function new_axi_stream_slave(data_length : natural;
-                                       logger : logger_t := axi_stream_logger) return axi_stream_slave_t is
+                                       logger : logger_t := axi_stream_logger;
+                                       actor : actor_t := null_actor) return axi_stream_slave_t is
+    variable p_actor : actor_t;
   begin
-    return (p_actor => new_actor,
+    p_actor := actor when actor /= null_actor else new_actor;
+
+    return (p_actor => p_actor,
             p_data_length => data_length,
             p_logger => logger);
   end;

diff --git a/vunit/vhdl/verification_components/src/bus_master_pkg-body.vhd b/vunit/vhdl/verification_components/src/bus_master_pkg-body.vhd
@@ -234,6 +234,11 @@ package body bus_master_pkg is
     wait_until_read_equals(net, bus_handle, addr, data, timeout, msg);
   end;
 
+  impure function as_sync(bus_master : bus_master_t) return sync_handle_t is
+  begin
+    return bus_master.p_actor;
+  end;
+
   procedure wait_until_idle(signal net : inout network_t;
                             bus_handle : bus_master_t) is
   begin

diff --git a/vunit/vhdl/verification_components/src/bus_master_pkg.vhd b/vunit/vhdl/verification_components/src/bus_master_pkg.vhd
@@ -11,6 +11,7 @@ use ieee.std_logic_1164.all;
 
 use work.logger_pkg.all;
 context work.com_context;
+use work.sync_pkg.all;
 
 package bus_master_pkg is
 
@@ -128,6 +129,8 @@ package bus_master_pkg is
     timeout      : delay_length := delay_length'high;
     msg    : string       := "");
 
+  -- Convert a bus master to a sync handle
+  impure function as_sync(bus_master : bus_master_t) return sync_handle_t;
 
   -- Wait until all operations scheduled before this command has finished
   procedure wait_until_idle(signal net : inout network_t;