remove reset input from RandXorshift class

Author: sh-mug

tests/extension/thread_/stream_rand_xorshift/thread_stream_rand_xorshift.py

@@ -26,7 +26,7 @@ def mkLed():
     ram_c = vthread.RAM(m, 'ram_c', clk, rst, datawidth, addrwidth)
 
     strm = vthread.Stream(m, 'mystream', clk, rst)
-    rand_hard = strm.RandXorshift(initval=initval)
+    rand_hard = strm.RandXorshift(reg_initval=initval)
     a = strm.source('a')
     b = strm.source('b')
     c = a + b - a - b + rand_hard

veriloggen/stream/stypes.py

@@ -3632,12 +3632,14 @@ def _implement(self, m, seq, svalid=None, senable=None):
 
 class RandXorshift(_Accumulator):
 
-    def __init__(self, initval=0x12345678, dependency=None, enable=None, reset=None,
-                 reg_initval=None, width=32):
+    def __init__(self, reg_initval=0x12345678, dependency=None, enable=None, width=32):
+
         right = 0
         size = None
         interval = None
+        initval = None
         offset = None
+        reset = None
         signed = False
 
         _Accumulator.__init__(self, right, size, interval, initval, offset,
@@ -3649,7 +3651,6 @@ def _implement(self, m, seq, svalid=None, senable=None):
             raise ValueError("Latency mismatch '%d' vs '%s'" %
                              (self.latency, 1))
 
-        initval_data = self.initval.sig_data
         width = self.get_width()
         signed = self.get_signed()
 
@@ -3664,39 +3665,24 @@ def _implement(self, m, seq, svalid=None, senable=None):
         self.sig_data = data
 
         enabledata = self.enable.sig_data if self.enable is not None else None
-        resetdata = self.reset.sig_data if self.reset is not None else None
-
-        reset_cond = m.Wire(self.name('reset_cond'))
-        if self.reset is not None:
-            reset_cond.assign(resetdata)
-            current_randval = m.WireLike(randval, name=self.name('current_count'))
-            current_randval.assign(vtypes.Mux(reset_cond, initval_data, randval))
-        else:
-            reset_cond.assign(0)
-            current_randval = randval
 
         if width == 32:
-            next_value = current_randval ^ (current_randval << 13)
+            next_value = randval ^ (randval << 13)
             next_value = next_value ^ (next_value >> 17)
             next_value = next_value ^ (next_value << 5)
         elif width == 64:
-            next_value = current_randval ^ (current_randval << 13)
+            next_value = randval ^ (randval << 13)
             next_value = next_value ^ (next_value >> 7)
             next_value = next_value ^ (next_value << 17)
         else:
             raise ValueError("Invalid width value '%d', please specify 32 or 64" % width)
 
         enable_cond = _and_vars(svalid, senable)
 
-        if self.reset is not None:
-            enable_reset_cond = _and_vars(enable_cond, reset_cond)
-            seq(data(initval_data), cond=enable_reset_cond)
-
-        seq(data(current_randval), cond=enable_cond)
-
         if self.enable is not None:
             enable_cond = _and_vars(enable_cond, enabledata)
 
+        seq(data(randval), cond=enable_cond)
         seq(randval(next_value), cond=enable_cond)