X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fnmutil%2Fmultipipe.py;h=efc1e005f572301d31648d0349f286be8c0bdbd9;hb=f09f35af37956dc1e3cc01aadc84ad07a711d2d4;hp=e24703f8fcbea1125c00c1a335ca2bb1290c32aa;hpb=919e349e32ec226a14c8c01ba6b3c0112d4495a3;p=ieee754fpu.git diff --git a/src/nmutil/multipipe.py b/src/nmutil/multipipe.py index e24703f8..efc1e005 100644 --- a/src/nmutil/multipipe.py +++ b/src/nmutil/multipipe.py @@ -15,11 +15,12 @@ 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 nmutil.stageapi import _spec from collections.abc import Sequence -from example_buf_pipe import eq, NextControl, PrevControl, ExampleStage +from .nmoperator import eq +from .iocontrol import NextControl, PrevControl class MultiInControlBase(Elaboratable): @@ -352,6 +353,7 @@ class PriorityCombMuxInPipe(CombMultiInPipeline): if __name__ == '__main__': + from nmutil.test.example_buf_pipe import ExampleStage dut = PriorityCombMuxInPipe(ExampleStage) vl = rtlil.convert(dut, ports=dut.ports()) with open("test_combpipe.il", "w") as f: