bslathi19/cocotbext-axi
1
0
Fork 0
Code Issues Actions Packages Projects Releases 5 Wiki Activity

Roll wait_for_token into wait

Browse Source
This commit is contained in:
Alex Forencich
2020-12-01 17:36:30 -08:00
parent 5c4072cb16
commit 0f93292f6e
2 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
cocotbext/axi/axi_master.py
View File

@@ -136,17 +136,17 @@ class AxiMasterWrite(object):
def idle(self): def idle(self):
return not self.in_flight_operations return not self.in_flight_operations
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
self.write_resp_sync.clear() while not self.idle():
await self.write_resp_sync.wait() self.write_resp_sync.clear()
await self.write_resp_sync.wait()
async def wait_for_token(self, token): else:
if token not in self.active_tokens: if token not in self.active_tokens:
return raise ValueError("Unknown token")
while token not in self.write_resp_set: while token not in self.write_resp_set:
self.write_resp_sync.clear() self.write_resp_sync.clear()
await self.write_resp_sync.wait() await self.write_resp_sync.wait()
def write_resp_ready(self, token=None): def write_resp_ready(self, token=None):
if token is not None: if token is not None:
@@ -175,7 +175,7 @@ class AxiMasterWrite(object):
lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0): lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0):
token = object() token = object()
self.init_write(address, data, awid, burst, size, lock, cache, prot, qos, region, user, token) self.init_write(address, data, awid, burst, size, lock, cache, prot, qos, region, user, token)
await self.wait_for_token(token) await self.wait(token)
return self.get_write_resp(token) return self.get_write_resp(token)
async def write_words(self, address, data, ws=2, awid=None, burst=AxiBurstType.INCR, size=None, async def write_words(self, address, data, ws=2, awid=None, burst=AxiBurstType.INCR, size=None,
@@ -448,17 +448,17 @@ class AxiMasterRead(object):
def idle(self): def idle(self):
return not self.in_flight_operations return not self.in_flight_operations
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
self.read_resp_sync.clear() while not self.idle():
await self.read_resp_sync.wait() self.read_data_sync.clear()
await self.read_data_sync.wait()
async def wait_for_token(self, token): else:
if token not in self.active_tokens: if token not in self.active_tokens:
return raise ValueError("Unknown token")
while token not in self.read_data_set: while token not in self.read_data_set:
self.read_data_sync.clear() self.read_data_sync.clear()
await self.read_data_sync.wait() await self.read_data_sync.wait()
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
if token is not None: if token is not None:
@@ -487,7 +487,7 @@ class AxiMasterRead(object):
lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0): lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0):
token = object() token = object()
self.init_read(address, length, arid, burst, size, lock, cache, prot, qos, region, user, token) self.init_read(address, length, arid, burst, size, lock, cache, prot, qos, region, user, token)
await self.wait_for_token(token) await self.wait(token)
return self.get_read_data(token) return self.get_read_data(token)
async def read_words(self, address, count, ws=2, arid=None, burst=AxiBurstType.INCR, size=None, async def read_words(self, address, count, ws=2, arid=None, burst=AxiBurstType.INCR, size=None,
@@ -694,16 +694,22 @@ class AxiMaster(object):
def idle(self): def idle(self):
return (not self.read_if or self.read_if.idle()) and (not self.write_if or self.write_if.idle()) return (not self.read_if or self.read_if.idle()) and (not self.write_if or self.write_if.idle())
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
await self.write_if.wait() while not self.idle():
await self.read_if.wait() await self.write_if.wait()
await self.read_if.wait()
else:
if token in self.write_if.active_tokens:
await self.write_if.wait(token)
else:
await self.read_if.wait(token)
async def wait_read(self): async def wait_read(self, token=None):
await self.read_if.wait() await self.read_if.wait(token)
async def wait_write(self): async def wait_write(self, token=None):
await self.write_if.wait() await self.write_if.wait(token)
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
return self.read_if.read_data_ready(token) return self.read_if.read_data_ready(token)

70
cocotbext/axi/axil_master.py
View File

@@ -101,17 +101,17 @@ class AxiLiteMasterWrite(object):
def idle(self): def idle(self):
return not self.in_flight_operations return not self.in_flight_operations
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
self.write_resp_sync.clear() while not self.idle():
await self.write_resp_sync.wait() self.write_resp_sync.clear()
await self.write_resp_sync.wait()
async def wait_for_token(self, token): else:
if token not in self.active_tokens: if token not in self.active_tokens:
return raise ValueError("Unknown token")
while token not in self.write_resp_set: while token not in self.write_resp_set:
self.write_resp_sync.clear() self.write_resp_sync.clear()
await self.write_resp_sync.wait() await self.write_resp_sync.wait()
def write_resp_ready(self, token=None): def write_resp_ready(self, token=None):
if token is not None: if token is not None:
@@ -139,7 +139,7 @@ class AxiLiteMasterWrite(object):
async def write(self, address, data, prot=AxiProt.NONSECURE): async def write(self, address, data, prot=AxiProt.NONSECURE):
token = object() token = object()
self.init_write(address, data, prot, token) self.init_write(address, data, prot, token)
await self.wait_for_token(token) await self.wait(token)
return self.get_write_resp(token) return self.get_write_resp(token)
async def write_words(self, address, data, ws=2, prot=AxiProt.NONSECURE): async def write_words(self, address, data, ws=2, prot=AxiProt.NONSECURE):
@@ -306,17 +306,17 @@ class AxiLiteMasterRead(object):
def idle(self): def idle(self):
return not self.in_flight_operations return not self.in_flight_operations
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
self.read_resp_sync.clear() while not self.idle():
await self.read_resp_sync.wait() self.read_data_sync.clear()
await self.read_data_sync.wait()
async def wait_for_token(self, token): else:
if token not in self.active_tokens: if token not in self.active_tokens:
return raise ValueError("Unknown token")
while token not in self.read_data_set: while token not in self.read_data_set:
self.read_data_sync.clear() self.read_data_sync.clear()
await self.read_data_sync.wait() await self.read_data_sync.wait()
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
if token is not None: if token is not None:
@@ -344,7 +344,7 @@ class AxiLiteMasterRead(object):
async def read(self, address, length, prot=AxiProt.NONSECURE): async def read(self, address, length, prot=AxiProt.NONSECURE):
token = object() token = object()
self.init_read(address, length, prot, token) self.init_read(address, length, prot, token)
await self.wait_for_token(token) await self.wait(token)
return self.get_read_data(token) return self.get_read_data(token)
async def read_words(self, address, count, ws=2, prot=AxiProt.NONSECURE): async def read_words(self, address, count, ws=2, prot=AxiProt.NONSECURE):
@@ -461,16 +461,22 @@ class AxiLiteMaster(object):
def idle(self): def idle(self):
return (not self.read_if or self.read_if.idle()) and (not self.write_if or self.write_if.idle()) return (not self.read_if or self.read_if.idle()) and (not self.write_if or self.write_if.idle())
async def wait(self): async def wait(self, token=None):
while not self.idle(): if token is None:
await self.write_if.wait() while not self.idle():
await self.read_if.wait() await self.write_if.wait()
await self.read_if.wait()
else:
if token in self.write_if.active_tokens:
await self.write_if.wait(token)
else:
await self.read_if.wait(token)
async def wait_read(self): async def wait_read(self, token=None):
await self.read_if.wait() await self.read_if.wait(token)
async def wait_write(self): async def wait_write(self, token=None):
await self.write_if.wait() await self.write_if.wait(token)
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
return self.read_if.read_data_ready(token) return self.read_if.read_data_ready(token)