creates an import error and stops unit tests from running
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 10 Jun 2020 14:39:13 +0000 (15:39 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 10 Jun 2020 14:39:39 +0000 (15:39 +0100)
Revert "PortInterface refactoring"

This reverts commit 8e58e66142991e308985a463cfff396a36e3f816.

src/soc/scoreboard/addr_split.py

index a1453403b09164701e912da23bb6b4d1d7a57813..7ae3fcc5778ebb96531c4939efa67549959c96c5 100644 (file)
@@ -13,7 +13,6 @@ from nmigen.cli import verilog, rtlil
 
 from soc.scoreboard.addr_match import LenExpand
 #from nmutil.queue import Queue
-from soc.experiment import l0_cache
 
 
 class LDData(Record):
@@ -62,10 +61,6 @@ class LDSTSplitter(Elaboratable):
         self.dwidth, self.awidth, self.dlen = dwidth, awidth, dlen
         #cline_wid = 8<<dlen # cache line width: bytes (8) times (2^^dlen)
         cline_wid = dwidth # TODO: make this bytes not bits
-
-        self.inport = l0_cache.PortInterface()
-        print(self.inport)
-
         self.addr_i = Signal(awidth, reset_less=True)
         self.len_i = Signal(dlen, reset_less=True)
         self.valid_i = Signal(reset_less=True)
@@ -79,7 +74,6 @@ class LDSTSplitter(Elaboratable):
 
         self.exc = Signal(reset_less=True)
 
-        #TODO out port interface
         self.sld_valid_o = Signal(2, reset_less=True)
         self.sld_valid_i = Signal(2, reset_less=True)
         self.sld_data_i = Array((LDData(cline_wid, "ld_data_i1"),
@@ -226,7 +220,6 @@ def sim(dut):
         yield
 
         print (bin(ld_data_o), bin(data))
-        #FIXME: wrong result here
         assert ld_data_o == data
 
     def lds():