del deprecated sdf code, explicit tlib use
This commit is contained in:
1 parent
d8f605a47a
commit
cf9a98b5ce
3 files changed
+52
-126
No files matched your search
+4
-2
@@ -10,9 +10,11 @@ def mydir():
|
||||
@pytest.fixture(scope='session')
|
||||
def b14_circuit(mydir):
|
||||
from kyupy import verilog
|
||||
return verilog.load(mydir / 'b14.v.gz', branchforks=True)
|
||||
from kyupy.techlib import SAED32
|
||||
return verilog.load(mydir / 'b14.v.gz', branchforks=True, tlib=SAED32)
|
||||
|
||||
@pytest.fixture(scope='session')
|
||||
def b14_delays(mydir, b14_circuit):
|
||||
from kyupy import sdf
|
||||
return sdf.load(mydir / 'b14.sdf.gz').iopaths(b14_circuit)[1:2]
|
||||
from kyupy.techlib import SAED32
|
||||
return sdf.load(mydir / 'b14.sdf.gz').iopaths(b14_circuit, tlib=SAED32)[1:2]
|
||||
+5
-3
@@ -2,6 +2,7 @@ import numpy as np
|
||||
|
||||
from kyupy import sdf, verilog, bench
|
||||
from kyupy.wave_sim import WaveSim, TMAX, TMIN
|
||||
from kyupy.techlib import SAED32, SAED90
|
||||
|
||||
def test_parse():
|
||||
test = '''
|
||||
@@ -80,9 +81,9 @@ def test_b14(mydir):
|
||||
|
||||
|
||||
def test_gates(mydir):
|
||||
c = verilog.load(mydir / 'gates.v')
|
||||
c = verilog.load(mydir / 'gates.v', tlib=SAED90)
|
||||
df = sdf.load(mydir / 'gates.sdf')
|
||||
lt = df.iopaths(c)[1]
|
||||
lt = df.iopaths(c, tlib=SAED90)[1]
|
||||
nand_a = c.cells['nandgate'].ins[0]
|
||||
nand_b = c.cells['nandgate'].ins[1]
|
||||
and_a = c.cells['andgate'].ins[0]
|
||||
@@ -134,7 +135,8 @@ def test_nand_xor():
|
||||
)
|
||||
)
|
||||
""")
|
||||
d = df.iopaths(c)[1]
|
||||
d = df.iopaths(c, tlib=SAED32)[1]
|
||||
c.resolve_tlib_cells(SAED32)
|
||||
sim = WaveSim(c, delays=d, sims=16)
|
||||
|
||||
# input A1
|
||||
|
||||
Reference in new issue
Block a user