update ready/valid in shift_rot test_pipe_caller
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Tue, 31 Aug 2021 20:20:02 +0000 (21:20 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Tue, 31 Aug 2021 20:27:16 +0000 (21:27 +0100)
src/soc/fu/shift_rot/test/test_pipe_caller.py

index ac7a4092297503f890e07ee49c9991dc81f3abcd..ea1aba389132f028fbe975a8d9b4d9183b5ad336 100644 (file)
@@ -106,18 +106,18 @@ class TestRunner(unittest.TestCase):
             yield from set_alu_inputs(alu, pdecode2, simulator)
 
             # set valid for one cycle, propagate through pipeline...
-            yield alu.p.valid_i.eq(1)
+            yield alu.p.i_valid.eq(1)
             yield
-            yield alu.p.valid_i.eq(0)
+            yield alu.p.i_valid.eq(0)
 
             opname = code.split(' ')[0]
             yield from simulator.call(opname)
             index = simulator.pc.CIA.value//4
 
-            vld = yield alu.n.valid_o
+            vld = yield alu.n.o_valid
             while not vld:
                 yield
-                vld = yield alu.n.valid_o
+                vld = yield alu.n.o_valid
             yield
             alu_out = yield alu.n.o_data.o.data
 
@@ -140,7 +140,7 @@ class TestRunner(unittest.TestCase):
         m.submodules.alu = alu = ShiftRotBasePipe(pspec)
 
         comb += alu.p.i_data.ctx.op.eq_from_execute1(pdecode2.do)
-        comb += alu.n.ready_i.eq(1)
+        comb += alu.n.i_ready.eq(1)
         comb += pdecode2.dec.raw_opcode_in.eq(instruction)
         sim = Simulator(m)