bit of a big reorg of data structures

[soc.git] / src / soc / experiment / test / test_compalu_multi.py

diff --git a/src/soc/experiment/test/test_compalu_multi.py b/src/soc/experiment/test/test_compalu_multi.py
index 97eb635f2f2c59d6a722c898b2bd6a3ac49a26a2..3b4c562ec4b0dc57ea1f0ca941f076c2d53d63d8 100644 (file)
--- a/src/soc/experiment/test/test_compalu_multi.py
+++ b/src/soc/experiment/test/test_compalu_multi.py
@@ -78,8 +78,8 @@ def op_sim(dut, a, b, op, inv_a=0, imm=0, imm_ok=0, zero_a=0):
     yield dut.src_i[1].eq(b)
     yield dut.oper_i.insn_type.eq(op)
     yield dut.oper_i.invert_in.eq(inv_a)
-    yield dut.oper_i.imm_data.imm.eq(imm)
-    yield dut.oper_i.imm_data.imm_ok.eq(imm_ok)
+    yield dut.oper_i.imm_data.data.eq(imm)
+    yield dut.oper_i.imm_data.ok.eq(imm_ok)
     yield dut.oper_i.zero_a.eq(zero_a)
     yield dut.issue_i.eq(1)
     yield
@@ -286,8 +286,8 @@ class CompUnitParallelTest:
         # at the same time, present the operation
         yield self.dut.oper_i.insn_type.eq(self.op)
         yield self.dut.oper_i.invert_in.eq(self.inv_a)
-        yield self.dut.oper_i.imm_data.imm.eq(self.imm)
-        yield self.dut.oper_i.imm_data.imm_ok.eq(self.imm_ok)
+        yield self.dut.oper_i.imm_data.data.eq(self.imm)
+        yield self.dut.oper_i.imm_data.ok.eq(self.imm_ok)
         yield self.dut.oper_i.zero_a.eq(self.zero_a)
         rdmaskn = self.rdmaskn[0] | (self.rdmaskn[1] << 1)
         yield self.dut.rdmaskn.eq(rdmaskn)
@@ -311,8 +311,8 @@ class CompUnitParallelTest:
         # TODO: deactivate rdmaskn when the busy_o cycle ends
         yield self.dut.oper_i.insn_type.eq(0)
         yield self.dut.oper_i.invert_in.eq(0)
-        yield self.dut.oper_i.imm_data.imm.eq(0)
-        yield self.dut.oper_i.imm_data.imm_ok.eq(0)
+        yield self.dut.oper_i.imm_data.data.eq(0)
+        yield self.dut.oper_i.imm_data.ok.eq(0)
         yield self.dut.oper_i.zero_a.eq(0)
         yield