CustomAcc -> CustomCounter

Author: shtaxxx

tests/extension/thread_/stream_custom_acc/Makefile renamed to tests/extension/thread_/stream_custom_counter/Makefile

@@ -3,16 +3,16 @@
 
 import os
 import veriloggen
-import thread_stream_custom_acc
+import thread_stream_custom_counter
 
 
 def test(request):
     veriloggen.reset()
 
     simtype = request.config.getoption('--sim')
 
-    rslt = thread_stream_custom_acc.run(filename=None, simtype=simtype,
-                                        outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
+    rslt = thread_stream_custom_counter.run(filename=None, simtype=simtype,
+                                            outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
 
     verify_rslt = rslt.splitlines()[-1]
     assert(verify_rslt == '# verify: PASSED')

tests/extension/thread_/stream_custom_acc/test_thread_stream_custom_acc.py renamed to tests/extension/thread_/stream_custom_counter/test_thread_stream_custom_counter.py

@@ -33,14 +33,17 @@ def op_func(x, y, x_size, y_size):
         x_cond = x == x_size - 1
         next_x = Mux(x_cond, 0, x + 1)
         y_cond = Ands(x_cond, y == y_size - 1)
-        next_y = Mux(y_cond, 0, y + 1)
+        next_y = PatternMux((y_cond, 0), (x_cond, y + 1), (None, y))
         return next_x, next_y
 
-    x, y = strm.CustomAcc(func=op_func,
-                          initvals=(0, 0), args=(size, size),
-                          width_list=(32, 32), signed_list=(True, True))
+    x_size = 4
+    y_size = 4
 
-    c = a + b + x + y
+    x, y = strm.CustomCounter(func=op_func,
+                              initvals=(0, 0), args=(x_size, y_size),
+                              width_list=(32, 32), signed_list=(True, True))
+
+    c = a + b + x + y - a - b
     strm.sink(c, 'c')
 
     def comp_stream(size, offset):
@@ -55,12 +58,12 @@ def comp_sequential(size, offset):
         sum = 0
         x = 0
         y = 0
-        x_size = size
-        y_size = size
+        x_size = 4
+        y_size = 4
         for i in range(size):
             a = ram_a.read(i + offset)
             b = ram_b.read(i + offset)
-            sum = a + b + x + y
+            sum = a + b + x + y - a - b
             ram_c.write(i + offset, sum)
             x_cond = x == x_size - 1
             if x_cond:
@@ -70,7 +73,7 @@ def comp_sequential(size, offset):
             y_cond = x_cond and (y == y_size - 1)
             if y_cond:
                 y = 0
-            else:
+            elif x_cond:
                 y = y + 1
 
     def check(size, offset_stream, offset_seq):

tests/extension/thread_/stream_custom_acc/thread_stream_custom_acc.py renamed to tests/extension/thread_/stream_custom_counter/thread_stream_custom_counter.py

@@ -3729,7 +3729,7 @@ def CounterValid(size, step=1, interval=None, initval=0, offset=None,
     return data, valid
 
 
-class _CustomAcc(_SpecialOperator):
+class _CustomCounter(_SpecialOperator):
     latency = 1
 
     default_width = 32
@@ -3819,7 +3819,7 @@ def _implement(self, m, seq, svalid=None, senable=None):
         next_vars = self.func(*func_args)
 
         if len(next_vars) != len(vars):
-            raise ValueError('CustomAcc function must return %d values.' % len(vars))
+            raise ValueError('CustomCounter function must return %d values.' % len(vars))
 
         for var, next_var in zip(vars, next_vars):
             seq(var(next_var), cond=enable_cond)
@@ -3851,11 +3851,11 @@ def _implement(self, m, seq, svalid=None, senable=None):
             )
 
 
-def CustomAcc(func, initvals, args=None, reset=None,
-              width_list=None, point_list=None, signed_list=None):
+def CustomCounter(func, initvals, args=None, reset=None,
+                  width_list=None, point_list=None, signed_list=None):
 
-    v = _CustomAcc(func, initvals, args, reset,
-                   width_list, point_list, signed_list)
+    v = _CustomCounter(func, initvals, args, reset,
+                       width_list, point_list, signed_list)
 
     return_values = []
 

veriloggen/stream/stypes.py

@@ -3762,7 +3762,7 @@ def __getattr__(self, attr):
              f.__name__.startswith('Counter') or
              f.__name__.startswith('Pulse') or
              f.__name__.startswith('Producer') or
-             f.__name__.startswith('CustomAcc'))):
+             f.__name__.startswith('CustomCounter'))):
 
             if self.reduce_reset is None:
                 self._make_reduce_reset()