b65e11f38f
Before this commit, each simulation engine (which is only pysim at
the moment, but also cxxsim soon) was a subclass of SimulatorCore,
and every simulation engine module would essentially duplicate
the complete structure of a simulator, with code partially shared.
This was a really bad idea: it was inconvenient to use, with
downstream code having to branch between e.g. PySettle and CxxSettle;
it had no well-defined external interface; it had multiple virtually
identical entry points; and it had no separation between simulation
algorithms and glue code.
This commit completely rearranges simulation code.
1. sim._base defines internal simulation interfaces. The clarity of
these internal interfaces is important because simulation
engines mix and match components to provide a consistent API
regardless of the chosen engine.
2. sim.core defines the external simulation interface: the commands
and the simulator facade. The facade provides a single entry
point and, when possible, validates or lowers user input.
It also imports built-in simulation engines by their symbolic
name, avoiding eager imports of pyvcd or ctypes.
3. sim.xxxsim (currently, only sim.pysim) defines the simulator
implementation: time and state management, process scheduling,
and waveform dumping.
The new simulator structure has none of the downsides of the old one.
See #324.
210 lines
6.7 KiB
Python
210 lines
6.7 KiB
Python
from nmigen.hdl import *
|
|
from nmigen.hdl.rec import *
|
|
from nmigen.sim import *
|
|
from nmigen.lib.io import *
|
|
|
|
from .utils import *
|
|
|
|
|
|
class PinLayoutTestCase(FHDLTestCase):
|
|
def assertLayoutEqual(self, layout, expected):
|
|
casted_layout = {}
|
|
for name, (shape, dir) in layout.items():
|
|
casted_layout[name] = (Shape.cast(shape), dir)
|
|
|
|
self.assertEqual(casted_layout, expected)
|
|
|
|
|
|
class PinLayoutCombTestCase(PinLayoutTestCase):
|
|
def test_pin_layout_i(self):
|
|
layout_1 = pin_layout(1, dir="i")
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="i")
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_o(self):
|
|
layout_1 = pin_layout(1, dir="o")
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="o")
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_oe(self):
|
|
layout_1 = pin_layout(1, dir="oe")
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="oe")
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_io(self):
|
|
layout_1 = pin_layout(1, dir="io")
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i": ((1, False), DIR_NONE),
|
|
"o": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="io")
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i": ((2, False), DIR_NONE),
|
|
"o": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
|
|
class PinLayoutSDRTestCase(PinLayoutTestCase):
|
|
def test_pin_layout_i(self):
|
|
layout_1 = pin_layout(1, dir="i", xdr=1)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="i", xdr=1)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_o(self):
|
|
layout_1 = pin_layout(1, dir="o", xdr=1)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="o", xdr=1)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_oe(self):
|
|
layout_1 = pin_layout(1, dir="oe", xdr=1)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="oe", xdr=1)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_io(self):
|
|
layout_1 = pin_layout(1, dir="io", xdr=1)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i": ((1, False), DIR_NONE),
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="io", xdr=1)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i": ((2, False), DIR_NONE),
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
|
|
class PinLayoutDDRTestCase(PinLayoutTestCase):
|
|
def test_pin_layout_i(self):
|
|
layout_1 = pin_layout(1, dir="i", xdr=2)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i0": ((1, False), DIR_NONE),
|
|
"i1": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="i", xdr=2)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i0": ((2, False), DIR_NONE),
|
|
"i1": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_o(self):
|
|
layout_1 = pin_layout(1, dir="o", xdr=2)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((1, False), DIR_NONE),
|
|
"o1": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="o", xdr=2)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((2, False), DIR_NONE),
|
|
"o1": ((2, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_oe(self):
|
|
layout_1 = pin_layout(1, dir="oe", xdr=2)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((1, False), DIR_NONE),
|
|
"o1": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="oe", xdr=2)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((2, False), DIR_NONE),
|
|
"o1": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
def test_pin_layout_io(self):
|
|
layout_1 = pin_layout(1, dir="io", xdr=2)
|
|
self.assertLayoutEqual(layout_1.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i0": ((1, False), DIR_NONE),
|
|
"i1": ((1, False), DIR_NONE),
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((1, False), DIR_NONE),
|
|
"o1": ((1, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
layout_2 = pin_layout(2, dir="io", xdr=2)
|
|
self.assertLayoutEqual(layout_2.fields, {
|
|
"i_clk": ((1, False), DIR_NONE),
|
|
"i0": ((2, False), DIR_NONE),
|
|
"i1": ((2, False), DIR_NONE),
|
|
"o_clk": ((1, False), DIR_NONE),
|
|
"o0": ((2, False), DIR_NONE),
|
|
"o1": ((2, False), DIR_NONE),
|
|
"oe": ((1, False), DIR_NONE),
|
|
})
|
|
|
|
|
|
class PinTestCase(FHDLTestCase):
|
|
def test_attributes(self):
|
|
pin = Pin(2, dir="io", xdr=2)
|
|
self.assertEqual(pin.width, 2)
|
|
self.assertEqual(pin.dir, "io")
|
|
self.assertEqual(pin.xdr, 2)
|