From 8624a8f2cf7b7c81de2fb9e4184586e7ba6d477c Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 27 Mar 2019 13:55:35 +0000 Subject: [PATCH] lost removal of result intermediary from UnbufferedPipeline combinatorial result intermediary not necessary, was removed earlier and got restored accidentally when reverting array-based pipeline --- src/add/singlepipe.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/add/singlepipe.py b/src/add/singlepipe.py index dabc7fcd..995ea21f 100644 --- a/src/add/singlepipe.py +++ b/src/add/singlepipe.py @@ -598,20 +598,18 @@ class UnbufferedPipeline(ControlBase): m = Module() r_data = self.stage.ispec() # input type - result = self.stage.ospec() # output data if hasattr(self.stage, "setup"): self.stage.setup(m, r_data) p_i_valid = Signal(reset_less=True) m.d.comb += p_i_valid.eq(self.p.i_valid_logic()) - m.d.comb += eq(result, self.stage.process(r_data)) m.d.comb += self.n.o_valid.eq(self._data_valid) m.d.comb += self.p.o_ready.eq(~self._data_valid | self.n.i_ready) m.d.sync += self._data_valid.eq(p_i_valid | \ (~self.n.i_ready & self._data_valid)) with m.If(self.p.i_valid & self.p.o_ready): m.d.sync += eq(r_data, self.p.i_data) - m.d.comb += eq(self.n.o_data, result) + m.d.comb += eq(self.n.o_data, self.stage.process(r_data)) return m -- 2.30.2