diff --git a/examples/network-fifo-chain/test.py b/examples/network-fifo-chain/test.py index df5ed292..e471c322 100755 --- a/examples/network-fifo-chain/test.py +++ b/examples/network-fifo-chain/test.py @@ -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 @@ -182,10 +182,7 @@ 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') diff --git a/examples/network/test.py b/examples/network/test.py index a951b380..429f1760 100755 --- a/examples/network/test.py +++ b/examples/network/test.py @@ -7,7 +7,7 @@ import numpy as np -import umi +from umi import sumi from switchboard import SbNetwork from pathlib import Path @@ -106,10 +106,7 @@ 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') @@ -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') diff --git a/examples/requirements.txt b/examples/requirements.txt index 88c88d5e..f5809b1c 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -1,2 +1,2 @@ # Examples dependencies -umi-hw >= 0.1.0, < 0.2.0 +umi >= 0.1.0, < 0.2.0 diff --git a/examples/tcp/fifos/fifos.py b/examples/tcp/fifos/fifos.py index 49e75842..30c7c9f4 100755 --- a/examples/tcp/fifos/fifos.py +++ b/examples/tcp/fifos/fifos.py @@ -7,7 +7,7 @@ import sys import signal -import umi +from umi import sumi from switchboard import SbNetwork, TcpIntf, flip_intf @@ -107,10 +107,7 @@ 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') diff --git a/examples/tcp/ram/ram.py b/examples/tcp/ram/ram.py index 60b10225..6f599406 100755 --- a/examples/tcp/ram/ram.py +++ b/examples/tcp/ram/ram.py @@ -7,7 +7,7 @@ import sys import signal -import umi +from umi import sumi from switchboard import SbNetwork, TcpIntf from pathlib import Path @@ -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') diff --git a/examples/umi_endpoint/test.py b/examples/umi_endpoint/test.py index f0c4548e..08e2c12c 100755 --- a/examples/umi_endpoint/test.py +++ b/examples/umi_endpoint/test.py @@ -7,7 +7,7 @@ import numpy as np from switchboard import UmiTxRx, SbDut -import umi +from umi import sumi def main(): @@ -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() diff --git a/examples/umi_fifo/test.py b/examples/umi_fifo/test.py index 9200cec7..36c22ffe 100755 --- a/examples/umi_fifo/test.py +++ b/examples/umi_fifo/test.py @@ -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(): @@ -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() diff --git a/examples/umi_fifo_flex/test.py b/examples/umi_fifo_flex/test.py index daf6127a..e50a0b5d 100755 --- a/examples/umi_fifo_flex/test.py +++ b/examples/umi_fifo_flex/test.py @@ -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(): @@ -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() diff --git a/examples/umi_gpio/test.py b/examples/umi_gpio/test.py index 37e4ed70..bfa583ea 100755 --- a/examples/umi_gpio/test.py +++ b/examples/umi_gpio/test.py @@ -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 @@ -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') diff --git a/examples/umi_splitter/test.py b/examples/umi_splitter/test.py index 7fd2e479..0009b3f7 100755 --- a/examples/umi_splitter/test.py +++ b/examples/umi_splitter/test.py @@ -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(): @@ -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() diff --git a/examples/umiparam-network/test.py b/examples/umiparam-network/test.py index 601ef531..67710750 100755 --- a/examples/umiparam-network/test.py +++ b/examples/umiparam-network/test.py @@ -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 @@ -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') diff --git a/examples/umiparam/test.py b/examples/umiparam/test.py index 7307d5dd..22f04f86 100755 --- a/examples/umiparam/test.py +++ b/examples/umiparam/test.py @@ -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 @@ -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') diff --git a/examples/umiram/test.py b/examples/umiram/test.py index fbedb84a..ddb07ea5 100755 --- a/examples/umiram/test.py +++ b/examples/umiram/test.py @@ -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 @@ -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() diff --git a/requirements.txt b/requirements.txt index 44bb3f3d..578f431c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ numpy tqdm -siliconcompiler >= 0.25.0, < 0.27.0 +siliconcompiler >= 0.26.0, < 0.27.0 # Testing dependencies #:test