from nmigen.compat.fhdl.bitcontainer import value_bits_sign
from contextlib import contextmanager
-from singlepipe import eq, StageCls, ControlBase, BufferedPipeline
+from nmoperator import eq
+from singlepipe import StageCls, ControlBase, BufferedHandshake
from singlepipe import UnbufferedPipeline
# stages, and new members with names not starting with "_" are to be registered
# for the next stage.
-def like(value, rname, pipe):
+def like(value, rname, pipe, pipemode=False):
if isinstance(value, ObjectProxy):
- return ObjectProxy.like(None, value, name=rname, reset_less=True)
+ return ObjectProxy.like(pipe, value, pipemode=pipemode,
+ name=rname, reset_less=True)
else:
return Signal(value_bits_sign(value), name=rname,
reset_less=True)
return Signal.like(value, name=rname, reset_less=True)
+def get_assigns(_assigns):
+ assigns = []
+ for e in _assigns:
+ if isinstance(e, ObjectProxy):
+ assigns += get_assigns(e._assigns)
+ else:
+ assigns.append(e)
+ return assigns
+
+
+def get_eqs(_eqs):
+ eqs = []
+ for e in _eqs:
+ if isinstance(e, ObjectProxy):
+ eqs += get_eqs(e._eqs)
+ else:
+ eqs.append(e)
+ return eqs
+
class ObjectProxy:
- def __init__(self, m, name=None, pipemode=False):
+ def __init__(self, m, name=None, pipemode=False, syncmode=True):
self._m = m
if name is None:
name = tracer.get_var_name(default=None)
self.name = name
self._pipemode = pipemode
+ self._syncmode = syncmode
+ self._eqs = {}
+ self._assigns = []
+ self._preg_map = {}
@classmethod
- def like(cls, m, value, name=None, src_loc_at=0, **kwargs):
+ def like(cls, m, value, pipemode=False, name=None, src_loc_at=0, **kwargs):
name = name or tracer.get_var_name(depth=2 + src_loc_at,
default="$like")
src_loc_at_1 = 1 + src_loc_at
- r = ObjectProxy(m, value.name)
+ r = ObjectProxy(m, value.name, pipemode)
+ #for a, aname in value._preg_map.items():
+ # r._preg_map[aname] = like(a, aname, m, pipemode)
for a in value.ports():
aname = a.name
- setattr(r, aname, a)
+ r._preg_map[aname] = like(a, aname, m, pipemode)
return r
+ def __repr__(self):
+ subobjs = []
+ for a in self.ports():
+ aname = a.name
+ ai = self._preg_map[aname]
+ subobjs.append(repr(ai))
+ return "<OP %s>" % subobjs
+
+ def get_specs(self, liked=False):
+ res = []
+ for k, v in self._preg_map.items():
+ #v = like(v, k, stage._m)
+ res.append(v)
+ if isinstance(v, ObjectProxy):
+ res += v.get_specs()
+ return res
+
def eq(self, i):
+ print ("ObjectProxy eq", self, i)
res = []
for a in self.ports():
aname = a.name
- ai = getattr(i, aname)
+ ai = i._preg_map[aname]
res.append(a.eq(ai))
return res
def ports(self):
res = []
- for aname in dir(self):
- a = getattr(self, aname)
+ for aname, a in self._preg_map.items():
if isinstance(a, Signal) or isinstance(a, ObjectProxy) or \
isinstance(a, Record):
res.append(a)
+ #print ("ObjectPorts", res)
return res
+ def __getattr__(self, name):
+ try:
+ v = self._preg_map[name]
+ return v
+ #return like(v, name, self._m)
+ except KeyError:
+ raise AttributeError(
+ 'error, no pipeline register "%s" defined for OP %s'
+ % (name, self.name))
+
def __setattr__(self, name, value):
- if name.startswith('_') or name == 'name':
+ if name.startswith('_') or name in ['name', 'ports', 'eq', 'like']:
# do not do anything tricky with variables starting with '_'
object.__setattr__(self, name, value)
return
#rname = "%s_%s" % (self.name, name)
rname = name
- new_pipereg = like(value, rname, self._m)
- object.__setattr__(self, name, new_pipereg)
- if self._m:
- self._m.d.sync += eq(new_pipereg, value)
+ new_pipereg = like(value, rname, self._m, self._pipemode)
+ self._preg_map[name] = new_pipereg
+ #object.__setattr__(self, name, new_pipereg)
+ if self._pipemode:
+ #print ("OP pipemode", self._syncmode, new_pipereg, value)
+ assign = eq(new_pipereg, value)
+ if self._syncmode:
+ self._m.d.sync += assign
+ else:
+ self._m.d.comb += assign
+ elif self._m:
+ #print ("OP !pipemode assign", new_pipereg, value, type(value))
+ self._m.d.comb += eq(new_pipereg, value)
+ else:
+ #print ("OP !pipemode !m", new_pipereg, value, type(value))
+ self._assigns += eq(new_pipereg, value)
+ if isinstance(value, ObjectProxy):
+ #print ("OP, defer assigns:", value._assigns)
+ self._assigns += value._assigns
+ self._eqs.append(value._eqs)
class PipelineStage:
def __init__(self, name, m, prev=None, pipemode=False, ispec=None):
self._m = m
self._stagename = name
- self._preg_map = {}
+ self._preg_map = {'__nextstage__': {}}
self._prev_stage = prev
self._ispec = ispec
+ if ispec:
+ self._preg_map[self._stagename] = ispec
if prev:
print ("prev", prev._stagename, prev._preg_map)
- if prev._stagename in prev._preg_map:
- m = prev._preg_map[prev._stagename]
- self._preg_map[prev._stagename] = m
- #for k, v in m.items():
- #m[k] = like(v, k, self._m)
+ #if prev._stagename in prev._preg_map:
+ # m = prev._preg_map[prev._stagename]
+ # self._preg_map[prev._stagename] = m
if '__nextstage__' in prev._preg_map:
m = prev._preg_map['__nextstage__']
+ m = likedict(m)
self._preg_map[self._stagename] = m
#for k, v in m.items():
#m[k] = like(v, k, self._m)
print ("make current", self._stagename, m)
self._pipemode = pipemode
- self._eqs = []
+ self._eqs = {}
+ self._assigns = []
- def __getattr__(self, name):
+ def __getattribute__(self, name):
+ if name.startswith('_'):
+ return object.__getattribute__(self, name)
+ #if name in self._preg_map['__nextstage__']:
+ # return self._preg_map['__nextstage__'][name]
try:
+ print ("getattr", name, object.__getattribute__(self, '_preg_map'))
v = self._preg_map[self._stagename][name]
return v
#return like(v, name, self._m)
return
pipereg_id = self._stagename
rname = 'pipereg_' + pipereg_id + '_' + name
- new_pipereg = like(value, rname, self._m)
+ new_pipereg = like(value, rname, self._m, self._pipemode)
next_stage = '__nextstage__'
if next_stage not in self._preg_map:
self._preg_map[next_stage] = {}
self._preg_map[next_stage][name] = new_pipereg
+ print ("setattr", name, value, self._preg_map)
if self._pipemode:
- self._eqs.append(value)
- print ("!pipemode: append", new_pipereg, value)
+ self._eqs[name] = new_pipereg
+ assign = eq(new_pipereg, value)
+ print ("pipemode: append", new_pipereg, value, assign)
+ if isinstance(value, ObjectProxy):
+ print ("OP, assigns:", value._assigns)
+ self._assigns += value._assigns
+ self._eqs[name]._eqs = value._eqs
#self._m.d.comb += assign
- else:
+ self._assigns += assign
+ elif self._m:
print ("!pipemode: assign", new_pipereg, value)
assign = eq(new_pipereg, value)
self._m.d.sync += assign
+ else:
+ print ("!pipemode !m: defer assign", new_pipereg, value)
+ assign = eq(new_pipereg, value)
+ self._eqs[name] = new_pipereg
+ self._assigns += assign
+ if isinstance(value, ObjectProxy):
+ print ("OP, defer assigns:", value._assigns)
+ self._assigns += value._assigns
+ self._eqs[name]._eqs = value._eqs
+
+def likelist(specs):
+ res = []
+ for v in specs:
+ res.append(like(v, v.name, None, pipemode=True))
+ return res
+
+def likedict(specs):
+ if not isinstance(specs, dict):
+ return like(specs, specs.name, None, pipemode=True)
+ res = {}
+ for k, v in specs.items():
+ res[k] = likedict(v)
+ return res
class AutoStage(StageCls):
- def __init__(self, inspecs, outspecs, eqs):
- self.inspecs, self.outspecs, self.eqs = inspecs, outspecs, eqs
- def ispec(self): return self.like(self.inspecs)
- def ospec(self): return self.like(self.outspecs)
- def like(self, specs):
- res = []
- for v in specs:
- res.append(like(v, v.name, None))
- return res
+ def __init__(self, inspecs, outspecs, eqs, assigns):
+ self.inspecs, self.outspecs = inspecs, outspecs
+ self.eqs, self.assigns = eqs, assigns
+ #self.o = self.ospec()
+ def ispec(self): return likedict(self.inspecs)
+ def ospec(self): return likedict(self.outspecs)
def process(self, i):
+ print ("stage process", i)
return self.eqs
+
def setup(self, m, i):
+ print ("stage setup i", i, m)
+ print ("stage setup inspecs", self.inspecs)
+ print ("stage setup outspecs", self.outspecs)
+ print ("stage setup eqs", self.eqs)
+ #self.o = self.ospec()
m.d.comb += eq(self.inspecs, i)
+ #m.d.comb += eq(self.outspecs, self.eqs)
+ #m.d.comb += eq(self.o, i)
+
+
+class AutoPipe(UnbufferedPipeline):
+ def __init__(self, stage, assigns):
+ UnbufferedPipeline.__init__(self, stage)
+ self.assigns = assigns
+
+ def elaborate(self, platform):
+ m = UnbufferedPipeline.elaborate(self, platform)
+ m.d.comb += self.assigns
+ print ("assigns", self.assigns, m)
+ return m
class PipeManager:
@contextmanager
def Stage(self, name, prev=None, ispec=None):
- stage = PipelineStage(name, self.m, prev, self.pipemode, ispec=ispec)
+ if ispec:
+ ispec = likedict(ispec)
+ print ("start stage", name, ispec)
+ stage = PipelineStage(name, None, prev, self.pipemode, ispec=ispec)
try:
- yield stage, stage._m
+ yield stage, self.m #stage._m
finally:
pass
if self.pipemode:
inspecs = stage._ispec
else:
inspecs = self.get_specs(stage, name)
+ #inspecs = likedict(inspecs)
outspecs = self.get_specs(stage, '__nextstage__', liked=True)
- s = AutoStage(inspecs, outspecs, stage._eqs)
+ print ("stage inspecs", name, inspecs)
+ print ("stage outspecs", name, outspecs)
+ eqs = stage._eqs # get_eqs(stage._eqs)
+ assigns = get_assigns(stage._assigns)
+ print ("stage eqs", name, eqs)
+ print ("stage assigns", name, assigns)
+ s = AutoStage(inspecs, outspecs, eqs, assigns)
self.stages.append(s)
+ print ("end stage", name, self.pipemode, "\n")
def get_specs(self, stage, name, liked=False):
+ return stage._preg_map[name]
if name in stage._preg_map:
res = []
for k, v in stage._preg_map[name].items():
#v = like(v, k, stage._m)
res.append(v)
+ #if isinstance(v, ObjectProxy):
+ # res += v.get_specs()
return res
- return []
+ return {}
def __enter__(self):
self.stages = []
return self
def __exit__(self, *args):
- print (args)
+ print ("exit stage", args)
pipes = []
cb = ControlBase()
for s in self.stages:
- print (s, s.inspecs, s.outspecs)
+ print ("stage specs", s, s.inspecs, s.outspecs)
if self.pipetype == 'buffered':
- p = BufferedPipeline(s)
+ p = BufferedHandshake(s)
else:
- p = UnbufferedPipeline(s)
+ p = AutoPipe(s, s.assigns)
pipes.append(p)
self.m.submodules += p
projects / ieee754fpu.git / blobdiff