From 5478f1479ae0698c894edf18c71fde45d1c3374c Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Thu, 22 Oct 2020 23:27:41 -0700 Subject: [PATCH] More efficient waiting --- cocotbext/axi/axi_master.py | 4 ++-- cocotbext/axi/axil_master.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py index b22f048..add64a6 100644 --- a/cocotbext/axi/axi_master.py +++ b/cocotbext/axi/axi_master.py @@ -527,7 +527,6 @@ class AxiMaster(object): def __init__(self, entity, name, clock, reset=None): self.write_if = None self.read_if = None - self.clock = clock self.write_if = AxiMasterWrite(entity, name, clock, reset) self.read_if = AxiMasterRead(entity, name, clock, reset) @@ -543,7 +542,8 @@ class AxiMaster(object): async def wait(self): while not self.idle(): - await RisingEdge(self.clock) + await self.write_if.wait() + await self.read_if.wait() async def wait_read(self): await self.read_if.wait() diff --git a/cocotbext/axi/axil_master.py b/cocotbext/axi/axil_master.py index 137c34d..c9b06cc 100644 --- a/cocotbext/axi/axil_master.py +++ b/cocotbext/axi/axil_master.py @@ -335,7 +335,6 @@ class AxiLiteMaster(object): def __init__(self, entity, name, clock, reset=None): self.write_if = None self.read_if = None - self.clock = clock self.write_if = AxiLiteMasterWrite(entity, name, clock, reset) self.read_if = AxiLiteMasterRead(entity, name, clock, reset) @@ -351,7 +350,8 @@ class AxiLiteMaster(object): async def wait(self): while not self.idle(): - await RisingEdge(self.clock) + await self.write_if.wait() + await self.read_if.wait() async def wait_read(self): await self.read_if.wait()