X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fadd%2Fmultipipe.py;h=e24703f8fcbea1125c00c1a335ca2bb1290c32aa;hb=6bff1a997f3846872cf489c24b5c01426c4dc97c;hp=1b434832798f6b9c05f70c2734c110e256184823;hpb=f2f2a40f1f6d714e0aa36919e7157cc7a492fb23;p=ieee754fpu.git diff --git a/src/add/multipipe.py b/src/add/multipipe.py index 1b434832..e24703f8 100644 --- a/src/add/multipipe.py +++ b/src/add/multipipe.py @@ -6,7 +6,7 @@ Multi-output is simple (pretty much identical to UnbufferedPipeline), and the selection is just a mux. The only proviso (difference) being: - the outputs not being selected have to have their o_ready signals + the outputs not being selected have to have their ready_o signals DEASSERTED. """ @@ -15,6 +15,7 @@ from nmigen import Signal, Cat, Const, Mux, Module, Array, Elaboratable from nmigen.cli import verilog, rtlil from nmigen.lib.coding import PriorityEncoder from nmigen.hdl.rec import Record, Layout +from stageapi import _spec from collections.abc import Sequence @@ -32,8 +33,8 @@ class MultiInControlBase(Elaboratable): * n: contains ready/valid to the next stage User must also: - * add i_data members to PrevControl and - * add o_data member to NextControl + * add data_i members to PrevControl and + * add data_o member to NextControl """ # set up input and output IO ACK (prev/next ready/valid) p = [] @@ -66,7 +67,7 @@ class MultiInControlBase(Elaboratable): def set_input(self, i, idx=0): """ helper function to set the input data """ - return eq(self.p[idx].i_data, i) + return eq(self.p[idx].data_i, i) def elaborate(self, platform): m = Module() @@ -96,8 +97,8 @@ class MultiOutControlBase(Elaboratable): * n: contains ready/valid to the next stages PLURAL User must also: - * add i_data member to PrevControl and - * add o_data members to NextControl + * add data_i member to PrevControl and + * add data_o members to NextControl """ # set up input and output IO ACK (prev/next ready/valid) @@ -136,7 +137,7 @@ class MultiOutControlBase(Elaboratable): def set_input(self, i): """ helper function to set the input data """ - return eq(self.p.i_data, i) + return eq(self.p.data_i, i) def __iter__(self): yield from self.p @@ -152,8 +153,8 @@ class CombMultiOutPipeline(MultiOutControlBase): Attributes: ----------- - p.i_data : stage input data (non-array). shaped according to ispec - n.o_data : stage output data array. shaped according to ospec + p.data_i : stage input data (non-array). shaped according to ispec + n.data_o : stage output data array. shaped according to ospec """ def __init__(self, stage, n_len, n_mux): @@ -162,9 +163,15 @@ class CombMultiOutPipeline(MultiOutControlBase): self.n_mux = n_mux # set up the input and output data - self.p.i_data = stage.ispec() # input type + self.p.data_i = _spec(stage.ispec, 'data_i') # input type for i in range(n_len): - self.n[i].o_data = stage.ospec() # output type + name = 'data_o_%d' % i + self.n[i].data_o = _spec(stage.ospec, name) # output type + + def process(self, i): + if hasattr(self.stage, "process"): + return self.stage.process(i) + return i def elaborate(self, platform): m = MultiOutControlBase.elaborate(self, platform) @@ -173,7 +180,7 @@ class CombMultiOutPipeline(MultiOutControlBase): m.submodules += self.n_mux # need buffer register conforming to *input* spec - r_data = self.stage.ispec() # input type + r_data = _spec(self.stage.ispec, 'r_data') # input type if hasattr(self.stage, "setup"): self.stage.setup(m, r_data) @@ -181,22 +188,22 @@ class CombMultiOutPipeline(MultiOutControlBase): mid = self.n_mux.m_id # temporaries - p_i_valid = Signal(reset_less=True) + p_valid_i = Signal(reset_less=True) pv = Signal(reset_less=True) - m.d.comb += p_i_valid.eq(self.p.i_valid_test) - m.d.comb += pv.eq(self.p.i_valid & self.p.o_ready) + m.d.comb += p_valid_i.eq(self.p.valid_i_test) + m.d.comb += pv.eq(self.p.valid_i & self.p.ready_o) # all outputs to next stages first initialised to zero (invalid) # the only output "active" is then selected by the muxid for i in range(len(self.n)): - m.d.comb += self.n[i].o_valid.eq(0) - data_valid = self.n[mid].o_valid - m.d.comb += self.p.o_ready.eq(~data_valid | self.n[mid].i_ready) - m.d.comb += data_valid.eq(p_i_valid | \ - (~self.n[mid].i_ready & data_valid)) + m.d.comb += self.n[i].valid_o.eq(0) + data_valid = self.n[mid].valid_o + m.d.comb += self.p.ready_o.eq(~data_valid | self.n[mid].ready_i) + m.d.comb += data_valid.eq(p_valid_i | \ + (~self.n[mid].ready_i & data_valid)) with m.If(pv): - m.d.comb += eq(r_data, self.p.i_data) - m.d.comb += eq(self.n[mid].o_data, self.stage.process(r_data)) + m.d.comb += eq(r_data, self.p.data_i) + m.d.comb += eq(self.n[mid].data_o, self.process(r_data)) return m @@ -206,9 +213,9 @@ class CombMultiInPipeline(MultiInControlBase): Attributes: ----------- - p.i_data : StageInput, shaped according to ispec + p.data_i : StageInput, shaped according to ispec The pipeline input - p.o_data : StageOutput, shaped according to ospec + p.data_o : StageOutput, shaped according to ospec The pipeline output r_data : input_shape according to ispec A temporary (buffered) copy of a prior (valid) input. @@ -223,8 +230,14 @@ class CombMultiInPipeline(MultiInControlBase): # set up the input and output data for i in range(p_len): - self.p[i].i_data = stage.ispec() # input type - self.n.o_data = stage.ospec() + name = 'data_i_%d' % i + self.p[i].data_i = _spec(stage.ispec, name) # input type + self.n.data_o = _spec(stage.ospec, 'data_o') + + def process(self, i): + if hasattr(self.stage, "process"): + return self.stage.process(i) + return i def elaborate(self, platform): m = MultiInControlBase.elaborate(self, platform) @@ -234,50 +247,51 @@ class CombMultiInPipeline(MultiInControlBase): # need an array of buffer registers conforming to *input* spec r_data = [] data_valid = [] - p_i_valid = [] - n_i_readyn = [] + p_valid_i = [] + n_ready_in = [] p_len = len(self.p) for i in range(p_len): - r = self.stage.ispec() # input type + name = 'r_%d' % i + r = _spec(self.stage.ispec, name) # input type r_data.append(r) data_valid.append(Signal(name="data_valid", reset_less=True)) - p_i_valid.append(Signal(name="p_i_valid", reset_less=True)) - n_i_readyn.append(Signal(name="n_i_readyn", reset_less=True)) + p_valid_i.append(Signal(name="p_valid_i", reset_less=True)) + n_ready_in.append(Signal(name="n_ready_in", reset_less=True)) if hasattr(self.stage, "setup"): self.stage.setup(m, r) if len(r_data) > 1: r_data = Array(r_data) - p_i_valid = Array(p_i_valid) - n_i_readyn = Array(n_i_readyn) + p_valid_i = Array(p_valid_i) + n_ready_in = Array(n_ready_in) data_valid = Array(data_valid) nirn = Signal(reset_less=True) - m.d.comb += nirn.eq(~self.n.i_ready) + m.d.comb += nirn.eq(~self.n.ready_i) mid = self.p_mux.m_id for i in range(p_len): m.d.comb += data_valid[i].eq(0) - m.d.comb += n_i_readyn[i].eq(1) - m.d.comb += p_i_valid[i].eq(0) - m.d.comb += self.p[i].o_ready.eq(0) - m.d.comb += p_i_valid[mid].eq(self.p_mux.active) - m.d.comb += self.p[mid].o_ready.eq(~data_valid[mid] | self.n.i_ready) - m.d.comb += n_i_readyn[mid].eq(nirn & data_valid[mid]) + m.d.comb += n_ready_in[i].eq(1) + m.d.comb += p_valid_i[i].eq(0) + m.d.comb += self.p[i].ready_o.eq(0) + m.d.comb += p_valid_i[mid].eq(self.p_mux.active) + m.d.comb += self.p[mid].ready_o.eq(~data_valid[mid] | self.n.ready_i) + m.d.comb += n_ready_in[mid].eq(nirn & data_valid[mid]) anyvalid = Signal(i, reset_less=True) av = [] for i in range(p_len): av.append(data_valid[i]) anyvalid = Cat(*av) - m.d.comb += self.n.o_valid.eq(anyvalid.bool()) - m.d.comb += data_valid[mid].eq(p_i_valid[mid] | \ - (n_i_readyn[mid] & data_valid[mid])) + m.d.comb += self.n.valid_o.eq(anyvalid.bool()) + m.d.comb += data_valid[mid].eq(p_valid_i[mid] | \ + (n_ready_in[mid] & data_valid[mid])) for i in range(p_len): vr = Signal(reset_less=True) - m.d.comb += vr.eq(self.p[i].i_valid & self.p[i].o_ready) + m.d.comb += vr.eq(self.p[i].valid_i & self.p[i].ready_o) with m.If(vr): - m.d.comb += eq(r_data[i], self.p[i].i_data) + m.d.comb += eq(r_data[i], self.p[i].data_i) - m.d.comb += eq(self.n.o_data, self.stage.process(r_data[mid])) + m.d.comb += eq(self.n.data_o, self.process(r_data[mid])) return m @@ -288,7 +302,7 @@ class CombMuxOutPipe(CombMultiOutPipeline): CombMultiOutPipeline.__init__(self, stage, n_len=n_len, n_mux=stage) # HACK: n-mux is also the stage... so set the muxid equal to input mid - stage.m_id = self.p.i_data.mid + stage.m_id = self.p.data_i.mid @@ -313,9 +327,9 @@ class InputPriorityArbiter(Elaboratable): # connect priority encoder in_ready = [] for i in range(self.num_rows): - p_i_valid = Signal(reset_less=True) - m.d.comb += p_i_valid.eq(self.pipe.p[i].i_valid_test) - in_ready.append(p_i_valid) + p_valid_i = Signal(reset_less=True) + m.d.comb += p_valid_i.eq(self.pipe.p[i].valid_i_test) + in_ready.append(p_valid_i) m.d.comb += pe.i.eq(Cat(*in_ready)) # array of input "valids" m.d.comb += self.active.eq(~pe.n) # encoder active (one input valid) m.d.comb += self.m_id.eq(pe.o) # output one active input