From a6c70e02a6ed926488b98ef93b93c404ce09ad95 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 16 Oct 2020 20:51:09 +0100 Subject: [PATCH] experiment swapping dummy trap stage over to input --- src/soc/fu/trap/pipeline.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/soc/fu/trap/pipeline.py b/src/soc/fu/trap/pipeline.py index c27a0e56..e31598bf 100644 --- a/src/soc/fu/trap/pipeline.py +++ b/src/soc/fu/trap/pipeline.py @@ -1,15 +1,15 @@ from nmutil.singlepipe import ControlBase from nmutil.pipemodbase import PipeModBaseChain from soc.fu.trap.main_stage import TrapMainStage -from soc.fu.trap.pipe_data import TrapOutputData +from soc.fu.trap.pipe_data import TrapInputData from nmutil.pipemodbase import PipeModBase from nmigen import Module # gives a 1-clock delay to stop combinatorial link between in and out class DummyTrapStage(PipeModBase): def __init__(self, pspec): super().__init__(pspec, "dummy") - def ispec(self): return TrapOutputData(self.pspec) - def ospec(self): return TrapOutputData(self.pspec) + def ispec(self): return TrapInputData(self.pspec) + def ospec(self): return TrapInputData(self.pspec) def elaborate(self, platform): m = Module() @@ -33,8 +33,8 @@ class TrapBasePipe(ControlBase): def __init__(self, pspec): ControlBase.__init__(self) self.pspec = pspec - self.pipe1 = TrapStages(pspec) - self.pipe2 = TrapDummyStages(pspec) + self.pipe1 = TrapDummyStages(pspec) + self.pipe2 = TrapStages(pspec) self._eqs = self.connect([self.pipe1, self.pipe2]) def elaborate(self, platform): -- 2.30.2