Skip to content

Commit 2782cc5

Browse files
gadfortgadfort
committed
change more
1 parent caf8e5e commit 2782cc5

File tree

9 files changed

+43
-44
lines changed

9 files changed

+43
-44
lines changed

‎lambdalib/auxlib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33
import lambdalib.stdlib
44

55

@@ -12,7 +12,7 @@ def setup():
1212
'''
1313

1414
lib = Library('lambdalib_auxlib', package='lambdalib', auto_enable=True)
15-
register_data_source(lib)
15+
lambdalib._common.register_data_source(lib)
1616

1717
lib.add('option', 'ydir', "auxlib/rtl")
1818

‎lambdalib/fpgalib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33

44

55
########################
@@ -11,7 +11,7 @@ def setup():
1111
'''
1212

1313
lib = Library('lambdalib_fpgalib', package='lambdalib', auto_enable=True)
14-
register_data_source(lib)
14+
lambdalib._common.register_data_source(lib)
1515

1616
lib.add('option', 'ydir', "fpgalib/rtl")
1717

‎lambdalib/iolib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33

44

55
########################
@@ -11,7 +11,7 @@ def setup():
1111
'''
1212

1313
lib = Library('lambdalib_iolib', package='lambdalib', auto_enable=True)
14-
register_data_source(lib)
14+
lambdalib._common.register_data_source(lib)
1515

1616
lib.add('option', 'ydir', "iolib/rtl")
1717

‎lambdalib/padring/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33
import lambdalib.iolib
44

55

@@ -12,7 +12,7 @@ def setup():
1212
'''
1313

1414
lib = Library('lambdalib_padring', package='lambdalib', auto_enable=True)
15-
register_data_source(lib)
15+
lambdalib._common.register_data_source(lib)
1616

1717
lib.add('option', 'idir', "padring/rtl")
1818
lib.add('option', 'ydir', "padring/rtl")

‎lambdalib/ramlib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33
import lambdalib.auxlib
44

55

@@ -12,7 +12,7 @@ def setup():
1212
'''
1313

1414
lib = Library('lambdalib_ramlib', package='lambdalib', auto_enable=True)
15-
register_data_source(lib)
15+
lambdalib._common.register_data_source(lib)
1616

1717
lib.add('option', 'ydir', "ramlib/rtl")
1818

‎lambdalib/ramlib/tests/tb_la_asyncfifo.py

+27-28
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@
1010
from cocotb import utils
1111

1212
import lambdalib.ramlib
13-
from lambdalib.utils._tb_common import (
14-
run_cocotb,
15-
drive_reset,
16-
random_bool_generator
17-
)
18-
from lambdalib.ramlib.tests.la_asyncfifo import (
19-
LaAsyncFifoWrBus,
20-
LaAsyncFifoRdBus,
21-
LaAsyncFifoSource,
22-
LaAsyncFifoSink
23-
)
13+
import lambdalib.utils._tb_common.run_cocotb
14+
import lambdalib.utils._tb_common.drive_reset
15+
import lambdalib.utils._tb_common.random_bool_generator
16+
17+
import lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoWrBus
18+
import lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoRdBus
19+
import lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSource
20+
import lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSink
2421

2522

2623
def bursty_en_gen(burst_len=20):
@@ -36,23 +33,23 @@ async def test_almost_full(dut):
3633
wr_clk_period_ns = 10.0
3734
rd_clk_period_ns = 10.0
3835

39-
fifo_source = LaAsyncFifoSource(
40-
bus=LaAsyncFifoWrBus.from_prefix(dut, ""),
36+
fifo_source = lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSource(
37+
bus=lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoWrBus.from_prefix(dut, ""),
4138
clock=dut.wr_clk,
4239
reset=dut.wr_nreset
4340
)
4441

45-
fifo_sink = LaAsyncFifoSink(
46-
bus=LaAsyncFifoRdBus.from_prefix(dut, ""),
42+
fifo_sink = lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSink(
43+
bus=lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoRdBus.from_prefix(dut, ""),
4744
clock=dut.rd_clk,
4845
reset=dut.rd_nreset
4946
)
5047
fifo_sink.pause()
5148

5249
# Reset DUT
5350
await Combine(
54-
cocotb.start_soon(drive_reset(dut.wr_nreset)),
55-
cocotb.start_soon(drive_reset(dut.rd_nreset))
51+
cocotb.start_soon(lambdalib.utils._tb_common.drive_reset(dut.wr_nreset)),
52+
cocotb.start_soon(lambdalib.utils._tb_common.drive_reset(dut.rd_nreset))
5653
)
5754

5855
await cocotb.start(Clock(dut.wr_clk, wr_clk_period_ns, units="ns").start())
@@ -93,24 +90,24 @@ async def fifo_rd_wr_test(
9390
rd_en_generator=None
9491
):
9592

96-
fifo_source = LaAsyncFifoSource(
97-
bus=LaAsyncFifoWrBus.from_prefix(dut, ""),
93+
fifo_source = lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSource(
94+
bus=lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoWrBus.from_prefix(dut, ""),
9895
clock=dut.wr_clk,
9996
reset=dut.wr_nreset
10097
)
101-
fifo_source.set_wr_en_generator(random_bool_generator())
98+
fifo_source.set_wr_en_generator(lambdalib.utils._tb_common.random_bool_generator())
10299

103-
fifo_sink = LaAsyncFifoSink(
104-
bus=LaAsyncFifoRdBus.from_prefix(dut, ""),
100+
fifo_sink = lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoSink(
101+
bus=lambdalib.ramlib.tests.la_asyncfifo.LaAsyncFifoRdBus.from_prefix(dut, ""),
105102
clock=dut.rd_clk,
106103
reset=dut.rd_nreset
107104
)
108-
fifo_sink.set_rd_en_generator(random_bool_generator())
105+
fifo_sink.set_rd_en_generator(lambdalib.utils._tb_common.random_bool_generator())
109106

110107
# Reset DUT
111108
await Combine(
112-
cocotb.start_soon(drive_reset(dut.wr_nreset)),
113-
cocotb.start_soon(drive_reset(dut.rd_nreset))
109+
cocotb.start_soon(lambdalib.utils._tb_common.drive_reset(dut.wr_nreset)),
110+
cocotb.start_soon(lambdalib.utils._tb_common.drive_reset(dut.rd_nreset))
114111
)
115112

116113
await cocotb.start(Clock(dut.wr_clk, wr_clk_period_ns, units="ns").start())
@@ -157,8 +154,10 @@ async def fifo_rd_wr_test(
157154
tf = TestFactory(fifo_rd_wr_test)
158155
tf.add_option('wr_clk_period_ns', [MIN_PERIOD_NS, RAND_WR_CLK_PERIOD_NS, MAX_PERIOD_NS])
159156
tf.add_option('rd_clk_period_ns', [MIN_PERIOD_NS, RAND_RD_CLK_PERIOD_NS, MAX_PERIOD_NS])
160-
tf.add_option('wr_en_generator', [None, random_bool_generator, bursty_en_gen])
161-
tf.add_option('rd_en_generator', [None, random_bool_generator, bursty_en_gen])
157+
tf.add_option('wr_en_generator', [None, lambdalib.utils._tb_common.random_bool_generator,
158+
bursty_en_gen])
159+
tf.add_option('rd_en_generator', [None, lambdalib.utils._tb_common.random_bool_generator,
160+
bursty_en_gen])
162161
tf.generate_tests()
163162

164163

@@ -171,7 +170,7 @@ def test_la_asyncfifo():
171170
for depth in [2, 4, 8]:
172171
test_module_name = "lambdalib.ramlib.tests.tb_la_asyncfifo"
173172
test_name = f"{test_module_name}_depth_{depth}"
174-
tests_failed = run_cocotb(
173+
tests_failed = lambdalib.utils._tb_common.run_cocotb(
175174
chip=chip,
176175
test_module_name=test_module_name,
177176
timescale=("1ns", "1ps"),

‎lambdalib/stdlib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33

44

55
########################
@@ -11,7 +11,7 @@ def setup():
1111
'''
1212

1313
lib = Library('lambdalib_stdlib', package='lambdalib', auto_enable=True)
14-
register_data_source(lib)
14+
lambdalib._common.register_data_source(lib)
1515

1616
lib.add('option', 'ydir', "stdlib/rtl")
1717

‎lambdalib/vectorlib/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from siliconcompiler import Library
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33
import lambdalib.stdlib
44

55

@@ -12,7 +12,7 @@ def setup():
1212
'''
1313

1414
lib = Library('lambdalib_vectorlib', package='lambdalib', auto_enable=True)
15-
register_data_source(lib)
15+
lambdalib._common.register_data_source(lib)
1616

1717
lib.add('option', 'ydir', "vectorlib/rtl")
1818

‎tests/test_local_detect.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from siliconcompiler import Chip
2-
from lambdalib._common import register_data_source
2+
import lambdalib._common.register_data_source
33

44

55
def test_local_install_detection():
66
chip = Chip('<test>')
7-
register_data_source(chip)
7+
lambdalib._common.register_data_source(chip)
88
assert 'git+https' not in chip.get('package', 'source', 'lambdalib', 'path')

0 commit comments

Comments
 (0)