Take hready into considration

bus_env/bus_agent/bus_ahb_driver.py

@@ -1,42 +1,54 @@
 from uvm.macros import uvm_component_utils, uvm_fatal, uvm_info, uvm_warning
-from cocotb.triggers import Timer, RisingEdge, Lock, NextTimeStep
+from cocotb.triggers import Timer, RisingEdge, Lock, NextTimeStep, Event
 from uvm.base.uvm_object_globals import UVM_HIGH, UVM_MEDIUM, UVM_LOW
 from EF_UVM.bus_env.bus_item import bus_item
 from EF_UVM.bus_env.bus_agent.bus_base_driver import bus_base_driver
 import cocotb
+from cocotb.queue import Queue
 
 
 class bus_ahb_driver(bus_base_driver):
     def __init__(self, name="bus_ahb_driver", parent=None):
         super().__init__(name, parent)
         self.tag = name
+        self.piping_q = TX_QUEUE(maxsize=2)
         self.data_phase_lock = Lock()  # to get only one in piping
 
     async def run_phase(self, phase):
         uvm_info(self.tag, "run_phase started", UVM_MEDIUM)
         while True:
             tr = []
             await self.seq_item_port.get_next_item(tr)
+            await self.piping_q.put(tr[0])
             await self.is_rising_edge()
-            tr = tr[0]
+            tr = await self.piping_q.get_no_pop()
             uvm_info(
                 self.tag,
-                f"Driving trans into DUT: {tr.convert2string()} sequence id {tr.id}",
-                UVM_HIGH,
+                f"Driving trans into DUT: {tr.convert2string()} sequence id {tr}",
+                UVM_LOW,
             )
             if tr.kind == bus_item.RESET:
                 uvm_info(self.tag, "Doing reset", UVM_MEDIUM)
                 await self.reset()
+                await self.piping_q.get()
                 self.seq_item_port.item_done()
             elif tr.kind == bus_item.NOPE:
                 for _ in range(tr.data):
                     await self.drive_delay()
+                await self.piping_q.get()
                 self.seq_item_port.item_done()
             else:
-                await self.address_phase(tr)
-                await self.data_phase_lock.acquire()
-                await cocotb.start(self.data_phase(tr))
-                self.seq_item_port.item_done()
+                if not self.piping_q.empty():
+                    tr = await self.piping_q.get_no_pop()
+                    await self.address_phase(tr)
+                if self.piping_q.qsize() == 1:
+                    self.end_of_trans()
+                if not self.piping_q.empty():
+                    await self.data_phase_lock.acquire()
+                    tr = await self.piping_q.get()
+                    await cocotb.start(self.data_phase(tr))
+                    self.seq_item_port.item_done()
+
 
     async def address_phase(self, tr):
         uvm_info(
@@ -98,9 +110,24 @@ async def data_phase(self, tr):
 
     def end_of_trans(self):
         self.vif.HSEL.value = 0b00
-        self.vif.HREADY.value = 0b00
+        self.vif.HREADY.value = 0b01
         self.vif.HTRANS.value = 0b00
         self.vif.HWRITE.value = 0
 
 
 uvm_component_utils(bus_ahb_driver)
+
+
+class TX_QUEUE(Queue):
+    """same queue provided by cocotb but with 2 new functions to get the tx value send it and then pop it from the queue after sending"""
+
+    def __init__(self, maxsize: int = 0):
+        super().__init__(maxsize)
+
+    async def get_no_pop(self):
+        """same as get but without popping it from the queue"""
+        while self.empty():
+            event = Event("{} get".format(type(self).__name__))
+            self._getters.append((event, cocotb.scheduler._current_task))
+            await event.wait()
+        return self._queue[0]