m_axis_sequencer: Updated keep signal (#117)

* m_axis_sequencer: Updated keep signal

- Added support for non-valid byte transmission using keep
- Added support for the monitor to drop non-valid signals for scoreboard
- By default all keep bits are valid when the sequencer is initialized

Signed-off-by: Istvan-Zsolt Szekely <istvan.szekely@analog.com>

Author: IstvanZsSzekely

common/sv/m_axis_sequencer.sv

@@ -65,6 +65,8 @@ package m_axis_sequencer_pkg;
 
     protected bit descriptor_gen_mode;  // 0 - get descriptor from test;
                                         // 1 - autogenerate descriptor based on the first descriptor from test until aborted
+    protected bit keep_all; // 0 - bytes can be set to be invalid
+                            // 1 - all bytes are always valid, data is generated only for the set part
 
     protected int byte_count;
 
@@ -102,6 +104,7 @@ package m_axis_sequencer_pkg;
       this.descriptor_delay = 0;
       this.stop_policy = STOP_POLICY_DATA_BEAT;
       this.queue_empty_sig = 1;
+      this.keep_all = 1;
     endfunction: new
 
 
@@ -168,6 +171,20 @@ package m_axis_sequencer_pkg;
       `INFOV(("Descriptor delay configured"), 55);
     endfunction: set_descriptor_delay
 
+    // set all bytes valid in a sample, sets keep to 1
+    function void set_keep_all();
+      if (enabled)
+        `ERROR(("Sequencer must be disabled before configuring keep all parameter"));
+      this.keep_all = 1;
+    endfunction: set_keep_all
+
+    // bytes in a sample may not be valid, sets some bits of keep to 0
+    function void set_keep_some();
+      if (enabled)
+        `ERROR(("Sequencer must be disabled before configuring keep all parameter"));
+      this.keep_all = 0;
+    endfunction: set_keep_some
+
     // create transfer descriptor
     function void add_xfer_descriptor(
       input int bytes_to_generate,
@@ -297,6 +314,7 @@ package m_axis_sequencer_pkg;
       super.new();
 
       this.agent = agent;
+      this.agent.vif_proxy.set_no_insert_x_when_keep_low(1);
     endfunction: new
 
 
@@ -336,19 +354,26 @@ package m_axis_sequencer_pkg;
 
       `INFOV(("packetize start"), 55);
       byte_per_beat = AXIS_VIP_DATA_WIDTH/8;
-      data = new[byte_per_beat];
-      keep = new[byte_per_beat];
       descriptor = descriptor_q.pop_front();
 
       // put a copy of the descriptor back into the queue and continue processing
       if (this.descriptor_gen_mode == 1 && enabled)
         descriptor_q.push_back(descriptor);
 
       packet_length = descriptor.num_bytes / byte_per_beat;
+      if (packet_length*byte_per_beat < descriptor.num_bytes)
+        packet_length++;
+
+      if (keep_all)
+        descriptor.num_bytes = packet_length*byte_per_beat;
 
       for (int tc=0; tc<packet_length; tc++) begin : packet_loop
+        data = new[byte_per_beat];
+        for (int i=0; i<byte_per_beat; i++)
+          data[i] = 'd0;
+        keep = new[byte_per_beat];
 
-        for (int i=0; i<byte_per_beat; i++) begin
+        for (int i=0; i<byte_per_beat && (keep_all || tc*byte_per_beat+i<descriptor.num_bytes); i++) begin
           case (data_gen_mode)
             DATA_GEN_MODE_TEST_DATA:
               // block transfer until we get data from byte stream queue

common/sv/x_monitor.sv

@@ -76,6 +76,8 @@ package x_monitor_pkg;
     // analysis port from the monitor
     protected xil_analysis_port #(axi_monitor_transaction) axi_ap;
 
+    protected T agent;
+
     protected int axi_byte_stream_size;
 
     // constructor
@@ -85,7 +87,8 @@ package x_monitor_pkg;
 
       this.enabled = 0;
 
-      this.axi_ap = agent.monitor.item_collected_port;
+      this.agent = agent;
+      this.axi_ap = this.agent.monitor.item_collected_port;
 
       this.axi_byte_stream_size = 0;
 
@@ -97,22 +100,29 @@ package x_monitor_pkg;
 
       axi_monitor_transaction transaction;
       xil_axi_data_beat data_beat;
+      xil_axi_strb_beat strb_beat;
       int num_bytes;
       logic [7:0] axi_byte;
 
       forever begin
         this.get_key();
         this.axi_ap.get(transaction);
-        if (bit'(transaction.get_cmd_type()) == bit'(operation_type)) begin
+        if (bit'(transaction.get_cmd_type()) == operation_type) begin
           this.put_key();
           num_bytes = transaction.get_data_width()/8;
           for (int i=0; i<(transaction.get_len()+1); i++) begin
             data_beat = transaction.get_data_beat(i);
+            strb_beat = transaction.get_strb_beat(i);
             for (int j=0; j<num_bytes; j++) begin
               axi_byte = data_beat[j*8+:8];
               // put each beat into byte queues
-              this.mailbox.put(axi_byte);
-              this.axi_byte_stream_size++;
+              if (operation_type == READ_OP) begin
+                this.mailbox.put(axi_byte);
+                this.axi_byte_stream_size++;
+              end else if (strb_beat[j] || !this.agent.vif_proxy.C_AXI_HAS_WSTRB) begin
+                this.mailbox.put(axi_byte);
+                this.axi_byte_stream_size++;
+              end
             end
             `INFOV(("Caught an AXI4 transaction: %d", this.axi_byte_stream_size), 100);
             this.transaction_captured();
@@ -152,7 +162,6 @@ package x_monitor_pkg;
       this.tx_sink_type = CYCLIC;
 
       this.agent = agent;
-      
       this.axis_ap = this.agent.monitor.item_collected_port;
 
     endfunction /* new */