Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup 11of20: use of built-in as local variable len|min|max #22

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e56bd5a
AhbLite3.py: assignment <= is deprecated
dlmiles May 15, 2023
bf4b5c2
Apb3.py: assignment <= is deprecated
dlmiles May 15, 2023
e622628
Axi4.py: assignment <= is deprecated
dlmiles May 15, 2023
94f7f62
ClockDomain.py: assignment <= is deprecated
dlmiles May 15, 2023
be01610
Spi.py: assignment <= is deprecated
dlmiles May 15, 2023
16fc943
Stream.py: assignment <= is deprecated
dlmiles May 15, 2023
bfb831d
misc.py: assignment <= is deprecated
dlmiles May 15, 2023
d28bc43
AhbLite3.py: import local ref change
dlmiles May 15, 2023
f13c70a
Apb3.py: import local ref change
dlmiles May 15, 2023
72cf466
Axi4.py: import local ref change
dlmiles May 15, 2023
17baf5e
Flow.py: import local ref change
dlmiles May 15, 2023
450f855
Scorboard.py: import local ref change
dlmiles May 15, 2023
2afed89
Spi.py: import local ref change
dlmiles May 15, 2023
1373392
Stream.py: import local ref change
dlmiles May 15, 2023
38393a7
AhbLite3.py: cocotb.fork is deprecated
dlmiles May 15, 2023
2dae019
ClockDomain.py: cocotb.fork is deprecated
dlmiles May 15, 2023
c74e92f
Flow.py: cocotb.fork is deprecated
dlmiles May 15, 2023
4a2ced2
Stream.py: cocotb.fork is deprecated
dlmiles May 15, 2023
f7248f0
AhbLite3.py: consistently use @coroutine
dlmiles May 15, 2023
6ea4610
Apb3.py: consistently use @coroutine
dlmiles May 15, 2023
9800fd5
ClockDomain.py: consistently use @coroutine
dlmiles May 15, 2023
f6bd5e9
Flow.py: consistently use @coroutine
dlmiles May 15, 2023
102db6f
Phase.py: consistently use @coroutine
dlmiles May 15, 2023
13927f9
Spi.py: consistently use @coroutine
dlmiles May 15, 2023
7297265
Stream.py: consistently use @coroutine
dlmiles May 15, 2023
25ddfc3
misc.py: consistently use @coroutine
dlmiles May 15, 2023
0a283f0
AhbLite3.py: dut.log is deprecated
dlmiles May 15, 2023
4c47bad
Scorboard.py: dut.log is deprecated
dlmiles May 15, 2023
3b92a7d
AhbLite3.py: Whitespace change only
dlmiles May 15, 2023
1749517
Apb3.py: Whitespace change only
dlmiles May 15, 2023
1ae8205
Axi4.py: Whitespace change only
dlmiles May 15, 2023
29ef28e
ClockDomain.py: Whitespace change only
dlmiles May 15, 2023
2b5392a
Flow.py: Whitespace change only
dlmiles May 15, 2023
cea05b3
Phase.py: Whitespace change only
dlmiles May 15, 2023
0beca2b
Scorboard.py: Whitespace change only
dlmiles May 15, 2023
5c28060
Spi.py: Whitespace change only
dlmiles May 15, 2023
899580f
Stream.py: Whitespace change only
dlmiles May 15, 2023
39eb195
TriState.py: Whitespace change only
dlmiles May 15, 2023
92187c7
misc.py: Whitespace change only
dlmiles May 15, 2023
ba836ea
AhbLite3.py: Whitespace change only (2nd)
dlmiles May 15, 2023
8f38841
Apb3.py: Whitespace change only (2nd)
dlmiles May 15, 2023
21cd582
ClockDomain.py: Whitespace change only (2nd)
dlmiles May 15, 2023
9ec680f
Flow.py: Whitespace change only (2nd)
dlmiles May 15, 2023
395b015
ClockDomain.py: equality operator with object None
dlmiles May 15, 2023
0ef489f
Phase.py: equality operator with object None
dlmiles May 15, 2023
b9b12e9
Stream.py: equality operator with object None
dlmiles May 15, 2023
4edbbd0
ClockDomain.py: stray trailing semicolon
dlmiles May 15, 2023
9f8c616
Apb3.py: equality operator with True|False
dlmiles May 15, 2023
cdf8ad5
Stream.py: equality operator with True|False
dlmiles May 15, 2023
2ec3e91
misc.py equality operator with True|False
dlmiles May 15, 2023
26ccddc
Axi4.py: use of built-in as local variable len|min|max
dlmiles May 15, 2023
400c1cd
misc.py: use of built-in as local variable len|min|max
dlmiles May 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 80 additions & 77 deletions AhbLite3.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,54 @@
import cocotb
from cocotb.result import TestFailure
from cocotb.triggers import RisingEdge, Edge
from cocotb.decorators import coroutine

from cocotblib.misc import log2Up, BoolRandomizer, assertEquals
from .misc import log2Up, BoolRandomizer, assertEquals


def AhbLite3MasterIdle(ahb):
ahb.HADDR <= 0
ahb.HWRITE <= 0
ahb.HSIZE <= 0
ahb.HBURST <= 0
ahb.HPROT <= 0
ahb.HTRANS <= 0
ahb.HMASTLOCK <= 0
ahb.HWDATA <= 0

ahb.HADDR.value = 0
ahb.HWRITE.value = 0
ahb.HSIZE.value = 0
ahb.HBURST.value = 0
ahb.HPROT.value = 0
ahb.HTRANS.value = 0
ahb.HMASTLOCK.value = 0
ahb.HWDATA.value = 0


class AhbLite3Transaction:
def __init__(self):
self.HADDR = 0
self.HWRITE = 0
self.HSIZE = 0
self.HBURST = 0
self.HPROT = 0
self.HTRANS = 0
self.HADDR = 0
self.HWRITE = 0
self.HSIZE = 0
self.HBURST = 0
self.HPROT = 0
self.HTRANS = 0
self.HMASTLOCK = 0
self.HWDATA = 0
self.HWDATA = 0


class AhbLite3TraficGenerator:
def __init__(self,addressWidth,dataWidth):
def __init__(self, addressWidth, dataWidth):
self.addressWidth = addressWidth
self.dataWidth = dataWidth

def genRandomAddress(self):
return random.randint(0,(1 << self.addressWidth)-1)
return random.randint(0, (1 << self.addressWidth)-1)

def getTransactions(self):
if random.random() < 0.8:
trans = AhbLite3Transaction()
return [trans]
else:
OneKiB = 1 << 10 # this pesky 1 KiB wall a burst must not cross
hSize = random.randint(0,log2Up(self.dataWidth//8))
hSize = random.randint(0, log2Up(self.dataWidth//8))
bytesPerBeat = 1 << hSize
maxBurst = 5 if hSize == 7 else 7 # a full-width 1024 bit bus can only burst up to 8 beats for not crossing a 1 KiB boundary
burst = random.randint(0,maxBurst)
maxBurst = 5 if hSize == 7 else 7 # a full-width 1024 bit bus can only burst up to 8 beats for not crossing a 1 KiB boundary
burst = random.randint(0, maxBurst)
write = random.random() < 0.5
prot = random.randint(0,15)
prot = random.randint(0, 15)
address = self.genRandomAddress() & ~(bytesPerBeat-1)

incrUnspecified = burst == 1
Expand All @@ -57,17 +59,17 @@ def getTransactions(self):

if incrUnspecified:
maxBeats = (OneKiB - (address % OneKiB)) // bytesPerBeat
burstBeats = random.randint(1,maxBeats)
burstBeats = random.randint(1, maxBeats)
else:
burstCase = burst >> 1
burstBeats = [1,4,8,16][burstCase]
burstBeats = [1, 4, 8, 16][burstCase]

burstBytes = bytesPerBeat*burstBeats

while incrFixed and ((address % OneKiB) + burstBytes) > OneKiB:
address = address - bytesPerBeat

addressBase = address - address % burstBytes # for wrapFixed bursts
addressBase = address - address % burstBytes # for wrapFixed bursts

buffer = []
for beat in range(burstBeats):
Expand All @@ -80,98 +82,100 @@ def getTransactions(self):
trans.HBURST = burst
trans.HPROT = prot
trans.HADDR = address
trans.HTRANS = 1 # BUSY
trans.HWDATA = random.randint(0,(1 << self.dataWidth)-1)
trans.HTRANS = 1 # BUSY
trans.HWDATA = random.randint(0, (1 << self.dataWidth)-1)
buffer.append(trans)
trans = AhbLite3Transaction()
trans.HWRITE = write
trans.HSIZE = hSize
trans.HBURST = burst
trans.HPROT = prot
trans.HADDR = address
trans.HTRANS = 2 if beat == 0 else 3 # first beat is NONSEQ, others are SEQ
trans.HWDATA = random.randint(0,(1 << self.dataWidth)-1)
trans.HTRANS = 2 if beat == 0 else 3 # first beat is NONSEQ, others are SEQ
trans.HWDATA = random.randint(0, (1 << self.dataWidth)-1)
address += bytesPerBeat
if wrapFixed and (address == addressBase + burstBytes):
address = addressBase
buffer.append(trans)
return buffer


class AhbLite3MasterDriver:
def __init__(self,ahb,transactor,clk,reset):
def __init__(self, ahb, transactor, clk, reset):
self.ahb = ahb
self.clk = clk
self.reset = reset
self.transactor = transactor
cocotb.fork(self.stim())
cocotb.start_soon(self.stim())

@cocotb.coroutine
@coroutine
def stim(self):
ahb = self.ahb
ahb.HADDR <= 0
ahb.HWRITE <= 0
ahb.HSIZE <= 0
ahb.HBURST <= 0
ahb.HPROT <= 0
ahb.HTRANS <= 0
ahb.HMASTLOCK <= 0
ahb.HWDATA <= 0
ahb.HADDR.value = 0
ahb.HWRITE.value = 0
ahb.HSIZE.value = 0
ahb.HBURST.value = 0
ahb.HPROT.value = 0
ahb.HTRANS.value = 0
ahb.HMASTLOCK.value = 0
ahb.HWDATA.value = 0
HWDATAbuffer = 0
while True:
for trans in self.transactor.getTransactions():
yield RisingEdge(self.clk)
while int(self.ahb.HREADY) == 0:
yield RisingEdge(self.clk)

ahb.HADDR <= trans.HADDR
ahb.HWRITE <= trans.HWRITE
ahb.HSIZE <= trans.HSIZE
ahb.HBURST <= trans.HBURST
ahb.HPROT <= trans.HPROT
ahb.HTRANS <= trans.HTRANS
ahb.HMASTLOCK <= trans.HMASTLOCK
ahb.HWDATA <= HWDATAbuffer
ahb.HADDR.value = trans.HADDR
ahb.HWRITE.value = trans.HWRITE
ahb.HSIZE.value = trans.HSIZE
ahb.HBURST.value = trans.HBURST
ahb.HPROT.value = trans.HPROT
ahb.HTRANS.value = trans.HTRANS
ahb.HMASTLOCK.value = trans.HMASTLOCK
ahb.HWDATA.value = HWDATAbuffer
HWDATAbuffer = trans.HWDATA


class AhbLite3Terminaison:
def __init__(self,ahb,clk,reset):
def __init__(self, ahb, clk, reset):
self.ahb = ahb
self.clk = clk
self.reset = reset
self.randomHREADY = True
cocotb.fork(self.stim())
cocotb.fork(self.combEvent())
cocotb.start_soon(self.stim())
cocotb.start_soon(self.combEvent())

@cocotb.coroutine
@coroutine
def stim(self):
randomizer = BoolRandomizer()
self.ahb.HREADY <= 1
self.ahb.HSEL <= 1
self.ahb.HREADY.value = 1
self.ahb.HSEL.value = 1
while True:
yield RisingEdge(self.clk)
self.randomHREADY = randomizer.get()
self.doComb()

@cocotb.coroutine
@coroutine
def combEvent(self):
while True:
yield Edge(self.ahb.HREADYOUT)
self.doComb()

def doComb(self):
self.ahb.HREADY <= (self.randomHREADY and (int(self.ahb.HREADYOUT) == 1))
self.ahb.HREADY.value = (self.randomHREADY and (int(self.ahb.HREADYOUT) == 1))


class AhbLite3MasterReadChecker:
def __init__(self,ahb,buffer,clk,reset):
def __init__(self, ahb, buffer, clk, reset):
self.ahb = ahb
self.clk = clk
self.reset = reset
self.buffer = buffer
self.counter = 0
cocotb.fork(self.stim())
cocotb.start_soon(self.stim())

@cocotb.coroutine
@coroutine
def stim(self):
ahb = self.ahb
readIncoming = False
Expand All @@ -184,33 +188,32 @@ def stim(self):

bufferData = self.buffer.get()
for i in range(byteOffset,byteOffset + size):
assertEquals((int(ahb.HRDATA) >> (i*8)) & 0xFF,(bufferData >> (i*8)) & 0xFF,"AHB master read checker faild %x " %(int(ahb.HADDR)) )
assertEquals((int(ahb.HRDATA) >> (i*8)) & 0xFF, (bufferData >> (i*8)) & 0xFF, "AHB master read checker faild %x " % (int(ahb.HADDR)))

self.counter += 1
# cocotb.log.info("POP " + str(self.buffer.qsize()))
# cocotb._log.info("POP " + str(self.buffer.qsize()))

readIncoming = int(ahb.HTRANS) >= 2 and int(ahb.HWRITE) == 0
size = 1 << int(ahb.HSIZE)
byteOffset = int(ahb.HADDR) % (len(ahb.HWDATA) // 8)



class AhbLite3SlaveMemory:
def __init__(self,ahb,base,size,clk,reset):
def __init__(self, ahb, base, size, clk, reset):
self.ahb = ahb
self.clk = clk
self.reset = reset
self.base = base
self.size = size
self.ram = bytearray(b'\x00' * size)

cocotb.fork(self.stim())
cocotb.fork(self.stimReady())
cocotb.start_soon(self.stim())
cocotb.start_soon(self.stimReady())

@cocotb.coroutine
@coroutine
def stimReady(self):
randomizer = BoolRandomizer()
self.ahb.HREADYOUT <= 1
self.ahb.HREADYOUT.value = 1
busy = False
while True:
yield RisingEdge(self.clk)
Expand All @@ -222,16 +225,16 @@ def stimReady(self):
raise TestFailure("HREADYOUT == 0 but HREADY == 1 ??? " + self.ahb.HREADY._name)
busy = busyNew
if (busy):
self.ahb.HREADYOUT <= randomizer.get() # make some random delay for NONSEQ and SEQ requests
self.ahb.HREADYOUT.value = randomizer.get() # make some random delay for NONSEQ and SEQ requests
else:
self.ahb.HREADYOUT <= 1 # IDLE and BUSY require 0 WS
self.ahb.HREADYOUT.value = 1 # IDLE and BUSY require 0 WS

@cocotb.coroutine
@coroutine
def stim(self):
ahb = self.ahb
ahb.HREADYOUT <= 1
ahb.HRESP <= 0
ahb.HRDATA <= 0
ahb.HREADYOUT.value = 1
ahb.HRESP.value = 0
ahb.HRDATA.value = 0
valid = 0
while True:
yield RisingEdge(self.clk)
Expand All @@ -242,7 +245,7 @@ def stim(self):
if trans >= 2:
if write == 1:
for idx in range(size):
self.ram[address-self.base + idx] = (int(ahb.HWDATA) >> (8*(addressOffset + idx))) & 0xFF
self.ram[address-self.base + idx] = (int(ahb.HWDATA) >> (8*(addressOffset + idx))) & 0xFF
# print("write %x with %x" % (address + idx,(int(ahb.HWDATA) >> (8*(addressOffset + idx))) & 0xFF))

valid = int(ahb.HSEL)
Expand All @@ -252,7 +255,7 @@ def stim(self):
address = int(ahb.HADDR)
addressOffset = address % (len(ahb.HWDATA)//8)

ahb.HRDATA <= 0
ahb.HRDATA.value = 0
if valid == 1:
if trans >= 2:
if write == 0:
Expand All @@ -261,4 +264,4 @@ def stim(self):
data |= self.ram[address-self.base + idx] << (8*(addressOffset + idx))
# print("read %x with %x" % (address + idx, self.ram[address-self.base + idx]))
# print(str(data))
ahb.HRDATA <= int(data)
ahb.HRDATA.value = int(data)
Loading