Merge branch 'feature_stream_parameter' into develop

Author: shtaxxx

examples/thread_stream_axi_stream_fifo/run_on_pynq.py

@@ -86,4 +86,3 @@
 
 diff_sum = np.sum(expected - dst)
 print(diff_sum)
-

examples/thread_stream_axi_stream_fifo/test_thread_stream_axi_stream_fifo.py

@@ -311,7 +311,7 @@
   reg _mystream_reduce_a_source_fifo_deq;
   wire [32-1:0] _mystream_reduce_a_source_fifo_rdata;
   reg [32-1:0] _mystream_reduce_a_source_empty_data;
-  reg [32-1:0] _mystream_reduce_reduce_size_next_constant_data;
+  reg [32-1:0] _mystream_reduce_reduce_size_next_parameter_data;
   reg _mystream_reduce_reduce_reset;
   reg [33-1:0] _mystream_reduce_sum_sink_count;
   reg [4-1:0] _mystream_reduce_sum_sink_mode;
@@ -1269,7 +1269,7 @@
       _mystream_reduce_a_source_size_buf <= 0;
       __variable_wdata_0 <= 0;
       _mystream_reduce_a_source_count <= 0;
-      _mystream_reduce_reduce_size_next_constant_data <= 0;
+      _mystream_reduce_reduce_size_next_parameter_data <= 0;
       __variable_wdata_1 <= 0;
       _tmp_35 <= 0;
       _tmp_36 <= 0;
@@ -1470,10 +1470,10 @@
         _mystream_reduce_a_idle <= 1;
       end 
       if(_set_flag_33) begin
-        _mystream_reduce_reduce_size_next_constant_data <= _th_comp_reduce_size_2;
+        _mystream_reduce_reduce_size_next_parameter_data <= _th_comp_reduce_size_2;
       end 
       if(_mystream_reduce_source_start) begin
-        __variable_wdata_1 <= _mystream_reduce_reduce_size_next_constant_data;
+        __variable_wdata_1 <= _mystream_reduce_reduce_size_next_parameter_data;
       end 
       if(_mystream_reduce_stream_oready) begin
         _tmp_35 <= _set_flag_34;

examples/thread_stream_axi_stream_fifo/thread_stream_axi_stream_fifo.py

@@ -41,7 +41,7 @@ def mkLed():
 
     strm0 = vthread.Stream(m, 'mystream_reduce', clk, rst)
     a = strm0.source('a')
-    reduce_size = strm0.constant('reduce_size')
+    reduce_size = strm0.parameter('reduce_size')
     v = a * a
     sum, sum_valid = strm0.ReduceAddValid(v, reduce_size)
     strm0.sink(sum, 'sum', when=sum_valid, when_name='sum_valid')
@@ -77,7 +77,7 @@ def comp():
             axi_out.read_fifo(fifo_c, write_size)
 
             strm0.set_source_fifo('a', fifo_a, read_size)
-            strm0.set_constant('reduce_size', reduce_size)
+            strm0.set_parameter('reduce_size', reduce_size)
             strm0.set_sink_fifo('sum', fifo_b, write_size)
 
             strm1.set_source_fifo('x', fifo_b, write_size)

examples/thread_stream_matmul/thread_stream_matmul.py

@@ -38,14 +38,14 @@ def mkLed():
     strm = vthread.Stream(m, 'strm_madd', clk, rst)
     a = strm.source('a')
     b = strm.source('b')
-    size = strm.constant('size')
+    size = strm.parameter('size')
     sum, sum_valid = strm.ReduceAddValid(a * b, size)
     strm.sink(sum, 'sum', when=sum_valid, when_name='sum_valid')
 
     def strm_madd(size, waddr):
         strm.set_source('a', ram_a, 0, size)
         strm.set_source('b', ram_b, 0, size)
-        strm.set_constant('size', size)
+        strm.set_parameter('size', size)
         strm.set_sink('sum', ram_c, waddr, 1)
         strm.run()
         strm.join()

tests/extension/thread_/axi_stream/run_on_pynq.py

@@ -81,4 +81,3 @@
 
 diff_sum = np.sum(expected - dst)
 print(diff_sum)
-

tests/extension/thread_/stream_counter_enable/thread_stream_counter_enable.py

@@ -28,8 +28,8 @@ def mkLed():
     a = strm.source('a')
     b = strm.source('b')
     x = strm.Counter(initval=0, size=4)
-    y = strm.Counter(initval=0, size=4, enable=x==3)
-    z = strm.Counter(initval=0, size=4, enable=y==3)
+    y = strm.Counter(initval=0, size=4, enable=x == 3)
+    z = strm.Counter(initval=0, size=4, enable=y == 3)
     c = a + b - a - b + z + y + x
     strm.sink(c, 'c')
 

tests/extension/thread_/stream_countervalid/thread_stream_countervalid.py

@@ -25,7 +25,7 @@ def mkLed():
     ram_c = vthread.RAM(m, 'ram_c', clk, rst, datawidth, addrwidth)
 
     strm = vthread.Stream(m, 'mystream', clk, rst)
-    size = strm.constant('size')
+    size = strm.parameter('size')
     cnt, valid = strm.CounterValid(size)
     a = strm.source('a')
     b = strm.source('b')
@@ -34,7 +34,7 @@ def mkLed():
     strm.sink(c, 'c')
 
     def comp_stream(size, offset):
-        strm.set_constant('size', size // 2)
+        strm.set_parameter('size', size // 2)
         strm.set_source('a', ram_a, offset, size)
         strm.set_source('b', ram_b, offset, size)
         strm.set_sink('c', ram_c, offset, size)

tests/extension/thread_/stream_dump_unused/thread_stream_dump_unused.py

@@ -28,15 +28,15 @@ def mkLed():
                           dump=True, dump_base=10, dump_mode='all')
     a = strm.source('a')
     b = strm.source('b')
-    unused = strm.constant('unused')
+    unused = strm.parameter('unused')
     c = a + b
     strm.sink(c, 'c')
 
     def comp_stream(size, offset):
         strm.set_source('a', ram_a, offset, size)
         strm.set_source('b', ram_b, offset, size)
         strm.set_sink('c', ram_c, offset, size)
-        strm.set_constant('unused', 100)
+        strm.set_parameter('unused', 100)
         strm.run()
         strm.join()
 

tests/extension/thread_/stream_fifo_multistream/thread_stream_fifo_multistream.py

@@ -41,7 +41,7 @@ def mkLed():
 
     strm0 = vthread.Stream(m, 'mystream_reduce', clk, rst)
     a = strm0.source('a') + 10
-    reduce_size = strm0.constant('reduce_size')
+    reduce_size = strm0.parameter('reduce_size')
     sum, sum_valid = strm0.ReduceAddValid(a, reduce_size)
     strm0.sink(sum, 'sum', when=sum_valid, when_name='sum_valid')
 
@@ -53,7 +53,7 @@ def mkLed():
 
     def comp_stream(size, reduce_size, offset):
         strm0.set_source_fifo('a', fifo_a, size)
-        strm0.set_constant('reduce_size', reduce_size)
+        strm0.set_parameter('reduce_size', reduce_size)
         strm0.set_sink_fifo('sum', fifo_b, size // reduce_size)
 
         strm1.set_source_fifo('x', fifo_b, size // reduce_size)

tests/extension/thread_/stream_fixed/thread_stream_fixed.py

@@ -31,7 +31,7 @@ def mkLed():
     strm = vthread.Stream(m, 'mystream', clk, rst, dump=True)
     a = strm.source('a', point=point)
     b = strm.source('b', point=point)
-    const = strm.constant('const', point=point)
+    const = strm.parameter('const', point=point)
     c = a * b + const
     strm.sink(c, 'c')
 
@@ -40,7 +40,7 @@ def comp_stream(size, offset):
         strm.set_source('b', ram_b, offset, size)
         strm.set_sink('c', ram_c, offset, size)
         const = vthread.fixed.FixedConst(1, point=point)
-        strm.set_constant('const', const)
+        strm.set_parameter('const', const)
         strm.run()
         strm.join()