Temp commit to transfer files. Bug in GHDL prevents debugging.

Separate pkg and body; Add overloaded functions

Author: bradleyharden

vunit/vhdl/verification_components/src/avalon_sink.vhd

@@ -13,7 +13,7 @@ use ieee.std_logic_1164.all;
 
 context work.vunit_context;
 context work.com_context;
-use work.stream_slave_pkg.all;
+use work.stream_pkg.all;
 use work.avalon_stream_pkg.all;
 
 library osvvm;

vunit/vhdl/verification_components/src/avalon_source.vhd

@@ -10,7 +10,7 @@ use ieee.std_logic_1164.all;
 
 context work.vunit_context;
 context work.com_context;
-use work.stream_master_pkg.all;
+use work.stream_pkg.all;
 use work.avalon_stream_pkg.all;
 use work.queue_pkg.all;
 use work.sync_pkg.all;

vunit/vhdl/verification_components/src/avalon_stream_pkg.vhd

@@ -8,8 +8,8 @@ library ieee;
 use ieee.std_logic_1164.all;
 
 use work.logger_pkg.all;
-use work.stream_master_pkg.all;
-use work.stream_slave_pkg.all;
+use work.stream_pkg.all;
+use work.stream_pkg.all;
 context work.com_context;
 context work.data_types_context;
 

vunit/vhdl/verification_components/src/axi_stream_master.vhd

@@ -9,7 +9,7 @@ use ieee.std_logic_1164.all;
 
 context work.vunit_context;
 context work.com_context;
-use work.stream_master_pkg.all;
+use work.stream_pkg.all;
 use work.axi_stream_pkg.all;
 use work.queue_pkg.all;
 use work.sync_pkg.all;

vunit/vhdl/verification_components/src/axi_stream_pkg.vhd

@@ -10,8 +10,8 @@ use ieee.std_logic_1164.all;
 use work.logger_pkg.all;
 use work.checker_pkg.all;
 use work.check_pkg.all;
-use work.stream_master_pkg.all;
-use work.stream_slave_pkg.all;
+use work.stream_pkg.all;
+use work.stream_pkg.all;
 use work.sync_pkg.all;
 context work.vunit_context;
 context work.com_context;

vunit/vhdl/verification_components/src/axi_stream_slave.vhd

@@ -9,7 +9,7 @@ use ieee.std_logic_1164.all;
 
 context work.vunit_context;
 context work.com_context;
-use work.stream_slave_pkg.all;
+use work.stream_pkg.all;
 use work.axi_stream_pkg.all;
 use work.sync_pkg.all;
 use work.string_ptr_pkg.all;

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

@@ -2,16 +2,18 @@
 -- License, v. 2.0. If a copy of the MPL was not distributed with this file,
 -- You can obtain one at http://mozilla.org/MPL/2.0/.
 --
--- Copyright (c) 2014-2019, Lars Asplund lars.anders.asplund@gmail.com
+-- Copyright (c) 2014-2018, Lars Asplund lars.anders.asplund@gmail.com
+
+-- Stream master & slave verification components
 
 library ieee;
 use ieee.std_logic_1164.all;
 
 context work.vunit_context;
 context work.com_context;
+use work.sync_pkg.all;
 
 package body stream_pkg is
-
   impure function new_stream_master return stream_master_t is
   begin
     return (p_actor => new_actor);
@@ -22,18 +24,37 @@ package body stream_pkg is
     return (p_actor => new_actor);
   end;
 
+  procedure push(msg : msg_t; transaction : stream_transaction_t) is
+  begin
+    push_std_ulogic_vector(msg, transaction.data);
+    push_boolean(msg, transaction.last);
+  end;
+
+  impure function pop(msg : msg_t) return stream_transaction_t is
+  begin
+    return (data => pop_std_ulogic_vector(msg), last => pop_boolean(msg));
+  end;
+
   procedure push_stream(signal net : inout network_t;
                         stream : stream_master_t;
-                        data : std_logic_vector;
-                        last : boolean := false) is
+                        transaction : stream_transaction_t) is
     variable msg : msg_t := new_msg(stream_push_msg);
-    constant normalized_data : std_logic_vector(data'length-1 downto 0) := data;
   begin
-    push_std_ulogic_vector(msg, normalized_data);
-    push_boolean(msg, last);
+    push_stream_transaction(msg, transaction);
     send(net, stream.p_actor, msg);
   end;
 
+  procedure push_stream(signal net : inout network_t;
+                        stream : stream_master_t;
+                        data : std_logic_vector;
+                        last : boolean := false) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    transaction.data := data;
+    transaction.last := last;
+    push_stream(net, stream, transaction);
+  end;
+
   procedure pop_stream(signal net : inout network_t;
                        stream : stream_slave_t;
                        variable reference : inout stream_reference_t) is
@@ -44,26 +65,42 @@ package body stream_pkg is
 
   procedure await_pop_stream_reply(signal net : inout network_t;
                                    variable reference : inout stream_reference_t;
-                                   variable data : out std_logic_vector;
-                                   variable last : out boolean) is
+                                   variable transaction : out stream_transaction_t) is
     variable reply_msg : msg_t;
   begin
     receive_reply(net, reference, reply_msg);
-    data := pop_std_ulogic_vector(reply_msg);
-    last := pop_boolean(reply_msg);
+    transaction := pop_stream_transaction(reply_msg);
     delete(reference);
     delete(reply_msg);
   end;
 
+  procedure await_pop_stream_reply(signal net : inout network_t;
+                                   variable reference : inout stream_reference_t;
+                                   variable data : out std_logic_vector;
+                                   variable last : out boolean) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    await_pop_stream_reply(net, reference, transaction);
+    data := transaction.data;
+    last := transaction.last;
+  end;
+
   procedure await_pop_stream_reply(signal net : inout network_t;
                                    variable reference : inout stream_reference_t;
                                    variable data : out std_logic_vector) is
-    variable reply_msg : msg_t;
+    variable transaction : stream_transaction_t(data(data'range));
   begin
-    receive_reply(net, reference, reply_msg);
-    data := pop_std_ulogic_vector(reply_msg);
-    delete(reference);
-    delete(reply_msg);
+    await_pop_stream_reply(net, reference, transaction);
+    data := transaction.data;
+  end;
+
+  procedure pop_stream(signal net : inout network_t;
+                       stream : stream_slave_t;
+                       variable transaction : out stream_transaction_t) is
+    variable reference : stream_reference_t;
+  begin
+    pop_stream(net, stream, reference);
+    await_pop_stream_reply(net, reference, transaction);
   end;
 
   procedure pop_stream(signal net : inout network_t;
@@ -87,16 +124,153 @@ package body stream_pkg is
 
   procedure check_stream(signal net : inout network_t;
                          stream : stream_slave_t;
-                         expected : std_logic_vector;
-                         last : boolean := false;
+                         expected : stream_transaction_t;
                          msg : string := "") is
-    variable got_data : std_logic_vector(expected'range);
-    variable got_last : boolean;
+    variable got : stream_transaction_t(data(expected.data'range));
   begin
-    pop_stream(net, stream, got_data, got_last);
-    check_equal(got_data, expected, msg);
-    check_equal(got_last, last, msg);
+    pop_stream(net, stream, got);
+    check_equal(got.data, expected.data, msg);
+    check_equal(got.last, expected.last, msg);
+  end;
+
+  procedure check_stream(signal net : inout network_t;
+                         stream : stream_slave_t;
+                         expected_data : std_logic_vector;
+                         expected_last : boolean := false;
+                         msg : string := "") is
+    variable expected : stream_transaction_t(data(expected_data'range));
+  begin
+    expected.data := expected_data;
+    expected.last := expected_last;
+    check_stream(net, stream, expected, msg);
+  end;
+
+  procedure wait_until_idle(signal net : inout network_t;
+                            stream : stream_master_t) is
+  begin
+    wait_until_idle(net, stream.p_actor);
   end procedure;
 
+  procedure wait_until_idle(signal net : inout network_t;
+                            stream : stream_slave_t) is
+  begin
+    wait_until_idle(net, stream.p_actor);
+  end procedure;
+
+  procedure wait_for_time(signal net : inout network_t;
+                          stream : stream_master_t;
+                          delay : delay_length) is
+  begin
+    wait_for_time(net, stream.p_actor, delay);
+  end procedure;
+
+  procedure wait_for_time(signal net : inout network_t;
+                          stream : stream_slave_t;
+                          delay : delay_length) is
+  begin
+    wait_for_time(net, stream.p_actor, delay);
+  end procedure;
+
+  procedure receive(signal net : inout network_t;
+                    stream : stream_master_t;
+                    variable msg : out msg_t) is
+  begin
+    receive(net, stream.p_actor, msg);
+  end procedure;
+
+  procedure receive(signal net : inout network_t;
+                    stream : stream_slave_t;
+                    variable msg : out msg_t) is
+  begin
+    receive(net, stream.p_actor, msg);
+  end procedure;
+
+  procedure receive_stream(signal net : inout network_t;
+                           stream : stream_master_t;
+                           variable transaction : out stream_transaction_t) is
+    variable msg : msg_t;
+    variable msg_type : msg_type_t;
+  begin
+    loop
+      receive(net, stream, msg);
+      msg_type := message_type(msg);
+      handle_sync_message(net, msg_type, msg);
+      if msg_type = stream_push_msg then
+        transaction := pop_stream_transaction(msg);
+        delete(msg);
+        exit;
+      else
+        unexpected_msg_type(msg_type);
+      end if;
+    end loop;
+  end;
+
+  procedure receive_stream(signal net : inout network_t;
+                           stream : stream_master_t;
+                           variable data : out std_ulogic_vector;
+                           variable last : out boolean) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    receive_stream(net, stream, transaction);
+    data := transaction.data;
+    last := transaction.last;
+  end;
+
+  procedure receive_stream(signal net : inout network_t;
+                           stream : stream_master_t;
+                           variable data : out std_ulogic_vector) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    receive_stream(net, stream, transaction);
+    data := transaction.data;
+  end;
+
+  procedure receive_stream(signal net : inout network_t;
+                           stream : stream_slave_t;
+                           variable msg : out msg_t) is
+    variable msg_type : msg_type_t;
+  begin
+    loop
+      receive(net, stream, msg);
+      msg_type := message_type(msg);
+      handle_sync_message(net, msg_type, msg);
+      if msg_type = stream_pop_msg then
+        exit;
+      else
+        unexpected_msg_type(msg_type);
+      end if;
+    end loop;
+  end;
+
+  procedure reply_stream(signal net : inout network_t;
+                         variable msg : inout msg_t;
+                         transaction : stream_transaction_t) is
+    variable reply_msg : msg_t;
+  begin
+   push_stream_transaction(msg, transaction);
+   reply(net, msg, reply_msg);
+   delete(reply_msg);
+  end;
+
+  procedure reply_stream(signal net : inout network_t;
+                         variable msg : inout msg_t;
+                         data : std_ulogic_vector;
+                         last : boolean) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    transaction.data := data;
+    transaction.last := last;
+    reply_stream(net, msg, transaction);
+  end;
+
+  procedure reply_stream(signal net : inout network_t;
+                         variable msg : inout msg_t;
+                         data : std_ulogic_vector) is
+    variable transaction : stream_transaction_t(data(data'range));
+  begin
+    transaction.data := data;
+    reply_stream(net, msg, transaction);
+  end;
+
 end package body;