util_axis_fifo: Updated ADI AXI and AXIS agents

IstvanZsSzekely · IstvanZsSzekely · commit 76665e5cd975 · 2025-02-03T16:20:04.000+02:00
Signed-off-by: Istvan-Zsolt Szekely &lt;istvan.szekely@analog.com&gt;
diff --git a/library/vip/amd/axi/adi_axi_agent.sv b/library/vip/amd/axi/adi_axi_agent.sv
@@ -60,10 +60,23 @@ package adi_axi_agent_pkg;
       super.new(name, parent);
 
       this.agent = new("Agent", master_vip_if);
-      this.sequencer = new("Sequencer", this.agent, this);
+      this.sequencer = new("Sequencer", this.agent.wr_driver, this.agent.rd_driver, this);
       this.monitor = new("Monitor TX", this.agent.monitor, this);
     endfunction: new
 
+    task start();
+      this.agent.start_master();
+    endtask: start
+
+    task run();
+      this.monitor.run();
+    endtask: run
+
+    task stop();
+      this.monitor.stop();
+      this.agent.stop_master();
+    endtask: stop
+
   endclass: adi_axi_master_agent
 
 
@@ -85,12 +98,27 @@ package adi_axi_agent_pkg;
       this.monitor = new("Monitor TX", this.agent.monitor, this);
     endfunction: new
 
+    task start();
+      this.agent.start_slave();
+    endtask: start
+
+    task run();
+      this.monitor.run();
+    endtask: run
+
+    task stop();
+      this.monitor.stop();
+      this.agent.stop_slave();
+    endtask: stop
+
   endclass: adi_axi_slave_mem_agent
 
 
   class adi_axi_passthrough_mem_agent #(int `AXI_VIP_PARAM_ORDER(passthrough)) extends adi_agent;
 
     axi_passthrough_mem_agent #(`AXI_VIP_PARAM_ORDER(passthrough)) agent;
+    m_axi_sequencer #(`AXI_VIP_PARAM_ORDER(passthrough)) master_sequencer;
+    s_axi_sequencer #(`AXI_VIP_PARAM_ORDER(passthrough)) slave_sequencer;
     adi_axi_monitor #(`AXI_VIP_PARAM_ORDER(passthrough)) monitor;
 
     function new(
@@ -101,9 +129,26 @@ package adi_axi_agent_pkg;
       super.new(name, parent);
 
       this.agent = new("Agent", passthrough_vip_if);
+      this.master_sequencer = new("Slave Sequencer", this.agent.mst_wr_driver, this.agent.mst_rd_driver, this);
+      this.slave_sequencer = new("Slave Sequencer", this.agent.mem_model, this);
       this.monitor = new("Monitor TX", this.agent.monitor, this);
     endfunction: new
 
+    task start();
+      this.warning($sformatf("Start must called manually in the test program or environment"));
+    endtask: start
+
+    task run();
+      this.slave_sequencer.run();
+      this.monitor.run();
+    endtask: run
+
+    task stop();
+      this.monitor.stop();
+      this.agent.stop_slave();
+      this.agent.stop_master();
+    endtask: stop
+
   endclass: adi_axi_passthrough_mem_agent
 
 endpackage
diff --git a/library/vip/amd/axi/adi_axi_monitor.sv b/library/vip/amd/axi/adi_axi_monitor.sv
@@ -16,6 +16,7 @@ package adi_axi_monitor_pkg;
     adi_publisher #(logic [7:0]) publisher_rx;
 
     protected bit enabled;
+    protected event enable_ev;
 
     // constructor
     function new(
@@ -39,14 +40,27 @@ package adi_axi_monitor_pkg;
         return;
       end
 
-      fork
-        this.get_transaction();
-      join_none
-
       this.enabled = 1;
       this.info($sformatf("Monitor enabled"), ADI_VERBOSITY_MEDIUM);
+
+      fork
+        begin
+          this.get_transaction();
+        end
+        begin
+          if (this.enabled == 1) begin
+            @enable_ev;
+          end
+          disable fork;
+        end
+      join_none
     endtask: run
 
+    function void stop();
+      this.enabled = 0;
+      -> enable_ev;
+    endfunction: stop
+
     // collect data from the DDR interface, all WRITE transaction are coming
     // from the ADC and all READ transactions are going to the DAC
     task get_transaction();
diff --git a/library/vip/amd/axi/m_axi_sequencer.sv b/library/vip/amd/axi/m_axi_sequencer.sv
@@ -45,19 +45,22 @@ package m_axi_sequencer_pkg;
 
   class m_axi_sequencer #(`AXI_VIP_PARAM_DECL(AXI)) extends reg_accessor;
 
-    axi_mst_agent #(`AXI_VIP_PARAM_ORDER(AXI)) agent;
+    axi_mst_wr_driver #(`AXI_VIP_PARAM_ORDER(AXI)) wr_driver;
+    axi_mst_rd_driver #(`AXI_VIP_PARAM_ORDER(AXI)) rd_driver;
 
     semaphore reader_s;
     semaphore writer_s;
 
     function new(
       input string name,
-      input axi_mst_agent #(`AXI_VIP_PARAM_ORDER(AXI)) agent,
+      input axi_mst_wr_driver #(`AXI_VIP_PARAM_ORDER(AXI)) wr_driver,
+      input axi_mst_rd_driver #(`AXI_VIP_PARAM_ORDER(AXI)) rd_driver,
       input adi_agent parent = null);
 
       super.new(name, parent);
 
-      this.agent = agent;
+      this.wr_driver = wr_driver;
+      this.rd_driver = rd_driver;
       
       reader_s = new(1);
       writer_s = new(1);
@@ -137,15 +140,15 @@ package m_axi_sequencer_pkg;
                                   input bit [63:0]        data =0);
 
       axi_transaction  wr_trans;
-      wr_trans = agent.wr_driver.create_transaction(name);
+      wr_trans = wr_driver.create_transaction(name);
       wr_trans.set_write_cmd(addr, burst, id, len, size);
       wr_trans.set_prot(prot);
       wr_trans.set_lock(lock);
       wr_trans.set_cache(cache);
       wr_trans.set_region(region);
       wr_trans.set_qos(qos);
       wr_trans.set_data_block(data);
-      agent.wr_driver.send(wr_trans);
+      wr_driver.send(wr_trans);
 
     endtask : single_write_transaction_api
 
@@ -164,7 +167,7 @@ package m_axi_sequencer_pkg;
       input bit [63:0]        data =0);
 
       axi_transaction  wr_trans;
-      wr_trans = agent.wr_driver.create_transaction(name);
+      wr_trans = wr_driver.create_transaction(name);
       wr_trans.set_write_cmd(addr, burst, id, len, size);
       wr_trans.set_prot(prot);
       wr_trans.set_lock(lock);
@@ -173,8 +176,8 @@ package m_axi_sequencer_pkg;
       wr_trans.set_qos(qos);
       wr_trans.set_data_block(data);
       wr_trans.set_driver_return_item_policy(XIL_AXI_PAYLOAD_RETURN);
-      agent.wr_driver.send(wr_trans);
-      agent.wr_driver.wait_rsp(wr_trans);
+      wr_driver.send(wr_trans);
+      wr_driver.wait_rsp(wr_trans);
 
     endtask : single_write_transaction_readback_api
 
@@ -193,14 +196,14 @@ package m_axi_sequencer_pkg;
       input xil_axi_data_beat  aruser =0);
 
       axi_transaction   rd_trans;
-      rd_trans = agent.rd_driver.create_transaction(name);
+      rd_trans = rd_driver.create_transaction(name);
       rd_trans.set_read_cmd(addr, burst, id, len, size);
       rd_trans.set_prot(prot);
       rd_trans.set_lock(lock);
       rd_trans.set_cache(cache);
       rd_trans.set_region(region);
       rd_trans.set_qos(qos);
-      agent.rd_driver.send(rd_trans);
+      rd_driver.send(rd_trans);
     endtask : single_read_transaction_api
 
     task automatic single_read_transaction_readback_api (
@@ -219,16 +222,16 @@ package m_axi_sequencer_pkg;
       output xil_axi_data_beat Rdatabeat[]);
 
       axi_transaction   rd_trans;
-      rd_trans = agent.rd_driver.create_transaction(name);
+      rd_trans = rd_driver.create_transaction(name);
       rd_trans.set_driver_return_item_policy(XIL_AXI_PAYLOAD_RETURN);
       rd_trans.set_read_cmd(addr, burst, id, len, size);
       rd_trans.set_prot(prot);
       rd_trans.set_lock(lock);
       rd_trans.set_cache(cache);
       rd_trans.set_region(region);
       rd_trans.set_qos(qos);
-      agent.rd_driver.send(rd_trans);
-      agent.rd_driver.wait_rsp(rd_trans);
+      rd_driver.send(rd_trans);
+      rd_driver.wait_rsp(rd_trans);
       Rdatabeat = new[rd_trans.get_len()+1];
       for( xil_axi_uint beat=0; beat<rd_trans.get_len()+1; beat++) begin
         Rdatabeat[beat] = rd_trans.get_data_beat(beat);
diff --git a/library/vip/amd/axis/adi_axis_agent.sv b/library/vip/amd/axis/adi_axis_agent.sv
@@ -132,6 +132,8 @@ package adi_axis_agent_pkg;
       super.new(name, parent);
 
       this.agent = new("Agent", passthrough_vip_if);
+      this.master_sequencer = new("Master Sequencer", this.agent.mst_driver, this);
+      this.slave_sequencer = new("Slave Sequencer", this.agent.slv_driver, this);
       this.monitor = new("Monitor", this.agent.monitor, this);
     endfunction: new
 
