Towards fixing metrics test

kuznia-rdzeni · Feb 25, 2025 · a4130d8 · a4130d8
1 parent 7fcaae1
commit a4130d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/test/lib/test_metrics.py b/test/lib/test_metrics.py
@@ -26,7 +26,7 @@ def elaborate(self, platform):
 
         @def_method(m, self.method)
         def _():
-            self.counter.incr(m)
+            self.counter.incr[0](m)
 
         return m
 
@@ -43,7 +43,7 @@ def elaborate(self, platform):
 
         @def_method(m, self.method)
         def _(cond):
-            self.counter.incr(m, cond=cond)
+            self.counter.incr[0](m, enable_call=cond)
 
         return m
 
@@ -59,7 +59,7 @@ def elaborate(self, platform):
         m.submodules.counter = self.counter
 
         with Transaction().body(m):
-            self.counter.incr(m, cond=self.cond)
+            self.counter.incr[0](m, enable_call=self.cond)
 
         return m
 
@@ -155,7 +155,7 @@ def elaborate(self, platform):
         m.submodules.counter = self.counter
 
         with Transaction().body(m):
-            self.counter.incr(m, self.tag, cond=self.cond)
+            self.counter.incr(m, tag=self.tag, enable_call=self.cond)
 
         return m
 
@@ -335,7 +335,7 @@ async def producer(sim: TestbenchContext):
             ticks = DependencyContext.get().get_dependency(TicksKey())
 
             for _ in range(200):
-                await m._start.call(sim)
+                await m.start[0].call(sim)
 
                 event_queue.put(sim.get(ticks))
                 await self.random_wait_geom(sim, 0.8)
@@ -346,7 +346,7 @@ async def consumer(sim: TestbenchContext):
             ticks = DependencyContext.get().get_dependency(TicksKey())
 
             while not finish:
-                await m._stop.call(sim)
+                await m.stop[0].call(sim)
 
                 latencies.append(sim.get(ticks) - event_queue.get())
 
@@ -396,7 +396,7 @@ async def producer(sim):
                 await sim.delay(1e-9)
 
                 slot_id = random.choice(free_slots)
-                await m._start.call(sim, slot=slot_id)
+                await m.start[0].call(sim, slot=slot_id)
 
                 events[slot_id] = sim.get(tick_count)
                 free_slots.remove(slot_id)
@@ -415,7 +415,7 @@ async def consumer(sim):
 
                 slot_id = random.choice(used_slots)
 
-                await m._stop.call(sim, slot=slot_id)
+                await m.stop[0].call(sim, slot=slot_id)
 
                 await sim.delay(2e-9)
 
@@ -447,9 +447,9 @@ def elaborate(self, platform):
 
         @def_method(m, self.incr_counters)
         def _(counter1, counter2, counter3):
-            self.counter1.incr(m, cond=counter1)
-            self.counter2.incr(m, cond=counter2)
-            self.counter3.incr(m, cond=counter3)
+            self.counter1.incr[0](m, enable_call=counter1)
+            self.counter2.incr[0](m, enable_call=counter2)
+            self.counter3.incr[0](m, enable_call=counter3)
 
         return m
 

diff --git a/transactron/core/method.py b/transactron/core/method.py
@@ -243,7 +243,7 @@ def body(
         manager._add_method(self)
 
     def __call__(
-        self, m: TModule, arg: Optional[AssignArg] = None, enable: ValueLike = C(1), /, **kwargs: AssignArg
+        self, m: TModule, arg: Optional[AssignArg] = None, /, enable_call: ValueLike = C(1), **kwargs: AssignArg
     ) -> MethodStruct:
         """Call a method.
 
@@ -261,7 +261,7 @@ def __call__(
             Call argument. Can be passed as a `View` of the method's
             input layout or as a dictionary. Alternative syntax uses
             keyword arguments.
-        enable : Value
+        enable_call : Value
             Configures the call as enabled in the current clock cycle.
             Disabled calls still lock the called method in transaction
             scheduling. Calls are by default enabled.
@@ -300,7 +300,7 @@ def __call__(
             arg = kwargs
 
         enable_sig = Signal(name=self.owned_name + "_enable")
-        m.d.av_comb += enable_sig.eq(enable)
+        m.d.av_comb += enable_sig.eq(enable_call)
         m.d.top_comb += assign(arg_rec, arg, fields=AssignType.ALL)
 
         caller = Body.get()
@@ -346,11 +346,11 @@ def layout_out(self):
         return self._layout_out
 
     def __call__(
-        self, m: TModule, arg: Optional[AssignArg] = None, enable: ValueLike = C(1), /, **kwargs: AssignArg
+        self, m: TModule, arg: Optional[AssignArg] = None, /, enable_call: ValueLike = C(1), **kwargs: AssignArg
     ) -> MethodStruct:
         if len(self._methods) != 1:
             raise RuntimeError("calling Methods only allowed when count=1")
-        return self._methods[0](m, arg, enable, **kwargs)
+        return self._methods[0](m, arg, enable_call, **kwargs)
 
     @overload
     def __getitem__(self, key: int) -> Method: ...

diff --git a/transactron/lib/metrics.py b/transactron/lib/metrics.py
@@ -567,9 +567,9 @@ def elaborate(self, platform):
 
         epoch_width = bits_for(self.max_latency)
 
-        self.fifos: list[FIFO] = []
+        self.fifos = [FIFO([("epoch", epoch_width)], self.slots_number) for _ in range(len(self.start))]
         for k in range(len(self.start)):
-            m.submodules[f"fifo{k}"] = self.fifos[k] = FIFO([("epoch", epoch_width)], self.slots_number)
+            m.submodules[f"fifo{k}"] = self.fifos[k]
 
         m.submodules.histogram = self.histogram