fix imports in fu matrix tests
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 20 May 2020 13:30:23 +0000 (14:30 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 20 May 2020 13:30:29 +0000 (14:30 +0100)
src/soc/scoreboard/test_mem2_fu_matrix.py
src/soc/scoreboard/test_mem_fu_matrix.py

index 66a879328f8eef470a8bb9154fefa0bbb069b46e..9fd84b2487f8eee282cae93902da8e8924b9384a 100644 (file)
@@ -17,7 +17,9 @@ from math import log
 import unittest
 
 # FIXME: fixed up imports
-from ..experiment.score6600 import IssueToScoreboard, RegSim, instr_q, wait_for_busy_clear, wait_for_issue, CompUnitALUs, CompUnitBR, CompUnitsBase
+from soc.experiment.score6600 import (IssueToScoreboard, RegSim, instr_q,
+                                      wait_for_busy_clear, wait_for_issue, 
+                                      CompUnitALUs, CompUnitBR, CompUnitsBase)
 
 
 class Memory(Elaboratable):
@@ -576,9 +578,9 @@ def mem_sim(dut):
 
 
 def test_mem_fus():
-    dut = MemFunctionUnits(3, 11)
+    dut = MemFunctionUnits(8, 11)
     vl = rtlil.convert(dut, ports=dut.ports())
-    with open("test_mem_fus.il", "w") as f:
+    with open("test_mem2_fus.il", "w") as f:
         f.write(vl)
 
     run_simulation(dut, mem_sim(dut),
index 12dba0ccdd8ef74e229d8dfa39a7c258ea1e7082..949d0ff21bc6b280be20b7d59902157a0e89d67c 100644 (file)
@@ -672,7 +672,7 @@ def mem_sim(dut):
 
 
 def test_mem_fus():
-    dut = MemFunctionUnits(3)
+    dut = MemFunctionUnits(8)
     vl = rtlil.convert(dut, ports=dut.ports())
     with open("test_mem_fus.il", "w") as f:
         f.write(vl)