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

switch to umi #252

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions examples/network-fifo-chain/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This code is licensed under Apache License 2.0 (see LICENSE for details)

import os
import umi
from umi import sumi
from copy import deepcopy

from switchboard import SbNetwork, umi_loopback, TcpIntf
Expand Down Expand Up @@ -182,12 +182,9 @@ def make_umi_fifo(net):
dut = net.make_dut('umi_fifo', parameters=parameters, interfaces=interfaces,
clocks=clocks, resets=resets, tieoffs=tieoffs)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.input('umi/rtl/umi_fifo.v', package='umi')
dut.input('sumi/rtl/umi_fifo.v', package='umi')

return dut

Expand Down
14 changes: 4 additions & 10 deletions examples/network/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import numpy as np

import umi
from umi import sumi
from switchboard import SbNetwork

from pathlib import Path
Expand Down Expand Up @@ -106,12 +106,9 @@ def make_umi_fifo(net):
dut = net.make_dut('umi_fifo', parameters=parameters, interfaces=interfaces,
clocks=clocks, resets=resets, tieoffs=tieoffs)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.input('umi/rtl/umi_fifo.v', package='umi')
dut.input('sumi/rtl/umi_fifo.v', package='umi')

return dut

Expand Down Expand Up @@ -170,10 +167,7 @@ def make_umi2axil(net):
dut = net.make_dut('umi2axilite', parameters=parameters,
interfaces=interfaces, resets=resets)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.input('utils/rtl/umi2axilite.v', package='umi')

Expand Down
2 changes: 1 addition & 1 deletion examples/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Examples dependencies
umi-hw >= 0.1.0, < 0.2.0
umi >= 0.1.0, < 0.2.0
9 changes: 3 additions & 6 deletions examples/tcp/fifos/fifos.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import sys
import signal

import umi
from umi import sumi
from switchboard import SbNetwork, TcpIntf, flip_intf


Expand Down Expand Up @@ -107,12 +107,9 @@ def make_umi_fifo(net, dw, aw, cw):
dut = net.make_dut('umi_fifo', parameters=parameters, interfaces=interfaces,
clocks=clocks, resets=resets, tieoffs=tieoffs)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.input('umi/rtl/umi_fifo.v', package='umi')
dut.input('sumi/rtl/umi_fifo.v', package='umi')

return dut

Expand Down
5 changes: 2 additions & 3 deletions examples/tcp/ram/ram.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import sys
import signal

import umi
from umi import sumi
from switchboard import SbNetwork, TcpIntf

from pathlib import Path
Expand Down Expand Up @@ -73,8 +73,7 @@ def make_umiram(net):

dut = net.make_dut('umiram', parameters=parameters, interfaces=interfaces)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.use(sumi)

dut.input(THIS_DIR.parent.parent / 'common' / 'verilog' / 'umiram.sv', package='umi')

Expand Down
6 changes: 2 additions & 4 deletions examples/umi_endpoint/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import numpy as np
from switchboard import UmiTxRx, SbDut
import umi
from umi import sumi


def main():
Expand Down Expand Up @@ -79,9 +79,7 @@ def build_testbench():

dut.input('testbench.sv')

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.use(sumi)

dut.build()

Expand Down
7 changes: 2 additions & 5 deletions examples/umi_fifo/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This code is licensed under Apache License 2.0 (see LICENSE for details)

from switchboard import random_umi_packet, SbDut
import umi
from umi import sumi


def main():
Expand Down Expand Up @@ -87,10 +87,7 @@ def build_testbench():
parameters=parameters, interfaces=interfaces, clocks=clocks, resets=resets,
tieoffs=tieoffs)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.build()

Expand Down
7 changes: 2 additions & 5 deletions examples/umi_fifo_flex/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This code is licensed under Apache License 2.0 (see LICENSE for details)

from switchboard import SbDut, umi_loopback
import umi
from umi import sumi


def main():
Expand Down Expand Up @@ -67,10 +67,7 @@ def build_testbench():
parameters=parameters, interfaces=interfaces, clocks=clocks, resets=resets,
tieoffs=tieoffs)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.build()

Expand Down
5 changes: 2 additions & 3 deletions examples/umi_gpio/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2024 Zero ASIC Corporation
# This code is licensed under Apache License 2.0 (see LICENSE for details)

import umi
from umi import sumi
import random
from switchboard import SbNetwork, sb_path

Expand Down Expand Up @@ -143,8 +143,7 @@ def make_umi_gpio(net, owidth, iwidth):

block = net.make_dut('umi_gpio', parameters=parameters, interfaces=interfaces, resets=resets)

block.use(umi)
block.add('option', 'library', 'umi')
block.use(sumi)

block.input(sb_path() / 'verilog' / 'common' / 'umi_gpio.v')

Expand Down
7 changes: 2 additions & 5 deletions examples/umi_splitter/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This code is licensed under Apache License 2.0 (see LICENSE for details)

from switchboard import SbDut, random_umi_packet
import umi
from umi import sumi


def main():
Expand Down Expand Up @@ -78,10 +78,7 @@ def build_testbench():
dut = SbDut('umi_splitter', autowrap=True, cmdline=True, extra_args=extra_args,
interfaces=interfaces, clocks=[])

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.build()

Expand Down
7 changes: 2 additions & 5 deletions examples/umiparam-network/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2024 Zero ASIC Corporation
# This code is licensed under Apache License 2.0 (see LICENSE for details)

import umi
from umi import sumi
import numpy as np

from copy import deepcopy
Expand Down Expand Up @@ -112,10 +112,7 @@ def make_umiparam(net):

dut = net.make_dut('umiparam', parameters=parameters, interfaces=interfaces, resets=resets)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.set('option', 'idir', sb_path() / 'verilog' / 'common')

Expand Down
7 changes: 2 additions & 5 deletions examples/umiparam/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2024 Zero ASIC Corporation
# This code is licensed under Apache License 2.0 (see LICENSE for details)

import umi
from umi import sumi
import numpy as np

from switchboard import SbDut
Expand Down Expand Up @@ -47,10 +47,7 @@ def build_testbench():
dut = SbDut('umiparam', cmdline=True, autowrap=True, parameters=parameters,
interfaces=interfaces, resets=resets)

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.add('option', 'library', 'lambdalib_auxlib')
dut.add('option', 'library', 'lambdalib_ramlib')
dut.use(sumi)

dut.input('../common/verilog/umiparam.sv')

Expand Down
5 changes: 2 additions & 3 deletions examples/umiram/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import numpy as np
from pathlib import Path
from switchboard import SbDut, UmiTxRx, binary_run
import umi
from umi import sumi

THIS_DIR = Path(__file__).resolve().parent

Expand Down Expand Up @@ -94,8 +94,7 @@ def build_testbench():
dut.input('testbench.sv')
dut.input(THIS_DIR.parent / 'common' / 'verilog' / 'umiram.sv')

dut.use(umi)
dut.add('option', 'library', 'umi')
dut.use(sumi)

dut.build()

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

numpy
tqdm
siliconcompiler >= 0.25.0, < 0.27.0
siliconcompiler >= 0.26.0, < 0.27.0

# Testing dependencies
#:test
Expand Down